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

Resolve merge conflict

This commit is contained in:
jamesagnew 2020-05-24 11:38:52 -04:00
parent 6a4f5b9b3a
commit 3807640347
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IgInstallerSvc.java
View File

@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.packages;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
@ -58,7 +59,12 @@ public class IgInstallerSvc {
switch (fhirContext.getVersion().getVersion()) { switch (fhirContext.getVersion().getVersion()) {
case R5: case R5:
case R4: case R4:
case DSTU3: break; case DSTU3:
break;
case DSTU2:
case DSTU2_HL7ORG:
case DSTU2_1:
default: { default: {
ourLog.info("IG installation not supported for version: {}", fhirContext.getVersion().getVersion()); ourLog.info("IG installation not supported for version: {}", fhirContext.getVersion().getVersion());
enabled = false; enabled = false;
@ -258,7 +264,7 @@ public class IgInstallerSvc {
private IBaseResource generateSnapshot(IBaseResource sd) { private IBaseResource generateSnapshot(IBaseResource sd) {
try { try {
return validationSupport.generateSnapshot(validationSupport, sd, null, null, null); return validationSupport.generateSnapshot(new ValidationSupportContext(validationSupport), sd, null, null, null);
} catch (Exception e) { } catch (Exception e) {
throw new ImplementationGuideInstallationException(String.format( throw new ImplementationGuideInstallationException(String.format(
"Failure when generating snapshot of StructureDefinition: %s", sd.getIdElement()), e); "Failure when generating snapshot of StructureDefinition: %s", sd.getIdElement()), e);