From 9a513cd1845723c630565ac2b124d74e56491006 Mon Sep 17 00:00:00 2001 From: Luke deGruchy Date: Thu, 5 Jan 2023 16:56:01 -0500 Subject: [PATCH] Update pom.xml to reference hapi-fhir 6.3.6-SNAPSHOT. This hapi-fhir release contains a fix for POSTing an XML resource with comments results in a fhir_comments error (#465) * Update pom.xml to reference hapi-fhir 6.3.4-SNAPSHOT. This also involves renaming websocket dependencies whose names have changed since 6.2.2 (ex websocket-api to websocket-jetty-api). * Update pom to reference logback 1.2.10 explicitly to resolve the missing StaticLoggerBinder errors. * Fix logback issue by pulling the same logback version as hapi-fhir and setting the following system property at boot: org.springframework.boot.logging.LoggingSystem=none. Also, fix the hapi-fhir-jpaserver-base dependency error by setting this in application.yaml: allow-bean-definition-overriding: true * Set allow-bean-definition-overriding: true on test application.yaml as well. * Remove lines in ExampleServerR4BIT that causes an implementation guide version error. * Upgrade to 6.3.6-SNAPSHOT and once again disable allow-bean-definition-overriding. Also remove the Bean for IMdmLinkDoa from StartJpaConfig and the Bean for ITermCodeSystemStorageSvc in FhirServerConfigDstu2. * Explicitly use logback 1.2.10 for both logback-classic and logback-core to resolve StaticBinderLogger not found errors. Also, remove explici logger disabling code in Application.java. * Restore Application.java as well as both application.yaml files to the same as master. --- pom.xml | 20 +++++++++++++++---- .../starter/common/FhirServerConfigDstu2.java | 6 ------ .../jpa/starter/common/StarterJpaConfig.java | 10 ---------- .../fhir/jpa/starter/ExampleServerR4BIT.java | 2 -- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 700161b..d043e79 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.2.2 + 6.3.6-SNAPSHOT hapi-fhir-jpaserver-starter @@ -44,12 +44,12 @@ org.eclipse.jetty.websocket - websocket-api + websocket-jetty-api ${jetty_version} org.eclipse.jetty.websocket - websocket-client + websocket-jetty-client ${jetty_version} @@ -150,8 +150,20 @@ ch.qos.logback logback-classic + + + 1.2.10 + + ch.qos.logback + logback-core + + + 1.2.10 + + + javax.servlet @@ -246,7 +258,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server test diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java index baf5044..9416d28 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java @@ -2,7 +2,6 @@ package ca.uhn.fhir.jpa.starter.common; import ca.uhn.fhir.jpa.config.JpaDstu2Config; import ca.uhn.fhir.jpa.starter.annotations.OnDSTU2Condition; -import ca.uhn.fhir.jpa.term.TermCodeSystemStorageSvcImpl; import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc; @@ -24,9 +23,4 @@ public class FhirServerConfigDstu2 { return new TermLoaderSvcImpl(theDeferredStorageSvc, theCodeSystemStorageSvc); } - @Bean - public ITermCodeSystemStorageSvc termCodeSystemStorageSvc() { - return new TermCodeSystemStorageSvcImpl(); - } - } 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 74ac24c..3fac5b7 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 @@ -206,16 +206,6 @@ public class StarterJpaConfig { return packageInstallerSvc; } - @Bean - @Primary - /* - This bean is currently necessary to override from MDM settings - */ - IMdmLinkDao mdmLinkDao() { - return new MdmLinkDaoJpaImpl(); - } - - @Bean @Conditional(OnCorsPresent.class) public CorsInterceptor corsInterceptor(AppProperties appProperties) { diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java index 0092722..fc7bf58 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java @@ -20,8 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; "hapi.fhir.fhir_version=r4b", "hapi.fhir.subscription.websocket_enabled=false", "hapi.fhir.mdm_enabled=false", - "hapi.fhir.implementationguides.dk-core.name=hl7.fhir.dk.core", - "hapi.fhir.implementationguides.dk-core.version=1.1.0", // Override is currently required when using MDM as the construction of the MDM // beans are ambiguous as they are constructed multiple places. This is evident // when running in a spring boot environment