From b88ffdada00cb16d19e9dad68289cd07d1473f88 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 17 Aug 2023 13:02:02 -0400 Subject: [PATCH] Fix breakages due to https://github.com/hapifhir/hapi-fhir/pull/5180 --- .../ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java | 5 ++--- .../ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java | 2 +- .../java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java index 33b498b..7a1934f 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java @@ -9,7 +9,7 @@ import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.support.IValidationSupport; -import ca.uhn.fhir.cr.config.CrProviderLoader; + import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; import ca.uhn.fhir.jpa.api.IDaoRegistry; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; @@ -111,8 +111,7 @@ public class StarterJpaConfig { @Autowired private ConfigurableEnvironment configurableEnvironment; - @Autowired(required=false) - private CrProviderLoader crProviderLoader; + /** * Customize the default/max page sizes for search results. You can set these however diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java index 9efc086..06d95f4 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.starter.cr; -import ca.uhn.fhir.cr.config.CrDstu3Config; +import ca.uhn.fhir.cr.config.dstu3.CrDstu3Config; import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java index a97cea7..586a324 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.starter.cr; -import ca.uhn.fhir.cr.config.CrR4Config; +import ca.uhn.fhir.cr.config.r4.CrR4Config; import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Import;