Merge pull request wildfly#17582 from pferraro/WFLY-18990

WFLY-18990 Remove illegal uses of Operation.hasOptionalCapability(String, null, null) in JSF subsystem
rhusar · Feb 14, 2024 · 40c4e5f · 40c4e5f
2 parents 9e5f1dc + e8368bd
commit 40c4e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFResourceDefinition.java b/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFResourceDefinition.java
@@ -31,7 +31,7 @@ public class JSFResourceDefinition extends PersistentResourceDefinition {
     public static final String DEFAULT_SLOT_ATTR_NAME = "default-jsf-impl-slot";
     public static final String DISALLOW_DOCTYPE_DECL_ATTR_NAME = "disallow-doctype-decl";
     public static final String DEFAULT_SLOT = "main";
-    private static final RuntimeCapability<Void> FACES_CAPABILITY = RuntimeCapability.Builder.of("org.wildfly.faces")
+    static final RuntimeCapability<Void> FACES_CAPABILITY = RuntimeCapability.Builder.of("org.wildfly.faces")
             .addRequirements(Capabilities.WELD_CAPABILITY_NAME)
             .build();
 

diff --git a/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFSubsystemAdd.java b/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFSubsystemAdd.java
@@ -49,7 +49,7 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
                 processorTarget.addDeploymentProcessor(JSFExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_JSF_MANAGED_BEANS, new JSFComponentProcessor());
 
                 processorTarget.addDeploymentProcessor(JSFExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JSF_ANNOTATIONS, new JSFAnnotationProcessor());
-                if (context.hasOptionalCapability("org.wildfly.bean-validation", null, null)) {
+                if (context.hasOptionalCapability("org.wildfly.bean-validation", JSFResourceDefinition.FACES_CAPABILITY.getName(), null)) {
                     processorTarget.addDeploymentProcessor(JSFExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JSF_VALIDATOR_FACTORY, new JSFBeanValidationFactoryProcessor());
                 }
             }