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

Bump core version (#3067) 

* Bump core version

* Changes for version bump

* Resolve NPE:

* Test fix

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
This commit is contained in:
Tadgh 2021-10-16 14:13:13 -04:00 committed by GitHub
parent a0388db672
commit 120443e561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java
View File

@ -75,12 +75,12 @@ public class IgInstallerDstu3Test extends BaseJpaDstu3Test {
byte[] bytes = loadResourceAsByteArray("/packages/erroneous-ig.tar.gz");
// Unknown base of StructureDefinitions
// That patient profile in this NPM package has an invalid base
try {
igInstaller.install(new PackageInstallationSpec().setName("erroneous-ig").setVersion("1.0.2").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL).setPackageContents(bytes));
fail();
} catch (ImplementationGuideInstallationException e) {
assertThat(e.getMessage(), containsString("Failure when generating snapshot of StructureDefinition"));
assertThat(e.getMessage(), containsString("Could not load NPM package erroneous-ig#1.0.2"));
}
}

BIN
hapi-fhir-jpaserver-base/src/test/resources/packages/erroneous-ig.tar.gz
View File

Binary file not shown.

2
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java
View File

@ -88,7 +88,7 @@ public class SearchParamExtractorR5 extends BaseSearchParamExtractor implements
private final Map<String, Base> myResourceTypeToStub = Collections.synchronizedMap(new HashMap<>());
@Override
public Base resolveConstant(Object appContext, String name, boolean beforeContext) throws PathEngineException {
public List<Base> resolveConstant(Object appContext, String name, boolean beforeContext) throws PathEngineException {
return null;
}

4
hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java
View File

@ -189,7 +189,7 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext
severity = IssueSeverity.fromCode(result.getSeverityCode());
}
ConceptDefinitionComponent definition = new ConceptDefinitionComponent().setCode(result.getCode());
return new ValidationResult(severity, result.getMessage(), definition);
return new ValidationResult(severity, result.getMessage(), theSystem, definition);
}
@Override
@ -206,7 +206,7 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext
ConceptDefinitionComponent definition = new ConceptDefinitionComponent();
definition.setCode(theCode);
definition.setDisplay(outcome.getDisplay());
return new ValidationResult(definition);
return new ValidationResult(theSystem, definition);
}
return new ValidationResult(IssueSeverity.ERROR, "Unknown code[" + theCode + "] in system[" + Constants.codeSystemWithDefaultDescription(theSystem) + "]");

5
hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/FhirInstanceValidator.java
View File

@ -274,9 +274,10 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IInsta
public static class NullEvaluationContext implements FHIRPathEngine.IEvaluationContext {
@Override
public Base resolveConstant(Object appContext, String name, boolean beforeContext) throws PathEngineException {
return null;
public List<Base> resolveConstant(Object appContext, String name, boolean beforeContext) throws PathEngineException {
return Collections.emptyList();
}
@Override

6
hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
View File

@ -247,7 +247,7 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
}
@Nonnull
private ValidationResult convertValidationResult(@Nullable IValidationSupport.CodeValidationResult theResult) {
private ValidationResult convertValidationResult(String theSystem, @Nullable IValidationSupport.CodeValidationResult theResult) {
ValidationResult retVal = null;
if (theResult != null) {
String code = theResult.getCode();
@ -255,7 +255,7 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
String issueSeverity = theResult.getSeverityCode();
String message = theResult.getMessage();
if (isNotBlank(code)) {
retVal = new ValidationResult(new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent()
retVal = new ValidationResult(theSystem, new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent()
.setCode(code)
.setDisplay(display));
} else if (isNotBlank(issueSeverity)) {
@ -589,7 +589,7 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
} else {
result = myValidationSupportContext.getRootValidationSupport().validateCode(myValidationSupportContext, theValidationOptions, theSystem, theCode, theDisplay, null);
}
return convertValidationResult(result);
return convertValidationResult(theSystem, result);
}
@Override

2
pom.xml
View File

@ -759,7 +759,7 @@
<properties>
<fhir_core_version>5.4.10</fhir_core_version>
<fhir_core_version>5.5.4</fhir_core_version>
<ucum_version>1.0.3</ucum_version>
<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>