[squash] addressed comments

wildfly · Mar 27, 2024 · 0a82e2f · 0a82e2f
1 parent 9ecf0d1
commit 0a82e2f
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 163 deletions.
diff --git a/...ent/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemModel.java b/...ent/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemModel.java
@@ -16,7 +16,7 @@
 enum ElytronOidcClientSubsystemModel implements SubsystemModel {
     VERSION_1_0_0(1, 0, 0),
     VERSION_2_0_0(2, 0, 0),
-    VERSION_3_0_0(3, 0, 0),
+    VERSION_3_0_0(3, 0, 0), // WildFly 32.0-present
     ;
     static final ElytronOidcClientSubsystemModel CURRENT = VERSION_3_0_0;
 

diff --git a/...src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemRegistrar.java b/...src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemRegistrar.java
diff --git a/...on-oidc-client/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcExtension.java b/...on-oidc-client/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcExtension.java
@@ -7,6 +7,8 @@
 
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
 
+import java.util.EnumSet;
+
 import org.jboss.as.controller.Extension;
 import org.jboss.as.controller.ExtensionContext;
 import org.jboss.as.controller.PathElement;
@@ -55,8 +57,9 @@ public void initialize(ExtensionContext context) {
     }
 
     public void initializeParsers(ExtensionParsingContext context) {
-        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_1_0.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_1_0);
-        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_2_0.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_2_0);
-        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW);
+        context.setSubsystemXmlMappings(SUBSYSTEM_NAME, EnumSet.allOf(ElytronOidcSubsystemSchema.class));
+//        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_1_0.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_1_0);
+//        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_2_0.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_2_0);
+//        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW);
     }
 }
diff --git a/...ient/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemDefinition.java b/...ient/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemDefinition.java
@@ -12,9 +12,10 @@
 import java.util.Collections;
 
 import org.jboss.as.controller.AttributeDefinition;
-import org.jboss.as.controller.PersistentResourceDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.PersistentResourceDefinition;
 import org.jboss.as.controller.ReloadRequiredRemoveStepHandler;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.capability.RuntimeCapability;
@@ -25,13 +26,15 @@
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.ServiceTarget;
+import org.wildfly.subsystem.resource.SubsystemResourceDefinitionRegistrar;
 
 /**
  * Root subsystem definition for the Elytron OpenID Connect subsystem.
  *
  * @author <a href="mailto:fjuma@redhat.com">Farah Juma</a>
  */
 class ElytronOidcSubsystemDefinition extends PersistentResourceDefinition {
+    static final PathElement PATH = SubsystemResourceDefinitionRegistrar.pathElement(ElytronOidcExtension.SUBSYSTEM_NAME);
     static final String CONFIG_CAPABILITY_NAME = "org.wildlfly.elytron.oidc";
     static final String ELYTRON_CAPABILITY_NAME = "org.wildfly.security.elytron";