From 76650df4dcd0bf6944b9a80ddd1d0070ffc41422 Mon Sep 17 00:00:00 2001 From: Luke deGruchy Date: Tue, 10 Jan 2023 14:51:32 -0500 Subject: [PATCH] First commit to restore hapi-fhir 6.3.6-SNAPSHOT changes. Add static code blocks to Application.java as well as all tests to System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); --- pom.xml | 8 ++++---- src/main/java/ca/uhn/fhir/jpa/starter/Application.java | 4 ++++ .../fhir/jpa/starter/common/FhirServerConfigDstu2.java | 6 ------ .../uhn/fhir/jpa/starter/common/StarterJpaConfig.java | 10 ---------- .../java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java | 4 ++++ .../ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java | 4 ++++ .../uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java | 6 +++++- .../ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java | 4 ++++ .../ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java | 4 ++++ .../ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java | 6 ++++-- .../ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java | 5 +++++ .../ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java | 6 +++++- .../ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java | 3 +++ 13 files changed, 46 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 700161b..d56db5c 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} @@ -246,7 +246,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server test diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java index 8031c59..71ada0b 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java @@ -38,6 +38,10 @@ import org.springframework.web.servlet.DispatcherServlet; }) public class Application extends SpringBootServletInitializer { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + public static void main(String[] args) { SpringApplication.run(Application.class, args); 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/CustomBeanTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java index af9db0d..842798c 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java @@ -13,6 +13,10 @@ import org.springframework.boot.test.context.SpringBootTest; }) public class CustomBeanTest { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + @Autowired some.custom.pkg1.CustomBean customBean1; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java index 377719e..9939210 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java @@ -23,6 +23,10 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; public class CustomInterceptorTest { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + @LocalServerPort private int port; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java index 3a84047..0aea7f8 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java @@ -57,8 +57,12 @@ import org.testcontainers.elasticsearch.ElasticsearchContainer; }) @ContextConfiguration(initializers = ElasticsearchLastNR4IT.Initializer.class) public class ElasticsearchLastNR4IT { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } - private IGenericClient ourClient; + + private IGenericClient ourClient; private FhirContext ourCtx; private static final String ELASTIC_VERSION = "7.16.3"; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java index e20aff8..1c5a565 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java @@ -23,6 +23,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; }) public class ExampleServerDstu2IT { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class); private IGenericClient ourClient; private FhirContext ourCtx; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java index 826f311..d7745bd 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -51,6 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class ExampleServerDstu3IT implements IServerSupport { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class); private IGenericClient ourClient; private FhirContext ourCtx; 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..2157c28 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java @@ -20,13 +20,15 @@ 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 "spring.main.allow-bean-definition-overriding=true"}) class ExampleServerR4BIT { + + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4BIT.class); private IGenericClient ourClient; private FhirContext ourCtx; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java index 278a5f0..44808ad 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java @@ -43,6 +43,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; // when running in a spring boot environment "spring.main.allow-bean-definition-overriding=true" }) class ExampleServerR4IT { + + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4IT.class); private IGenericClient ourClient; private FhirContext ourCtx; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java index ddbd6a7..f8e807e 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java @@ -41,7 +41,11 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; }) public class ExampleServerR5IT { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class); + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } + + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class); private IGenericClient ourClient; private FhirContext ourCtx; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java index 9d340b1..a5c2da5 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java @@ -28,6 +28,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; }) public class MultitenantServerR4IT { + static { + System.setProperty("org.springframework.boot.logging.LoggingSystem", "none"); + } private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class); private IGenericClient ourClient;