Skip to content

Commit 15043da

Browse files
committed
Changes required for json-schema-validator update
1 parent 26620c6 commit 15043da

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.lang.reflect.Constructor;
2020
import java.util.function.BooleanSupplier;
2121

22-
import com.networknt.schema.ValidationContext;
22+
import com.networknt.schema.SchemaContext;
2323
import com.networknt.schema.regex.RegularExpression;
2424
import com.oracle.svm.core.annotate.Substitute;
2525
import com.oracle.svm.core.annotate.TargetClass;
@@ -37,7 +37,7 @@ interface RegularExpressionSubstitutions {
3737
boolean matches(String value);
3838

3939
@Substitute
40-
static RegularExpression compile(String regex, ValidationContext validationContext) {
40+
static RegularExpression compile(String regex, SchemaContext validationContext) {
4141
if (null == regex)
4242
return s -> true;
4343
try {

integration-tests/json-validator/src/main/java/org/apache/camel/quarkus/component/json/validator/it/JsonValidatorResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.nio.charset.StandardCharsets;
2121
import java.util.List;
2222

23-
import com.networknt.schema.ValidationMessage;
23+
import com.networknt.schema.Error;
2424
import jakarta.enterprise.context.ApplicationScoped;
2525
import jakarta.inject.Inject;
2626
import jakarta.ws.rs.Consumes;
@@ -55,7 +55,7 @@ public List<String> validate(String json) {
5555
if (e.getCause() instanceof JsonValidationException jve) {
5656
return jve.getErrors()
5757
.stream()
58-
.map(ValidationMessage::getError)
58+
.map(Error::getMessage)
5959
.toList();
6060
} else {
6161
throw e;
@@ -77,7 +77,7 @@ public List<String> validateAsStream(String json) {
7777
if (e.getCause() instanceof JsonValidationException jve) {
7878
return jve.getErrors()
7979
.stream()
80-
.map(ValidationMessage::getError)
80+
.map(Error::getMessage)
8181
.toList();
8282
} else {
8383
throw e;
@@ -99,7 +99,7 @@ public List<String> validateFromHeader(String json) {
9999
if (e.getCause() instanceof JsonValidationException jve) {
100100
return jve.getErrors()
101101
.stream()
102-
.map(ValidationMessage::getError)
102+
.map(Error::getMessage)
103103
.toList();
104104
} else {
105105
throw e;

poms/bom/src/main/generated/flattened-full-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7388,7 +7388,7 @@
73887388
<dependency>
73897389
<groupId>com.networknt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
73907390
<artifactId>json-schema-validator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7391-
<version>1.5.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7391+
<version>2.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
73927392
</dependency>
73937393
<dependency>
73947394
<groupId>com.orbitz.consul</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

poms/bom/src/main/generated/flattened-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7367,7 +7367,7 @@
73677367
<dependency>
73687368
<groupId>com.networknt</groupId>
73697369
<artifactId>json-schema-validator</artifactId>
7370-
<version>1.5.9</version>
7370+
<version>2.0.1</version>
73717371
</dependency>
73727372
<dependency>
73737373
<groupId>com.sangupta</groupId>

poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7367,7 +7367,7 @@
73677367
<dependency>
73687368
<groupId>com.networknt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
73697369
<artifactId>json-schema-validator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7370-
<version>1.5.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7370+
<version>2.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
73717371
</dependency>
73727372
<dependency>
73737373
<groupId>com.sangupta</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

0 commit comments

Comments
 (0)