WFCORE-4041: fix attribute definitions

wildfly · Apr 11, 2022 · 60695ea · 60695ea
1 parent 5677d23
commit 60695ea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 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
@@ -114,7 +114,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();
@@ -325,7 +324,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();
@@ -510,7 +508,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
@@ -144,7 +144,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
@@ -107,7 +107,6 @@ public abstract class DomainControllerWriteAttributeHandler extends ReloadRequir
                     .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();