[squash] change to preview:2.0

wildfly · Mar 25, 2024 · 9ecf0d1 · 9ecf0d1
1 parent 7426070
commit 9ecf0d1
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 49 deletions.
diff --git a/...src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemRegistrar.java b/...src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemRegistrar.java
@@ -23,8 +23,7 @@
 
 public class ElytronOidcClientSubsystemRegistrar {
 
-    static final String NAME = "elytron-oidc-client";
-    static final PathElement PATH = SubsystemResourceDefinitionRegistrar.pathElement(NAME);
+    static final PathElement PATH = SubsystemResourceDefinitionRegistrar.pathElement(ElytronOidcExtension.SUBSYSTEM_NAME);
     static final AttributeParser SIMPLE_ATTRIBUTE_PARSER = new AttributeElementParser();
     static final AttributeMarshaller SIMPLE_ATTRIBUTE_MARSHALLER = new AttributeElementMarshaller();
 

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
@@ -57,6 +57,6 @@ 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_3_0_COMMUNITY.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_3_0_COMMUNITY);
+        context.setSubsystemXmlMapping(SUBSYSTEM_NAME, ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW.getNamespace().toString(), ElytronOidcSubsystemSchema.VERSION_2_0_PREVIEW);
     }
 }
diff --git a/...c-client/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemSchema.java b/...c-client/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemSchema.java
@@ -5,18 +5,6 @@
 
 package org.wildfly.extension.elytron.oidc;
 
-
-import org.jboss.as.controller.Feature;
-import org.jboss.as.controller.PersistentSubsystemSchema;
-import org.jboss.as.controller.PersistentResourceXMLDescription;
-import org.jboss.as.controller.SubsystemSchema;
-import org.jboss.as.controller.xml.VersionedNamespace;
-import org.jboss.as.version.Stability;
-import org.jboss.staxmapper.IntVersion;
-
-import java.util.EnumSet;
-import java.util.Map;
-
 import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemRegistrar.SIMPLE_ATTRIBUTE_MARSHALLER;
 import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemRegistrar.SIMPLE_ATTRIBUTE_PARSER;
 import static org.wildfly.extension.elytron.oidc.SecureDeploymentDefinition.ADAPTER_STATE_COOKIE_PATH;
@@ -31,6 +19,17 @@
 import static org.wildfly.extension.elytron.oidc.SecureDeploymentDefinition.TURN_OFF_CHANGE_SESSION_ID_ON_LOGIN;
 import static org.wildfly.extension.elytron.oidc.SecureDeploymentDefinition.USE_RESOURCE_ROLE_MAPPINGS;
 
