From 732624bfaf1c5c80c902a806ede575c19771ca3b Mon Sep 17 00:00:00 2001 From: ianmarshall Date: Fri, 25 Sep 2020 22:55:01 -0400 Subject: [PATCH] Fix broken JUnit test. --- .../provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java | 5 ++--- .../support/CommonCodeSystemsTerminologyService.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java index 421344f8a85..0d8d9180bd4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java @@ -133,7 +133,6 @@ public class BaseJpaResourceProviderValueSetDstu3 extends JpaResourceProviderDst } - @SuppressWarnings("unchecked") @Operation(name = JpaConstants.OPERATION_VALIDATE_CODE, idempotent = true, returnParameters = { @OperationParam(name = "result", type = BooleanType.class, min = 1), @OperationParam(name = "message", type = StringType.class), @@ -164,9 +163,9 @@ public class BaseJpaResourceProviderValueSetDstu3 extends JpaResourceProviderDst IFhirResourceDaoValueSet dao = (IFhirResourceDaoValueSet) getDao(); UriType valueSetIdentifier; if (theValueSetVersion != null) { - valueSetIdentifier = new UriType(theValueSetUrl.getValue() + "|" + theValueSetVersion); + valueSetIdentifier = new UriType(url.getValue() + "|" + theValueSetVersion); } else { - valueSetIdentifier = theValueSetUrl; + valueSetIdentifier = url; } UriType codeSystemIdentifier; if (theSystemVersion != null) { diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java index 40322adf98c..cd63e8335e3 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java @@ -363,7 +363,7 @@ public class CommonCodeSystemsTerminologyService implements IValidationSupport { case DSTU2_HL7ORG: case DSTU2_1: default: - throw new IllegalArgumentException("Can not handle version: " + theValueSet.getStructureFhirVersionEnum()); + version=null; } return version; }