Merge pull request #1314 from OptimumCode/kmp-validator-new-drafts

Update version: support for draft6 and draft4

Author: OptimumCode

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.0.0"
-json-schema-validator = "0.2.0"
+json-schema-validator = "0.2.1"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

src/main/kotlin/BowtieSampsonSchemaValidatorLauncher.kt

@@ -1,7 +1,9 @@
+import com.eygraber.uri.Uri
 import io.github.optimumcode.json.schema.ErrorCollector
 import io.github.optimumcode.json.schema.JsonSchema
 import io.github.optimumcode.json.schema.JsonSchemaLoader
 import io.github.optimumcode.json.schema.SchemaType
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.ClassDiscriminatorMode
 import kotlinx.serialization.json.Json
@@ -14,6 +16,7 @@ import java.io.InputStreamReader
 import java.util.jar.Attributes
 import java.util.jar.Manifest
 
+@OptIn(ExperimentalSerializationApi::class)
 fun main() {
     val input = BufferedReader(InputStreamReader(System.`in`))
     val outputWriter = System.out.bufferedWriter()
@@ -35,6 +38,8 @@ fun main() {
 }
 
 private val SUPPORTED_DIALECTS: Set<String> = hashSetOf(
+    "http://json-schema.org/draft-04/schema#",
+    "http://json-schema.org/draft-06/schema#",
     "http://json-schema.org/draft-07/schema#",
     "https://json-schema.org/draft/2019-09/schema",
     "https://json-schema.org/draft/2020-12/schema",
@@ -122,30 +127,30 @@ class BowtieSampsonSchemaValidatorLauncher(
         .apply {
             currentDialect?.also(this::registerWellKnown)
             for ((uri, schema) in command.case.registry) {
-                if (skipSchema(uri, schema)) {
+                if (skipSchema(schema)) {
                     continue
                 }
+                var schemaType: SchemaType? = null
+                if (uri.contains("draft4", ignoreCase = true)) {
+                    // remote schema for draft 4 does not contain $schema block
+                    schemaType = SchemaType.DRAFT_4
+                }
                 @Suppress("detekt:TooGenericExceptionCaught")
                 try {
-                    register(schema, uri)
+                    register(schema, Uri.parse(uri), schemaType)
                 } catch (ex: Exception) {
                     throw IllegalStateException("cannot register schema for URI '$uri'", ex)
                 }
             }
         }.fromJsonElement(schemaDefinition, currentDialect)
 
-    private fun skipSchema(uri: String, schema: JsonElement): Boolean {
-        if (uri.contains("draft4", ignoreCase = true)) {
-            // skip draft4 schemas
-            return true
-        }
+    private fun skipSchema(schema: JsonElement): Boolean =
         // ignore schemas for unsupported drafts
-        return schema is JsonObject &&
+        schema is JsonObject &&
             schema["\$schema"]
                 ?.jsonPrimitive
                 ?.content
                 .let { it != null && SchemaType.find(it) == null }
-    }
 
     private fun runCase(command: Command.Run, schema: JsonSchema) {
         val results: List<TestResult> = command.case.tests.map { test ->

src/main/kotlin/TestFilters.kt

@@ -14,11 +14,17 @@ interface TestFilter {
 
 fun getFilter(schemaType: SchemaType?): TestFilter =
     when (schemaType ?: SchemaType.entries.last()) {
+        SchemaType.DRAFT_4 -> TestFilterDraft4
+        SchemaType.DRAFT_6 -> TestFilterDraft6
         SchemaType.DRAFT_7 -> TestFilterDraft7
         SchemaType.DRAFT_2019_09 -> TestFilterDraft201909
         SchemaType.DRAFT_2020_12 -> TestFilterDraft202012
     }
 
+object TestFilterDraft4 : TestFilter
+
+object TestFilterDraft6 : TestFilter
+
 object TestFilterDraft7 : TestFilter
 
 object TestFilterDraft201909 : TestFilter {