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");
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user