WFCORE-4041: fix attribute definitions

wildfly · Feb 12, 2024 · 1318307 · 1318307
1 parent 0f80581
commit 1318307
Show file tree

Hide file tree

Showing 25 changed files with 22 additions and 29 deletions.
diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/LdapRealmDefinition.java b/elytron/src/main/java/org/wildfly/extension/elytron/LdapRealmDefinition.java
@@ -101,7 +101,6 @@ static class AttributeMappingObjectDefinition {
 
         static final SimpleAttributeDefinition RECURSIVE_SEARCH = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.SEARCH_RECURSIVE, ModelType.BOOLEAN, true)
                 .setRequires(ElytronDescriptionConstants.FILTER)
-                .setDefaultValue(ModelNode.TRUE)
                 .setAllowExpression(true)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .build();
@@ -312,7 +311,6 @@ static class IdentityMappingObjectDefinition {
 
         static final SimpleAttributeDefinition USE_RECURSIVE_SEARCH = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.USE_RECURSIVE_SEARCH, ModelType.BOOLEAN, true)
                 .setRequires(ElytronDescriptionConstants.SEARCH_BASE_DN)
-                .setDefaultValue(ModelNode.FALSE)
                 .setAllowExpression(true)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .build();
@@ -497,7 +495,7 @@ private void configureIdentityMapping(OperationContext context, ModelNode model,
             }
 
             ModelNode useRecursiveSearchNode = IdentityMappingObjectDefinition.USE_RECURSIVE_SEARCH.resolveModelAttribute(context, identityMappingNode);
-            if (useRecursiveSearchNode.asBoolean()) {
+            if (useRecursiveSearchNode.isDefined() && useRecursiveSearchNode.asBoolean()) {
                 identityMappingBuilder.searchRecursive();
             }
 

diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/SaslServerDefinitions.java b/elytron/src/main/java/org/wildfly/extension/elytron/SaslServerDefinitions.java
@@ -131,7 +131,6 @@ class SaslServerDefinitions {
     static final SimpleAttributeDefinition VERSION_COMPARISON = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.VERSION_COMPARISON, ModelType.STRING, false)
         .setRequired(false)
         .setAllowExpression(true)
-        .setDefaultValue(new ModelNode(ElytronDescriptionConstants.LESS_THAN))
         .setRequires(ElytronDescriptionConstants.PROVIDER_VERSION)
         .setAllowedValues(ElytronDescriptionConstants.LESS_THAN, ElytronDescriptionConstants.GREATER_THAN)
         .setValidator(EnumValidator.create(Comparison.class))

diff --git a/...n/java/org/jboss/as/host/controller/operations/DomainControllerWriteAttributeHandler.java b/...n/java/org/jboss/as/host/controller/operations/DomainControllerWriteAttributeHandler.java
@@ -32,7 +32,6 @@
 import org.jboss.as.host.controller.discovery.StaticDiscovery;
 import org.jboss.as.host.controller.ignored.IgnoredDomainResourceRegistry;
 import org.jboss.as.host.controller.model.host.AdminOnlyDomainConfigPolicy;
-import org.jboss.as.remoting.Protocol;
 import org.jboss.as.repository.ContentRepository;
 import org.jboss.as.repository.HostFileRepository;
 import org.jboss.dmr.ModelNode;
@@ -92,8 +91,6 @@ public abstract class DomainControllerWriteAttributeHandler extends ReloadRequir
             new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.PROTOCOL, ModelType.STRING)
                     .setRequired(false)
                     .setAllowExpression(true)
-                    .setValidator(EnumValidator.create(Protocol.class))
-                    .setDefaultValue(org.jboss.as.remoting.Protocol.REMOTE.toModelNode())
                     .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
                     .setRequires(ModelDescriptionConstants.HOST, ModelDescriptionConstants.PORT)
                     .build();

