Skip to content

deps: update com.networknt:json-schema-validator to v2 #11019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

deps: update com.networknt:json-schema-validator to v2 #11019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06ea465
deps: Update `json-schema-validator` version 2.0.0
fviernau Oct 25, 2025
c307b4a
test(model): Remove some minor code redundancy
fviernau Oct 27, 2025
ed7376a
test(model): Use a more speaking name for `schemaV7`
fviernau Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jgit = "7.4.0.202509020913-r"
jiraRestClient = "7.0.1"
jruby = "10.0.2.0"
jslt = "0.1.14"
jsonSchemaValidator = "1.5.9"
jsonSchemaValidator = "2.0.0"
kaml = "0.102.0"
kotest = "6.0.4"
kotlinPoet = "2.2.0"
Expand Down
51 changes: 30 additions & 21 deletions model/src/test/kotlin/JsonSchemaTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.ossreviewtoolkit.model

import com.networknt.schema.InputFormat
import com.networknt.schema.JsonSchemaFactory
import com.networknt.schema.SpecVersion
import com.networknt.schema.SchemaRegistry
import com.networknt.schema.SpecificationVersion

import io.kotest.core.spec.style.StringSpec
import io.kotest.inspectors.forAll
Expand All @@ -30,6 +30,7 @@ import io.kotest.matchers.should
import io.kotest.matchers.shouldNot

import java.io.File
import java.net.URI

