Use system properties to control datasource provider suppression

helidon-io · Dec 19, 2024 · f47f42f · f47f42f
1 parent eb393b5
commit f47f42f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/microprofile/server/src/main/java/io/helidon/microprofile/server/JaxRsService.java b/microprofile/server/src/main/java/io/helidon/microprofile/server/JaxRsService.java
@@ -98,10 +98,8 @@ private JaxRsService(ResourceConfig resourceConfig,
 
     static JaxRsService create(ResourceConfig resourceConfig, InjectionManager injectionManager) {
 
-        Config config = ConfigProvider.getConfig();
-
         // Silence warnings from Jersey. See 9019. Allow overriding to pass tck
-        Boolean suppressDatasourceProvider = config.getOptionalValue(SUPPRESS_DATASOURCE_PROVIDER, Boolean.class).orElse(true);
+        boolean suppressDatasourceProvider = Boolean.parseBoolean(System.getProperty(SUPPRESS_DATASOURCE_PROVIDER, "true"));
         if (!resourceConfig.hasProperty(CommonProperties.PROVIDER_DEFAULT_DISABLE) && suppressDatasourceProvider) {
             resourceConfig.addProperties(Map.of(CommonProperties.PROVIDER_DEFAULT_DISABLE, "DATASOURCE"));
         }
@@ -114,6 +112,7 @@ static JaxRsService create(ResourceConfig resourceConfig, InjectionManager injec
                                                                new WebServerBinder(),
                                                                ij);
         Container container = new HelidonJerseyContainer(appHandler);
+        Config config = ConfigProvider.getConfig();
 
         // This configuration via system properties is for the Jersey Client API. Any
         // response in an exception will be mapped to an empty one to prevent data leaks

diff --git a/microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml b/microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml
@@ -125,6 +125,7 @@
                         <webServerHost>localhost</webServerHost>
                         <webServerPort>8080</webServerPort>
                         <jersey.config.client.ignoreExceptionResponse>false</jersey.config.client.ignoreExceptionResponse>
+                        <jersey.config.server.suppressDataSourceProvider>false</jersey.config.server.suppressDataSourceProvider>
                         <jersey.config.allowSystemPropertiesProvider>true</jersey.config.allowSystemPropertiesProvider>
                         <org.jboss.weld.bootstrap.concurrentDeployment>false</org.jboss.weld.bootstrap.concurrentDeployment>
                         <org.jboss.weld.construction.relaxed>false</org.jboss.weld.construction.relaxed>

diff --git a/...k/tck-restful/tck-restful-test/src/test/resources/META-INF/microprofile-config.properties b/...k/tck-restful/tck-restful-test/src/test/resources/META-INF/microprofile-config.properties
@@ -15,5 +15,3 @@
 #
 
 jersey.config.client.ignoreExceptionResponse=false
-jersey.config.server.suppressDataSourceProvider=false
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,3 @@
		#

		jersey.config.client.ignoreExceptionResponse=false
		jersey.config.server.suppressDataSourceProvider=false