diff --git a/...c/main/java/org/jboss/as/host/controller/operations/RemoteDomainControllerAddHandler.java b/...c/main/java/org/jboss/as/host/controller/operations/RemoteDomainControllerAddHandler.java
@@ -30,7 +30,6 @@
 import org.jboss.as.controller.registry.Resource;
 import org.jboss.as.host.controller.descriptions.HostResolver;
 import org.jboss.as.host.controller.model.host.AdminOnlyDomainConfigPolicy;
-import org.jboss.as.remoting.Protocol;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
 import org.wildfly.security.auth.client.AuthenticationContext;
@@ -62,8 +61,6 @@ public class RemoteDomainControllerAddHandler implements OperationStepHandler {
     public static final SimpleAttributeDefinition PROTOCOL = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.PROTOCOL, ModelType.STRING)
             .setRequired(false)
             .setAllowExpression(true)
-            .setValidator(EnumValidator.create(Protocol.class))
-            .setDefaultValue(Protocol.REMOTE.toModelNode())
             .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
             .setRequires(ModelDescriptionConstants.HOST, ModelDescriptionConstants.PORT)
             .build();

diff --git a/...src/test/java/org/jboss/as/test/integration/domain/DomainControllerMigrationTestCase.java b/...src/test/java/org/jboss/as/test/integration/domain/DomainControllerMigrationTestCase.java
@@ -196,6 +196,7 @@ public void testDCFailover() throws Exception {
         changePrimaryOp.get(ModelDescriptionConstants.OP).set(RemoteDomainControllerAddHandler.OPERATION_NAME);
         changePrimaryOp.get(ModelDescriptionConstants.HOST).set("${jboss.test.host.secondary.address}");
         changePrimaryOp.get(ModelDescriptionConstants.PORT).set(MGMT_PORTS[1]);
+        changePrimaryOp.get(ModelDescriptionConstants.PROTOCOL).set("remote");
         changePrimaryOp.get(ModelDescriptionConstants.AUTHENTICATION_CONTEXT).set("secondaryHostAContext");
 
         hostUtils[2].executeForResult(changePrimaryOp);

diff --git a/...st/java/org/jboss/as/test/integration/domain/SimpleDomainControllerMigrationTestCase.java b/...st/java/org/jboss/as/test/integration/domain/SimpleDomainControllerMigrationTestCase.java
@@ -194,6 +194,7 @@ public void testDCFailover() throws Exception {
         changePrimaryOp.get(ModelDescriptionConstants.OP).set(RemoteDomainControllerAddHandler.OPERATION_NAME);
         changePrimaryOp.get(ModelDescriptionConstants.HOST).set("${jboss.test.host.secondary.address}");
         changePrimaryOp.get(ModelDescriptionConstants.PORT).set(MGMT_PORTS[1]);
+        changePrimaryOp.get(ModelDescriptionConstants.PROTOCOL).set("remote");
         changePrimaryOp.get(ModelDescriptionConstants.SECURITY_REALM).set("ManagementRealm");
 
         hostUtils[2].executeForResult(changePrimaryOp);

diff --git a/testsuite/domain/src/test/resources/host-configs/admin-only-discovery.xml b/testsuite/domain/src/test/resources/host-configs/admin-only-discovery.xml
@@ -27,7 +27,7 @@
         <!-- Remote domain controller configuration with a host and port -->
         <remote authentication-context="secondaryHostAContext" ignore-unused-configuration="true" admin-only-policy="${jboss.test.admin-only-policy}">
             <discovery-options>
-                <static-discovery name="primary" host="${jboss.test.host.primary.address}" port="9999"/>
+                <static-discovery name="primary" protocol="remote" host="${jboss.test.host.primary.address}" port="9999"/>
             </discovery-options>
         </remote>
     </domain-controller>

diff --git a/testsuite/domain/src/test/resources/host-configs/admin-only-no-discovery.xml b/testsuite/domain/src/test/resources/host-configs/admin-only-no-discovery.xml
@@ -25,7 +25,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote authentication-context="secondaryHostAContext" ignore-unused-configuration="true" admin-only-policy="${jboss.test.admin-only-policy}">
+        <remote protocol="remote" authentication-context="secondaryHostAContext" ignore-unused-configuration="true" admin-only-policy="${jboss.test.admin-only-policy}">
             <!--<discovery-options>
                 <static-discovery name="primary" host="${jboss.test.host.primary.address}" port="9999"/>
             </discovery-options>-->

diff --git a/testsuite/domain/src/test/resources/host-configs/host-auto-ignore-secondary.xml b/testsuite/domain/src/test/resources/host-configs/host-auto-ignore-secondary.xml
@@ -30,7 +30,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
         <!--
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.jsr77"/>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-failover2.xml b/testsuite/domain/src/test/resources/host-configs/host-failover2.xml
@@ -29,7 +29,7 @@
     </management>
 
     <domain-controller>
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
     </domain-controller>
 
     <!--

diff --git a/testsuite/domain/src/test/resources/host-configs/host-failover3.xml b/testsuite/domain/src/test/resources/host-configs/host-failover3.xml
@@ -29,7 +29,7 @@
     </management>
 
     <domain-controller>
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="ignored"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-minimal.xml b/testsuite/domain/src/test/resources/host-configs/host-minimal.xml
@@ -30,7 +30,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="false">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="false">
         </remote>
     </domain-controller>
 

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-auto-start.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-auto-start.xml
@@ -49,7 +49,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.jsr77"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-cacheddc.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-cacheddc.xml
@@ -30,7 +30,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="false">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" ignore-unused-configuration="false">
         </remote>
     </domain-controller>
 

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-config-changes.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-config-changes.xml
@@ -51,7 +51,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.threads"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-discovery-options.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-discovery-options.xml
@@ -64,7 +64,7 @@
         <!-- Remote domain controller configuration with a host and port -->
         <remote security-realm="ManagementRealm">
             <discovery-options>
-                <static-discovery name="start-option" host="${jboss.test.host.primary.address}" port="9999" />
+                <static-discovery name="start-option" protocol="remote" host="${jboss.test.host.primary.address}" port="9999" />
             </discovery-options>
         </remote>
     </domain-controller>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml
@@ -49,7 +49,7 @@
     </management>
      <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
      </domain-controller>
     <interfaces>
       <interface name="management">

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml
@@ -39,7 +39,7 @@
     </management>
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext"/>
     </domain-controller>
     <interfaces>
         <interface name="management">

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-failure.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-failure.xml
@@ -49,7 +49,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" />
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext" />
     </domain-controller>
 
     <interfaces>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-main-three-without-jvm.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-main-three-without-jvm.xml
@@ -50,7 +50,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.threads"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-rbac-properties.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-rbac-properties.xml
@@ -49,7 +49,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.jsr77"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-rbac.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-rbac.xml
@@ -49,7 +49,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.jsr77"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary.xml
@@ -51,7 +51,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" authentication-context="secondaryHostAContext">
             <ignored-resources type="extension">
                 <instance name="org.jboss.as.threads"/>
             </ignored-resources>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-synchronization-hc1.xml b/testsuite/domain/src/test/resources/host-configs/host-synchronization-hc1.xml
@@ -22,7 +22,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" username="secondary" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" username="secondary" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
         </remote>
     </domain-controller>
 

diff --git a/testsuite/domain/src/test/resources/host-configs/host-synchronization-hc2.xml b/testsuite/domain/src/test/resources/host-configs/host-synchronization-hc2.xml
@@ -22,7 +22,7 @@
 
     <domain-controller>
         <!-- Remote domain controller configuration with a host and port -->
-        <remote host="${jboss.test.host.primary.address}" port="9999" username="secondary" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
+        <remote protocol="remote" host="${jboss.test.host.primary.address}" port="9999" username="secondary" authentication-context="secondaryHostAContext" ignore-unused-configuration="true">
         </remote>
     </domain-controller>