[WFLY-490] [WFLY-1790] fixed the HostScopedRole* operations

QStephen · Aug 7, 2013 · 3124219 · 3124219
1 parent 64f6fcf
commit 3124219
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/access/HostScopedRoleAdd.java b/domain-management/src/main/java/org/jboss/as/domain/management/access/HostScopedRoleAdd.java
@@ -23,6 +23,7 @@
 package org.jboss.as.domain.management.access;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -68,9 +69,10 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
 
         String roleName = PathAddress.pathAddress(operation.require(ModelDescriptionConstants.OP_ADDR)).getLastElement().getValue();
 
-        String baseRole = ServerGroupScopedRoleResourceDefinition.BASE_ROLE.resolveModelAttribute(context, model).asString();
+        String baseRole = HostScopedRolesResourceDefinition.BASE_ROLE.resolveModelAttribute(context, model).asString();
 
-        List<ModelNode> nodeList = ServerGroupScopedRoleResourceDefinition.SERVER_GROUPS.resolveModelAttribute(context, model).asList();
+        ModelNode hostsAttribute = HostScopedRolesResourceDefinition.HOSTS.resolveModelAttribute(context, model);
+        List<ModelNode> nodeList = hostsAttribute.isDefined() ? hostsAttribute.asList() : Collections.<ModelNode>emptyList();
 
         addScopedRole(roleName, baseRole, nodeList, authorizer, constraintMap);
     }
@@ -86,11 +88,11 @@ protected void rollbackRuntime(OperationContext context, ModelNode operation, Mo
     static void addScopedRole(final String roleName, final String baseRole, final List<ModelNode> hostNodes,
                               final ConfigurableAuthorizer authorizer, final Map<String, HostEffectConstraint> constraintMap) {
 
-        List<String> serverGroups = new ArrayList<String>();
-        for (ModelNode group : hostNodes) {
-            serverGroups.add(group.asString());
+        List<String> hosts = new ArrayList<String>();
+        for (ModelNode host : hostNodes) {
+            hosts.add(host.asString());
         }
-        HostEffectConstraint constraint = new HostEffectConstraint(serverGroups);
+        HostEffectConstraint constraint = new HostEffectConstraint(hosts);
         authorizer.addScopedRole(roleName, baseRole, constraint);
         constraintMap.put(roleName, constraint);
     }

diff --git a/...-management/src/main/java/org/jboss/as/domain/management/access/HostScopedRoleRemove.java b/...-management/src/main/java/org/jboss/as/domain/management/access/HostScopedRoleRemove.java
@@ -22,6 +22,7 @@
 
 package org.jboss.as.domain.management.access;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +64,8 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
 
                 final String roleName = PathAddress.pathAddress(operation.require(ModelDescriptionConstants.OP_ADDR)).getLastElement().getValue();
                 final String baseRole = ServerGroupScopedRoleResourceDefinition.BASE_ROLE.resolveModelAttribute(context, model).asString();
-                final List<ModelNode> hostNodes = HostScopedRolesResourceDefinition.HOSTS.resolveModelAttribute(context, model).asList();
+                ModelNode hostsAttribute = HostScopedRolesResourceDefinition.HOSTS.resolveModelAttribute(context, model);
+                final List<ModelNode> hostNodes = hostsAttribute.isDefined() ? hostsAttribute.asList() : Collections.<ModelNode>emptyList();
 
                 authorizer.removeScopedRole(roleName);
                 constraintMap.remove(roleName);

diff --git a/.../main/java/org/jboss/as/domain/management/access/HostScopedRoleWriteAttributeHandler.java b/.../main/java/org/jboss/as/domain/management/access/HostScopedRoleWriteAttributeHandler.java
@@ -70,12 +70,14 @@ private void applyChangeToConstraint(final ModelNode operation, final ModelNode
         // null means the resource shouldn't exist and we should have failed in Stage.MODEL
         assert constraint != null : "unknown role " + roleName;
 
-        List<String> serverGroups = new ArrayList<String>();
-        for (ModelNode group : resolvedValue.asList()) {
-            serverGroups.add(group.asString());
+        List<String> hosts = new ArrayList<String>();
+        if (resolvedValue.isDefined()) {
+            for (ModelNode host : resolvedValue.asList()) {
+                hosts.add(host.asString());
+            }
         }
 
-        constraint.setAllowedHosts(serverGroups);
+        constraint.setAllowedHosts(hosts);
     }