+import java.util.EnumSet;
+import java.util.Map;
+
+import org.jboss.as.controller.Feature;
+import org.jboss.as.controller.PersistentSubsystemSchema;
+import org.jboss.as.controller.PersistentResourceXMLDescription;
+import org.jboss.as.controller.SubsystemSchema;
+import org.jboss.as.controller.xml.VersionedNamespace;
+import org.jboss.as.version.Stability;
+import org.jboss.staxmapper.IntVersion;
+
 /**
  * Enumerated the schema versions for the elytron-oidc-client subsystem.
  * @author Prarthona Paul
@@ -39,10 +38,10 @@
 public enum ElytronOidcSubsystemSchema implements PersistentSubsystemSchema<ElytronOidcSubsystemSchema> {
     VERSION_1_0(1, Stability.DEFAULT),
     VERSION_2_0(2, Stability.DEFAULT),
-    VERSION_3_0_COMMUNITY(3, 0, Stability.COMMUNITY),
+    VERSION_2_0_PREVIEW(2, 0, Stability.PREVIEW),
     ;
 
-    static final Map<Stability, ElytronOidcSubsystemSchema> CURRENT = Feature.map(EnumSet.of(VERSION_3_0_COMMUNITY, VERSION_2_0));
+    static final Map<Stability, ElytronOidcSubsystemSchema> CURRENT = Feature.map(EnumSet.of(VERSION_2_0_PREVIEW, VERSION_2_0));
 
     private final VersionedNamespace<IntVersion, ElytronOidcSubsystemSchema> namespace;
 

diff --git a/...nt/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemTransformers.java b/...nt/src/main/java/org/wildfly/extension/elytron/oidc/ElytronOidcSubsystemTransformers.java
@@ -5,6 +5,10 @@
 
 package org.wildfly.extension.elytron.oidc;
 
+import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemModel.VERSION_1_0_0;
+import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemModel.VERSION_2_0_0;
+import static org.wildfly.extension.elytron.oidc.ElytronOidcDescriptionConstants.SECURE_SERVER;
+
 import org.jboss.as.controller.ModelVersion;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.transform.ExtensionTransformerRegistration;
@@ -13,13 +17,6 @@
 import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
 import org.jboss.as.controller.transform.description.TransformationDescriptionBuilder;
 
-
-import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemModel.VERSION_1_0_0;
-import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemModel.VERSION_2_0_0;
-import static org.wildfly.extension.elytron.oidc.ElytronOidcClientSubsystemModel.VERSION_3_0_0;
-import static org.wildfly.extension.elytron.oidc.ElytronOidcDescriptionConstants.SECURE_DEPLOYMENT;
-import static org.wildfly.extension.elytron.oidc.ElytronOidcDescriptionConstants.SECURE_SERVER;
-
 public class ElytronOidcSubsystemTransformers implements ExtensionTransformerRegistration {
 
     @Override
@@ -32,25 +29,25 @@ public void registerTransformers(SubsystemTransformerRegistration registration)
 
         ChainedTransformationDescriptionBuilder chainedBuilder = TransformationDescriptionBuilder.Factory.createChainedSubystemInstance(registration.getCurrentSubsystemVersion());
         // 3.0.0 (WildFly 32) to 1.0.0 (WildFly 29)
-        from3(chainedBuilder);
+//        from3(chainedBuilder);
         // 2.0.0 (WildFly 29) to 1.0.0 (WildFly 28)
         from2(chainedBuilder);
 
-        chainedBuilder.buildAndRegister(registration, new ModelVersion[] { VERSION_2_0_0.getVersion(), VERSION_1_0_0.getVersion() });
+        chainedBuilder.buildAndRegister(registration, new ModelVersion[] { VERSION_1_0_0.getVersion() });
     }
 
     private static void from2(ChainedTransformationDescriptionBuilder chainedBuilder) {
         ResourceTransformationDescriptionBuilder builder = chainedBuilder.createBuilder(VERSION_2_0_0.getVersion(), VERSION_1_0_0.getVersion());
         builder.rejectChildResource(PathElement.pathElement(SECURE_SERVER));
     }
-
-    private static void from3(ChainedTransformationDescriptionBuilder chainedBuilder) {
-        ResourceTransformationDescriptionBuilder builder = chainedBuilder.createBuilder(VERSION_3_0_0.getVersion(), VERSION_2_0_0.getVersion());
-        builder.addChildResource(PathElement.pathElement(SECURE_SERVER))
-                .getAttributeBuilder();
-
-        builder.addChildResource(PathElement.pathElement(SECURE_DEPLOYMENT))
-                .getAttributeBuilder();
-    }
+    // TODO: Figure out how to handle the transformer with a preview level attribute being added to the subsystem
+//    private static void from3(ChainedTransformationDescriptionBuilder chainedBuilder) {
+//        ResourceTransformationDescriptionBuilder builder = chainedBuilder.createBuilder(VERSION_3_0_0.getVersion(), VERSION_2_0_0.getVersion());
+//        builder.addChildResource(PathElement.pathElement(SECURE_SERVER))
+//                .getAttributeBuilder();
+//
+//        builder.addChildResource(PathElement.pathElement(SECURE_DEPLOYMENT))
+//                .getAttributeBuilder();
+//    }
 
 }
diff --git a/...fly-elytron-oidc-client_community_3_0.xsd → ...ldfly-elytron-oidc-client_preview_2_0.xsd b/...fly-elytron-oidc-client_community_3_0.xsd → ...ldfly-elytron-oidc-client_preview_2_0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:wildfly:elytron-oidc-client:community:3.0"
-            xmlns="urn:wildfly:elytron-oidc-client:community:3.0"
+            targetNamespace="urn:wildfly:elytron-oidc-client:preview:2.0"
+            xmlns="urn:wildfly:elytron-oidc-client:preview:2.0"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
             version="1.0">

diff --git a/.../src/test/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemTestCase.java b/.../src/test/java/org/wildfly/extension/elytron/oidc/ElytronOidcClientSubsystemTestCase.java
@@ -5,15 +5,14 @@
 
 package org.wildfly.extension.elytron.oidc;
 
+import java.util.EnumSet;
+import java.util.Properties;
+
 import org.jboss.as.subsystem.test.AbstractSubsystemSchemaTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.EnumSet;
-import java.util.Properties;
-
-
 /**
  * A test class that tests the subsystem parsing of each subsystem
  * version and stability.
@@ -28,7 +27,7 @@ public static Iterable<ElytronOidcSubsystemSchema> parameters() {
     }
 
     public ElytronOidcClientSubsystemTestCase(ElytronOidcSubsystemSchema schema) {
-        super(ElytronOidcClientSubsystemRegistrar.NAME, new ElytronOidcExtension(), schema, ElytronOidcSubsystemSchema.CURRENT.get(schema.getStability()));
+        super(ElytronOidcExtension.SUBSYSTEM_NAME, new ElytronOidcExtension(), schema, ElytronOidcSubsystemSchema.CURRENT.get(schema.getStability()));
     }
 
     @Override

diff --git a/...ron-oidc-client/src/test/java/org/wildfly/extension/elytron/oidc/ExpressionsTestCase.java b/...ron-oidc-client/src/test/java/org/wildfly/extension/elytron/oidc/ExpressionsTestCase.java
@@ -15,6 +15,7 @@
 import org.jboss.as.subsystem.test.AbstractSubsystemTest;
 import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.KernelServices;
+import org.jboss.as.version.Stability;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,14 +43,19 @@ public ExpressionsTestCase(ElytronOidcSubsystemSchema schema) {
     public void testExpressions() throws Throwable {
         if (services != null) return;
         String subsystemXml = "oidc-expressions.xml";
-        services = super.createKernelServicesBuilder(new DefaultInitializer()).setSubsystemXmlResource(subsystemXml).build();
+        services = super.createKernelServicesBuilder(new DefaultInitializer(Stability.PREVIEW)).setSubsystemXmlResource(subsystemXml).build();
         if (! services.isSuccessfulBoot()) {
             Assert.fail(services.getBootError().toString());
         }
     }
 
-    private static class DefaultInitializer extends AdditionalInitialization {
+    protected static class DefaultInitializer extends AdditionalInitialization {
 
+        private final Stability stability;
+
+        public DefaultInitializer(Stability stability) {
+            this.stability = stability;
+        }
         @Override
         protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegistry, Resource rootResource, ManagementResourceRegistration rootRegistration, RuntimeCapabilityRegistry capabilityRegistry) {
             super.initializeExtraSubystemsAndModel(extensionRegistry, rootResource, rootRegistration, capabilityRegistry);
@@ -61,6 +67,11 @@ protected RunningMode getRunningMode() {
             return RunningMode.NORMAL;
         }
 
+        @Override
+        public Stability getStability() {
+            return stability;
+        }
+
     }
 
 }
diff --git a/elytron-oidc-client/src/test/java/org/wildfly/extension/elytron/oidc/OidcTestCase.java b/elytron-oidc-client/src/test/java/org/wildfly/extension/elytron/oidc/OidcTestCase.java
@@ -16,6 +16,7 @@
 import org.jboss.as.subsystem.test.AbstractSubsystemTest;
 import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.KernelServices;
+import org.jboss.as.version.Stability;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +47,7 @@ public OidcTestCase(ElytronOidcSubsystemSchema schema) {
     public void prepare() throws Throwable {
         if (services != null) return;
         String subsystemXml = "oidc.xml";
-        services = super.createKernelServicesBuilder(new DefaultInitializer()).setSubsystemXmlResource(subsystemXml).build();
+        services = super.createKernelServicesBuilder(new DefaultInitializer(Stability.PREVIEW)).setSubsystemXmlResource(subsystemXml).build();
         if (! services.isSuccessfulBoot()) {
             Assert.fail(services.getBootError().toString());
         }
@@ -102,8 +103,13 @@ public void testSecureServerWithRealm() throws Exception {
         assertEquals(expectedJson, configService.getJSON("wildfly-console"));
     }
 
-    private static class DefaultInitializer extends AdditionalInitialization {
+    protected static class DefaultInitializer extends AdditionalInitialization {
 
+        private final Stability stability;
+
+        public DefaultInitializer(Stability stability) {
+            this.stability = stability;
+        }
         @Override
         protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegistry, Resource rootResource, ManagementResourceRegistration rootRegistration, RuntimeCapabilityRegistry capabilityRegistry) {
             super.initializeExtraSubystemsAndModel(extensionRegistry, rootResource, rootRegistration, capabilityRegistry);
@@ -115,6 +121,11 @@ protected RunningMode getRunningMode() {
             return RunningMode.NORMAL;
         }
 
+        @Override
+        public Stability getStability() {
+            return stability;
+        }
+
     }
 
 }
diff --git a/...idc/elytron-oidc-client-community-3.0.xml → .../oidc/elytron-oidc-client-preview-2.0.xml b/...idc/elytron-oidc-client-community-3.0.xml → .../oidc/elytron-oidc-client-preview-2.0.xml
@@ -3,7 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<subsystem xmlns="urn:wildfly:elytron-oidc-client:community:3.0">
+<subsystem xmlns="urn:wildfly:elytron-oidc-client:preview:2.0">
     <realm name="main">
         <realm-public-key>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4siLKUew0WYxdtq6/rwk4Uj/4amGFFnE/yzIxQVU0PUqz3QBRVkUWpDj0K6ZnS5nzJV/y6DHLEy7hjZTdRDphyF1sq09aDOYnVpzu8o2sIlMM8q5RnUyEfIyUZqwo8pSZDJ90fS0s+IDUJNCSIrAKO3w1lqZDHL6E/YFHXyzkvQIDAQAB</realm-public-key>
         <auth-server-url>http://localhost:8080/auth</auth-server-url>

diff --git a/...on-oidc-client/src/test/resources/org/wildfly/extension/elytron/oidc/oidc-expressions.xml b/...on-oidc-client/src/test/resources/org/wildfly/extension/elytron/oidc/oidc-expressions.xml
@@ -3,7 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<subsystem xmlns="urn:wildfly:elytron-oidc-client:community:3.0">
+<subsystem xmlns="urn:wildfly:elytron-oidc-client:preview:2.0">
     <realm name="main-expressions">
         <realm-public-key>${exp.realm-public-key:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4siLKUew0WYxdtq6/rwk4Uj/4amGFFnE/yzIxQVU0PUqz3QBRVkUWpDj0K6ZnS5nzJV/y6DHLEy7hjZTdRDphyF1sq09aDOYnVpzu8o2sIlMM8q5RnUyEfIyUZqwo8pSZDJ90fS0s+IDUJNCSIrAKO3w1lqZDHL6E/YFHXyzkvQIDAQAB}</realm-public-key>
         <auth-server-url>${exp.auth-server-url:http://localhost:8080/auth}</auth-server-url>

diff --git a/elytron-oidc-client/src/test/resources/org/wildfly/extension/elytron/oidc/oidc.xml b/elytron-oidc-client/src/test/resources/org/wildfly/extension/elytron/oidc/oidc.xml
@@ -3,7 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<subsystem xmlns="urn:wildfly:elytron-oidc-client:community:3.0">
+<subsystem xmlns="urn:wildfly:elytron-oidc-client:preview:2.0">
     <realm name="main">
         <realm-public-key>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4siLKUew0WYxdtq6/rwk4Uj/4amGFFnE/yzIxQVU0PUqz3QBRVkUWpDj0K6ZnS5nzJV/y6DHLEy7hjZTdRDphyF1sq09aDOYnVpzu8o2sIlMM8q5RnUyEfIyUZqwo8pSZDJ90fS0s+IDUJNCSIrAKO3w1lqZDHL6E/YFHXyzkvQIDAQAB</realm-public-key>
         <auth-server-url>http://localhost:8080/auth</auth-server-url>