From 3807640347a5a9dc8e4e361998e2d9b3a24dc4c5 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Sun, 24 May 2020 11:38:52 -0400 Subject: [PATCH] Resolve merge conflict --- .../ca/uhn/fhir/jpa/packages/IgInstallerSvc.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IgInstallerSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IgInstallerSvc.java index 9b1fd23fa59..ecb93b5fef4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IgInstallerSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IgInstallerSvc.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.context.FhirContext; 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.IFhirResourceDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; @@ -56,9 +57,14 @@ public class IgInstallerSvc { @PostConstruct public void initialize() { switch (fhirContext.getVersion().getVersion()) { - case R5: + case R5: case R4: - case DSTU3: break; + case DSTU3: + break; + + case DSTU2: + case DSTU2_HL7ORG: + case DSTU2_1: default: { ourLog.info("IG installation not supported for version: {}", fhirContext.getVersion().getVersion()); enabled = false; @@ -258,7 +264,7 @@ public class IgInstallerSvc { private IBaseResource generateSnapshot(IBaseResource sd) { try { - return validationSupport.generateSnapshot(validationSupport, sd, null, null, null); + return validationSupport.generateSnapshot(new ValidationSupportContext(validationSupport), sd, null, null, null); } catch (Exception e) { throw new ImplementationGuideInstallationException(String.format( "Failure when generating snapshot of StructureDefinition: %s", sd.getIdElement()), e);