honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken JUnit test.

This commit is contained in:
ianmarshall 2020-09-25 22:55:01 -04:00
parent 1dc4a533d6
commit 732624bfaf
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java
View File

@ -133,7 +133,6 @@ public class BaseJpaResourceProviderValueSetDstu3 extends JpaResourceProviderDst
} }
@SuppressWarnings("unchecked")
@Operation(name = JpaConstants.OPERATION_VALIDATE_CODE, idempotent = true, returnParameters = { @Operation(name = JpaConstants.OPERATION_VALIDATE_CODE, idempotent = true, returnParameters = {
@OperationParam(name = "result", type = BooleanType.class, min = 1), @OperationParam(name = "result", type = BooleanType.class, min = 1),
@OperationParam(name = "message", type = StringType.class), @OperationParam(name = "message", type = StringType.class),
@ -164,9 +163,9 @@ public class BaseJpaResourceProviderValueSetDstu3 extends JpaResourceProviderDst
IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept> dao = (IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept>) getDao(); IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept> dao = (IFhirResourceDaoValueSet<ValueSet, Coding, CodeableConcept>) getDao();
UriType valueSetIdentifier; UriType valueSetIdentifier;
if (theValueSetVersion != null) { if (theValueSetVersion != null) {
valueSetIdentifier = new UriType(theValueSetUrl.getValue() + "|" + theValueSetVersion); valueSetIdentifier = new UriType(url.getValue() + "|" + theValueSetVersion);
} else { } else {
valueSetIdentifier = theValueSetUrl; valueSetIdentifier = url;
} }
UriType codeSystemIdentifier; UriType codeSystemIdentifier;
if (theSystemVersion != null) { if (theSystemVersion != null) {

2
hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java
View File

@ -363,7 +363,7 @@ public class CommonCodeSystemsTerminologyService implements IValidationSupport {
case DSTU2_HL7ORG: case DSTU2_HL7ORG:
case DSTU2_1: case DSTU2_1:
default: default:
throw new IllegalArgumentException("Can not handle version: " + theValueSet.getStructureFhirVersionEnum()); version=null;
} }
return version; return version;
} }