WFLY-17419 Eliminate static references to JSF ResourceDefinition inst…

…ances
wildfly · Dec 16, 2022 · 78394ac · 78394ac
1 parent e02f190
commit 78394ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFExtension.java b/jsf/subsystem/src/main/java/org/jboss/as/jsf/subsystem/JSFExtension.java
@@ -69,7 +69,7 @@ static StandardResourceDescriptionResolver getResourceDescriptionResolver(final
     public void initialize(final ExtensionContext context) {
         JSFLogger.ROOT_LOGGER.debug("Activating JSF(Mojarra) Extension");
         final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
-        subsystem.registerSubsystemModel(JSFResourceDefinition.INSTANCE);
+        subsystem.registerSubsystemModel(new JSFResourceDefinition());
         subsystem.registerXMLElementWriter(JSFSubsystemParser_1_1.INSTANCE);
     }
 
@@ -87,7 +87,7 @@ static class JSFSubsystemParser_1_0 extends PersistentResourceXMLParser {
         private static final PersistentResourceXMLDescription xmlDescription;
 
         static {
-            xmlDescription = builder(JSFResourceDefinition.INSTANCE.getPathElement(), NAMESPACE_1_0)
+            xmlDescription = builder(PATH_SUBSYSTEM, NAMESPACE_1_0)
                     .addAttributes(JSFResourceDefinition.DEFAULT_JSF_IMPL_SLOT)
                     .build();
         }
@@ -104,7 +104,7 @@ static class JSFSubsystemParser_1_1 extends PersistentResourceXMLParser {
         private static final PersistentResourceXMLDescription xmlDescription;
 
         static {
-            xmlDescription = builder(JSFResourceDefinition.INSTANCE.getPathElement(), NAMESPACE_1_1)
+            xmlDescription = builder(PATH_SUBSYSTEM, NAMESPACE_1_1)
                     .addAttributes(JSFResourceDefinition.DEFAULT_JSF_IMPL_SLOT)
                     .addAttributes(JSFResourceDefinition.DISALLOW_DOCTYPE_DECL)
                     .build();

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
@@ -49,8 +49,6 @@ public class JSFResourceDefinition extends PersistentResourceDefinition {
             .addRequirements(Capabilities.WELD_CAPABILITY_NAME)
             .build();
 
-    public static final JSFResourceDefinition INSTANCE = new JSFResourceDefinition();
-
     protected static final SimpleAttributeDefinition DEFAULT_JSF_IMPL_SLOT =
             new SimpleAttributeDefinitionBuilder(DEFAULT_SLOT_ATTR_NAME, ModelType.STRING, true)
             .setAllowExpression(true)
@@ -65,7 +63,7 @@ public class JSFResourceDefinition extends PersistentResourceDefinition {
                     .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
                     .build();
 
-    private JSFResourceDefinition() {
+    JSFResourceDefinition() {
         super(new SimpleResourceDefinition.Parameters(JSFExtension.PATH_SUBSYSTEM, JSFExtension.getResourceDescriptionResolver())
                 .setAddHandler(JSFSubsystemAdd.INSTANCE)
                 .setRemoveHandler(ReloadRequiredRemoveStepHandler.INSTANCE)