Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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");

Browse Source
This commit is contained in:
Luke deGruchy
2023-01-10 14:51:32 -05:00
parent 0c7e48cb4d
commit 76650df4dc
13 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>6.2.2</version>
<version>6.3.6-SNAPSHOT</version>
</parent>
<artifactId>hapi-fhir-jpaserver-starter</artifactId>
@@ -44,12 +44,12 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
<artifactId>websocket-jetty-api</artifactId>
<version>${jetty_version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<artifactId>websocket-jetty-client</artifactId>
<version>${jetty_version}</version>
</dependency>
<dependency>
@@ -246,7 +246,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<artifactId>websocket-jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
src/main/java/ca/uhn/fhir/jpa/starter/Application.java
View File

@@ -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);

6
src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java
View File

@@ -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();
}
}

10
src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
View File

@@ -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) {

4
src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java
View File

@@ -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;

4
src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java
View File

@@ -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;

4
src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
View File

@@ -57,6 +57,10 @@ 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 FhirContext ourCtx;

4
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
View File

@@ -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;

4
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
View File

@@ -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;

6
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java
View File

@@ -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;

5
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
View File

@@ -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;

4
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
View File

@@ -41,6 +41,10 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
})
public class ExampleServerR5IT {
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;

3
src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
View File

@@ -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;