Fix reading resource attributes

Author: hpehl

meta/src/main/java/org/jboss/hal/meta/description/AttributeDescription.java

@@ -194,7 +194,7 @@ public boolean listOrObjectValueType() {
      * Checks if the attribute description is of type {@link ModelType#OBJECT} with an object value-type that only contains
      * {@linkplain ModelType#simple() simple attributes} or lists of simple attributes.
      */
-    public boolean simpleValueType() {
+    public boolean simpleRecord() {
         try {
             ModelType type = get(TYPE).asType();
             if (type == OBJECT) {

meta/src/test/java/org/jboss/hal/meta/description/AttributeDescriptionTest.java

@@ -29,6 +29,6 @@ void undefined() {
         assertEquals("undefined", attributeDescription.description());
         assertFalse(attributeDescription.deprecation().isDefined());
         assertEquals("", attributeDescription.formatType());
-        assertFalse(attributeDescription.simpleValueType());
+        assertFalse(attributeDescription.simpleRecord());
     }
 }

ui/src/main/java/org/jboss/hal/ui/resource/ResourceAttribute.java

@@ -24,7 +24,6 @@
 
 import org.jboss.hal.dmr.ModelNode;
 import org.jboss.hal.dmr.ModelNodeHelper;
-import org.jboss.hal.dmr.Property;
 import org.jboss.hal.meta.Metadata;
 import org.jboss.hal.meta.description.AttributeDescription;
 import org.jboss.hal.meta.description.AttributeDescriptions;
@@ -64,7 +63,7 @@ static List<ResourceAttribute> resourceAttributes(OperationDescription operation
             Predicate<AttributeDescription> predicate) {
         List<ResourceAttribute> resourceAttributes = new ArrayList<>();
         for (AttributeDescription description : operationDescription.parameters()) {
-            if (description.simpleValueType()) {
+            if (description.simpleRecord()) {
                 AttributeDescriptions nestedDescriptions = description.valueTypeAttributeDescriptions();
                 for (AttributeDescription nestedDescription : nestedDescriptions) {
                     if (predicate.test(nestedDescription)) {
@@ -81,7 +80,7 @@ static List<ResourceAttribute> resourceAttributes(OperationDescription operation
     }
 
     /**
-     * Collects and returns a list of resource attributes based on an existing resource.
+     * Collects and returns a list of resource attributes based on an existing resource and its metadata.
      *
      * @param resource  The model node representing the resource.
      * @param metadata  The metadata containing resource descriptions and attribute descriptions.
@@ -91,22 +90,19 @@ static List<ResourceAttribute> resourceAttributes(OperationDescription operation
     static List<ResourceAttribute> resourceAttributes(ModelNode resource, Metadata metadata,
             Predicate<AttributeDescription> predicate) {
         List<ResourceAttribute> resourceAttributes = new ArrayList<>();
-        for (Property property : resource.asPropertyList()) {
-            String name = property.getName();
-            AttributeDescription description = metadata.resourceDescription().attributes().get(name);
-            if (description.simpleValueType()) {
-                AttributeDescriptions nestedDescriptions = description.valueTypeAttributeDescriptions();
-                for (AttributeDescription nestedDescription : nestedDescriptions) {
-                    if (predicate.test(nestedDescription)) {
-                        ModelNode nestedValue = ModelNodeHelper.nested(resource, nestedDescription.fullyQualifiedName());
-                        resourceAttributes.add(
-                                new ResourceAttribute(nestedValue, nestedDescription, metadata.securityContext()));
+        for (AttributeDescription ad : metadata.resourceDescription().attributes()) {
+            if (ad.simpleRecord()) {
+                AttributeDescriptions nads = ad.valueTypeAttributeDescriptions();
+                for (AttributeDescription nad : nads) {
+                    if (predicate.test(nad)) {
+                        ModelNode nestedValue = ModelNodeHelper.nested(resource, nad.fullyQualifiedName());
+                        resourceAttributes.add(new ResourceAttribute(nestedValue, nad, metadata.securityContext()));
                     }
                 }
             } else {
-                if (predicate.test(description)) {
-                    ModelNode value = property.getValue();
-                    resourceAttributes.add(new ResourceAttribute(value, description, metadata.securityContext()));
+                if (predicate.test(ad)) {
+                    ModelNode value = resource.get(ad.name());
+                    resourceAttributes.add(new ResourceAttribute(value, ad, metadata.securityContext()));
                 }
             }
         }