import org.ossreviewtoolkit.model.config.RepositoryConfiguration
import org.ossreviewtoolkit.utils.ort.ORT_LICENSE_CLASSIFICATIONS_FILENAME
Expand All @@ -45,7 +46,7 @@ class JsonSchemaTest : StringSpec({
"ORT's own repository configuration file validates successfully" {
val repositoryConfiguration = File("../$ORT_REPO_CONFIG_FILENAME").readText()

val errors = schemaV7.getSchema(repositoryConfigurationSchema)
val errors = getSchema(repositoryConfigurationSchema)
.validate(repositoryConfiguration, InputFormat.YAML)

errors should beEmpty()
Expand All @@ -57,7 +58,7 @@ class JsonSchemaTest : StringSpec({
examplesDir.walk().filterTo(mutableListOf()) { it.isFile && it.name.endsWith(ORT_REPO_CONFIG_FILENAME) }

repositoryConfiguration.forAll {
val errors = schemaV7.getSchema(repositoryConfigurationSchema).validate(it.readText(), InputFormat.YAML)
val errors = getSchema(repositoryConfigurationSchema).validate(it.readText(), InputFormat.YAML)

errors should beEmpty()
}
Expand All @@ -68,7 +69,7 @@ class JsonSchemaTest : StringSpec({
"/analyzer-repository-configuration.ort.yml"
).analyzer

val errors = schemaV7.getSchema(repositoryConfigurationAnalyzerConfiguration)
val errors = getSchema(repositoryConfigurationAnalyzerConfiguration)
.validate(analyzerConfiguration.toYaml(), InputFormat.YAML)

errors should beEmpty()
Expand All @@ -79,7 +80,7 @@ class JsonSchemaTest : StringSpec({
"/package-manager-repository-configuration.ort.yml"
).analyzer?.packageManagers

val errors = schemaV7.getSchema(repositoryConfigurationPackageManagerConfiguration)
val errors = getSchema(repositoryConfigurationPackageManagerConfiguration)
.validate(packageManagerConfiguration.toYaml(), InputFormat.YAML)

errors should beEmpty()
Expand All @@ -89,7 +90,7 @@ class JsonSchemaTest : StringSpec({
val curationsSchema = File("../integrations/schemas/curations-schema.json").toURI()
val curationsExample = File("../examples/$ORT_PACKAGE_CURATIONS_FILENAME").readText()

val errors = schemaV7.getSchema(curationsSchema).validate(curationsExample, InputFormat.YAML)
val errors = getSchema(curationsSchema).validate(curationsExample, InputFormat.YAML)

errors should beEmpty()
}
Expand All @@ -98,7 +99,7 @@ class JsonSchemaTest : StringSpec({
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val packageConfiguration = File("../examples/$ORT_PACKAGE_CONFIGURATION_FILENAME").readText()

val errors = schemaV7.getSchema(packageConfigurationSchema).validate(packageConfiguration, InputFormat.YAML)
val errors = getSchema(packageConfigurationSchema).validate(packageConfiguration, InputFormat.YAML)

errors should beEmpty()
}
Expand All @@ -107,7 +108,7 @@ class JsonSchemaTest : StringSpec({
val resolutionsSchema = File("../integrations/schemas/resolutions-schema.json").toURI()
val resolutionsExample = File("../examples/$ORT_RESOLUTIONS_FILENAME").readText()

val errors = schemaV7.getSchema(resolutionsSchema).validate(resolutionsExample, InputFormat.YAML)
val errors = getSchema(resolutionsSchema).validate(resolutionsExample, InputFormat.YAML)

errors should beEmpty()
}
Expand All @@ -116,7 +117,7 @@ class JsonSchemaTest : StringSpec({
val ortConfigurationSchema = File("../integrations/schemas/ort-configuration-schema.json").toURI()
val referenceConfigFile = File("src/main/resources/$ORT_REFERENCE_CONFIG_FILENAME").readText()

val errors = schemaV7.getSchema(ortConfigurationSchema).validate(referenceConfigFile, InputFormat.YAML)
val errors = getSchema(ortConfigurationSchema).validate(referenceConfigFile, InputFormat.YAML)

errors should beEmpty()
}
Expand All @@ -125,7 +126,7 @@ class JsonSchemaTest : StringSpec({
val licenseClassificationsSchema = File("../integrations/schemas/license-classifications-schema.json").toURI()
val licenseClassificationsExample = File("../examples/$ORT_LICENSE_CLASSIFICATIONS_FILENAME").readText()

val errors = schemaV7.getSchema(licenseClassificationsSchema)
val errors = getSchema(licenseClassificationsSchema)
.validate(licenseClassificationsExample, InputFormat.YAML)

errors should beEmpty()
Expand All @@ -134,15 +135,15 @@ class JsonSchemaTest : StringSpec({
"Snippet choices validate successfully" {
val repositoryConfiguration = readResource("/snippet-choices-repository-configuration.ort.yml")

val errors = schemaV7.getSchema(repositoryConfigurationSchema)
val errors = getSchema(repositoryConfigurationSchema)
.validate(repositoryConfiguration, InputFormat.YAML)

errors should beEmpty()
}

"Package configuration with no matchers validates successfully" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithNoMatchers = """
id: "Pip::example-package:0.0.1"
Expand All @@ -155,7 +156,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with only vcs validates successfully" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithVcs = """
id: "Pip::example-package:0.0.1"
Expand All @@ -171,7 +172,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with only source_artifact_url validates successfully" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithSourceArtifact = """
id: "Pip::example-package:0.0.1"
Expand All @@ -185,7 +186,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with only source_code_origin validates successfully" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithSourceCodeOrigin = """
id: "Pip::example-package:0.0.1"
Expand All @@ -199,7 +200,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with vcs and source_artifact_url fails validation" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithVcsAndSourceArtifact = """
id: "Pip::example-package:0.0.1"
Expand All @@ -216,7 +217,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with vcs and source_code_origin fails validation" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithVcsAndSourceCodeOrigin = """
id: "Pip::example-package:0.0.1"
Expand All @@ -233,7 +234,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with source_artifact_url and source_code_origin fails validation" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithSourceArtifactAndSourceCodeOrigin = """
id: "Pip::example-package:0.0.1"
Expand All @@ -248,7 +249,7 @@ class JsonSchemaTest : StringSpec({

"Package configuration with all three matchers fails validation" {
val packageConfigurationSchema = File("../integrations/schemas/package-configuration-schema.json").toURI()
val schema = schemaV7.getSchema(packageConfigurationSchema)
val schema = getSchema(packageConfigurationSchema)

val configWithAllMatchers = """
id: "Pip::example-package:0.0.1"
Expand All @@ -265,7 +266,13 @@ class JsonSchemaTest : StringSpec({
}
})

private val schemaV7 = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)
private val schemaRegistry: SchemaRegistry by lazy {
SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7) { builder ->
builder.schemaLoader { schemaLoader ->
schemaLoader.fetchRemoteResources()
}
}
}

private val repositoryConfigurationSchema =
File("../integrations/schemas/repository-configuration-schema.json").toURI()
Expand All @@ -275,3 +282,5 @@ private val repositoryConfigurationAnalyzerConfiguration =

private val repositoryConfigurationPackageManagerConfiguration =
File("../integrations/schemas/repository-configurations/package-manager-configuration-schema.json").toURI()

private fun getSchema(uri: URI) = schemaRegistry.getSchema(uri.toURL().openStream())
6 changes: 3 additions & 3 deletions utils/test/src/main/kotlin/Matchers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import com.github.difflib.DiffUtils
import com.github.difflib.UnifiedDiffUtils

import com.networknt.schema.InputFormat as NetworkNtInputFormat
import com.networknt.schema.JsonSchemaFactory
import com.networknt.schema.SpecVersion
import com.networknt.schema.SchemaRegistry
import com.networknt.schema.SpecificationVersion

import io.kotest.assertions.eq.EqMatcher
import io.kotest.matchers.Matcher
Expand Down Expand Up @@ -135,7 +135,7 @@ enum class InputFormat(internal val networkNtInputformat: NetworkNtInputFormat)

fun matchJsonSchema(schemaJson: String, inputFormat: InputFormat = InputFormat.JSON): Matcher<String> =
Matcher { actual ->
val schema = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7).getSchema(schemaJson)
val schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7).getSchema(schemaJson)
val violations = schema.validate(actual, inputFormat.networkNtInputformat)

MatcherResult(
Expand Down
Loading