Merge pull request wildfly#17797 from jamezp/WFLY-19209

[WFLY-19209] Do not attempt to use the RESTEasy MicroProfile Configur…
darranl · Apr 11, 2024 · 0aecb40 · 0aecb40
2 parents 46fee36 + 4d91636
commit 0aecb40
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsIntegrationProcessor.java b/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsIntegrationProcessor.java
@@ -45,6 +45,7 @@
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleIdentifier;
+import org.jboss.modules.ModuleLoadException;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceRegistry;
 import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;
@@ -103,7 +104,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         if (module != null) {
             final CapabilityServiceSupport support = deploymentUnit.getAttachment(Attachments.CAPABILITY_SERVICE_SUPPORT);
             final WildFlyConfigurationFactory configurationFactory = WildFlyConfigurationFactory.getInstance();
-            configurationFactory.register(module.getClassLoader(), support.hasCapability("org.wildfly.microprofile.config"));
+            configurationFactory.register(module.getClassLoader(), useMicroProfileConfig(module, support));
         }
 
         final List<ParamValueMetaData> params = webdata.getContextParams();
@@ -610,4 +611,18 @@ private String convertMapToString(ModelNode modelNode) {
         }
         return sb.toString();
     }
+
+    private static boolean useMicroProfileConfig(final Module module, final CapabilityServiceSupport support) {
+        final boolean configSupported = support.hasCapability("org.wildfly.microprofile.config");
+        if (configSupported) {
+            // Can we load the org.jboss.resteasy.microprofile.config module? If so we can use the MicroProfile backed
+            // configuration in RESTEasy. Otherwise, we need to use the default.
+            try {
+                module.getModule("org.jboss.resteasy.microprofile.config");
+                return true;
+            } catch (ModuleLoadException ignore) {
+            }
+        }
+        return false;
+    }
 }