From ceceb6c7d589840e66655b39b85bda87beb8787d Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 17 Jul 2023 16:35:00 -0400 Subject: [PATCH] Bump shex dependency (#1351) --- org.hl7.fhir.r5/pom.xml | 4 +++- .../java/org/hl7/fhir/r5/test/ShexGeneratorTests.java | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index a01e85349..40e9cf3a0 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -58,10 +58,12 @@ es.weso shexs_2.12 - 0.2.31 + 0.2.32 true + + com.google.code.gson diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java index 7d5c0774d..cbb4d2157 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; import es.weso.shex.Schema; -import es.weso.shex.validator.ShExsValidator; -import es.weso.shex.validator.ShExsValidatorBuilder; +import es.weso.shexsjena.ShExsJenaValidator; +import es.weso.shexsjena.ShExsJenaValidatorBuilder; import org.fhir.ucum.UcumException; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.conformance.profile.ProfileUtilities; @@ -353,7 +353,7 @@ public class ShexGeneratorTests { if (validateShEx) { try { - ShExsValidator validator = ShExsValidatorBuilder.fromStringSync(schema, "ShexC"); + ShExsJenaValidator validator =ShExsJenaValidatorBuilder.fromStringSync(schema, "ShexC"); Schema sch = validator.schema(); Assert.assertNotNull(sch); @@ -405,7 +405,7 @@ public class ShexGeneratorTests { if (!schema.isEmpty()) { if (validateShEx) { try { - ShExsValidator validator = ShExsValidatorBuilder.fromStringSync(schema, "ShexC"); + ShExsJenaValidator validator = ShExsJenaValidatorBuilder.fromStringSync(schema, "ShexC"); Schema sch = validator.schema(); Assert.assertNotNull(sch);