Skip to content

Commit f47f42f

Browse files
committed
Use system properties to control datasource provider suppression
1 parent eb393b5 commit f47f42f

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

microprofile/server/src/main/java/io/helidon/microprofile/server/JaxRsService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@ private JaxRsService(ResourceConfig resourceConfig,
9898

9999
static JaxRsService create(ResourceConfig resourceConfig, InjectionManager injectionManager) {
100100

101-
Config config = ConfigProvider.getConfig();
102-
103101
// Silence warnings from Jersey. See 9019. Allow overriding to pass tck
104-
Boolean suppressDatasourceProvider = config.getOptionalValue(SUPPRESS_DATASOURCE_PROVIDER, Boolean.class).orElse(true);
102+
boolean suppressDatasourceProvider = Boolean.parseBoolean(System.getProperty(SUPPRESS_DATASOURCE_PROVIDER, "true"));
105103
if (!resourceConfig.hasProperty(CommonProperties.PROVIDER_DEFAULT_DISABLE) && suppressDatasourceProvider) {
106104
resourceConfig.addProperties(Map.of(CommonProperties.PROVIDER_DEFAULT_DISABLE, "DATASOURCE"));
107105
}
@@ -114,6 +112,7 @@ static JaxRsService create(ResourceConfig resourceConfig, InjectionManager injec
114112
new WebServerBinder(),
115113
ij);
116114
Container container = new HelidonJerseyContainer(appHandler);
115+
Config config = ConfigProvider.getConfig();
117116

118117
// This configuration via system properties is for the Jersey Client API. Any
119118
// response in an exception will be mapped to an empty one to prevent data leaks

microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<webServerHost>localhost</webServerHost>
126126
<webServerPort>8080</webServerPort>
127127
<jersey.config.client.ignoreExceptionResponse>false</jersey.config.client.ignoreExceptionResponse>
128+
<jersey.config.server.suppressDataSourceProvider>false</jersey.config.server.suppressDataSourceProvider>
128129
<jersey.config.allowSystemPropertiesProvider>true</jersey.config.allowSystemPropertiesProvider>
129130
<org.jboss.weld.bootstrap.concurrentDeployment>false</org.jboss.weld.bootstrap.concurrentDeployment>
130131
<org.jboss.weld.construction.relaxed>false</org.jboss.weld.construction.relaxed>

microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/META-INF/microprofile-config.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@
1515
#
1616

1717
jersey.config.client.ignoreExceptionResponse=false
18-
jersey.config.server.suppressDataSourceProvider=false
19-

0 commit comments

Comments
 (0)