Skip to content

Commit ad3fe10

Browse files
committed
Minimize publich api
1 parent 89f9d32 commit ad3fe10

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/commonMain/kotlin/io/github/optimumcode/json/schema/OutputCollector.kt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ private val NO_TRANSFORMATION: OutputErrorTransformer<*> = { it }
1515
public sealed class OutputCollector<T> private constructor(
1616
parent: OutputCollector<T>? = null,
1717
transformer: OutputErrorTransformer<T> = NO_TRANSFORMATION,
18-
) : ErrorCollector {
18+
) {
1919
public companion object {
2020
@JvmStatic
21-
public fun flag(): Flag = Flag()
21+
public fun flag(): OutputCollector<ValidationOutput.Flag> = Flag()
2222

2323
@JvmStatic
24-
public fun basic(): Basic = Basic()
24+
public fun basic(): OutputCollector<ValidationOutput.Basic> = Basic()
2525

2626
@JvmStatic
27-
public fun detailed(): Detailed = Detailed()
27+
public fun detailed(): OutputCollector<ValidationOutput.Detailed> = Detailed()
2828

2929
@JvmStatic
30-
public fun verbose(): Verbose = Verbose()
30+
public fun verbose(): OutputCollector<ValidationOutput.Verbose> = Verbose()
3131
}
3232

3333
public abstract val output: T
@@ -62,6 +62,8 @@ public sealed class OutputCollector<T> private constructor(
6262

6363
internal open fun reportErrors() = Unit
6464

65+
internal abstract fun onError(error: ValidationError)
66+
6567
internal inline fun <OUT> use(block: OutputCollector<T>.() -> OUT): OUT =
6668
try {
6769
block(this)
@@ -143,7 +145,7 @@ public sealed class OutputCollector<T> private constructor(
143145
override fun childCollector(): OutputCollector<Nothing> = DelegateOutputCollector(errorCollector, this)
144146
}
145147

146-
public class Flag internal constructor(
148+
private class Flag(
147149
private val parent: Flag? = null,
148150
transformer: OutputErrorTransformer<ValidationOutput.Flag> = NO_TRANSFORMATION,
149151
) : OutputCollector<ValidationOutput.Flag>(parent, transformer) {
@@ -186,7 +188,7 @@ public sealed class OutputCollector<T> private constructor(
186188
override fun childCollector(): Flag = Flag(this)
187189
}
188190

189-
public class Basic internal constructor(
191+
private class Basic(
190192
private val parent: Basic? = null,
191193
transformer: OutputErrorTransformer<ValidationOutput.Basic> = NO_TRANSFORMATION,
192194
) : OutputCollector<ValidationOutput.Basic>(parent, transformer) {
@@ -250,7 +252,7 @@ public sealed class OutputCollector<T> private constructor(
250252
}
251253
}
252254

253-
public class Detailed internal constructor(
255+
private class Detailed(
254256
private val location: JsonPointer = JsonPointer.ROOT,
255257
private val keywordLocation: JsonPointer = JsonPointer.ROOT,
256258
private val parent: Detailed? = null,
@@ -343,7 +345,7 @@ public sealed class OutputCollector<T> private constructor(
343345
}
344346
}
345347

346-
public class Verbose internal constructor(
348+
private class Verbose(
347349
private val location: JsonPointer = JsonPointer.ROOT,
348350
private val keywordLocation: JsonPointer = JsonPointer.ROOT,
349351
private val parent: Verbose? = null,

src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/factories/ExternalAssertionFactoryAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ private class ExternalAssertionAdapter(
3030
errorCollector: OutputCollector<*>,
3131
): Boolean =
3232
errorCollector.updateKeywordLocation(location).use {
33-
externalAssertion.validate(element, context, this)
33+
externalAssertion.validate(element, context, this::onError)
3434
}
3535
}

0 commit comments

Comments
 (0)