You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ig...@apache.org on 2023/08/25 17:53:41 UTC
[camel] branch main updated: chore: Align json-schema-validator for camel-yaml-dsl tests to what is used for camel-json-validator component (#11207)
This is an automated email from the ASF dual-hosted git repository.
igarashitm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d985d7cc8b1 chore: Align json-schema-validator for camel-yaml-dsl tests to what is used for camel-json-validator component (#11207)
d985d7cc8b1 is described below
commit d985d7cc8b17ffc46b24ce54981bc13cfce3f798
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Fri Aug 25 13:53:34 2023 -0400
chore: Align json-schema-validator for camel-yaml-dsl tests to what is used for camel-json-validator component (#11207)
---
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 4 ++--
.../apache/camel/dsl/yaml/support/YamlTestSupport.groovy | 13 ++++++-------
parent/pom.xml | 1 -
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
index 6fb388d2b9b..14b6fe9a989 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
@@ -212,9 +212,9 @@
</dependency>
<dependency>
- <groupId>com.github.java-json-tools</groupId>
+ <groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
- <version>${json-schema-validator-version}</version>
+ <version>${networknt-json-schema-validator-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
index 182db37b96a..3c9d59be878 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
@@ -18,8 +18,8 @@ package org.apache.camel.dsl.yaml.support
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
-import com.github.fge.jackson.JsonLoader
-import com.github.fge.jsonschema.main.JsonSchemaFactory
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersionDetector
import groovy.util.logging.Slf4j
import org.apache.camel.CamelContext
import org.apache.camel.FluentProducerTemplate
@@ -30,7 +30,6 @@ import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.model.RouteTemplateDefinition
import org.apache.camel.spi.HasCamelContext
import org.apache.camel.spi.Resource
-import org.apache.camel.spi.ResourceLoader
import org.apache.camel.support.PluginHelper
import org.apache.camel.support.ResourceHelper
import spock.lang.AutoCleanup
@@ -41,8 +40,9 @@ import java.nio.charset.StandardCharsets
@Slf4j
class YamlTestSupport extends Specification implements HasCamelContext {
static def MAPPER = new ObjectMapper(new YAMLFactory())
- static def SCHEMA_RES = JsonLoader.fromResource('/schema/camel-yaml-dsl.json')
- static def SCHEMA = JsonSchemaFactory.byDefault().getJsonSchema(SCHEMA_RES)
+ static def SCHEMA_NODE = MAPPER.readTree(ResourceHelper.getResourceAsStream('/schema/camel-yaml-dsl.json'));
+ static def FACTORY = JsonSchemaFactory.getInstance(SpecVersionDetector.detect(SCHEMA_NODE));
+ static def SCHEMA = FACTORY.getSchema(SCHEMA_NODE);
@AutoCleanup
def context = new DefaultCamelContext()
@@ -52,8 +52,7 @@ class YamlTestSupport extends Specification implements HasCamelContext {
for (def resource : resources) {
def target = MAPPER.readTree(resource.inputStream)
def report = SCHEMA.validate(target)
-
- if (!report.isSuccess()) {
+ if (!report.isEmpty()) {
throw new IllegalArgumentException("${report}")
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 081b540ac8b..94af9b1a457 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -285,7 +285,6 @@
<json-patch-version>1.13</json-patch-version>
<json-smart-version>2.5.0</json-smart-version>
<jsonata4java-version>2.4.3</jsonata4java-version>
- <json-schema-validator-version>2.2.14</json-schema-validator-version>
<json-unit-version>3.0.0</json-unit-version>
<jsoup-version>1.16.1</jsoup-version>
<jt400-version>20.0.0</jt400-version>