Merge pull request #6226 from kabir/transformation-utils-fix

[WFCORE-7036] TransformationUtils.modelToResource() should not return…
wildfly · Oct 29, 2024 · b9bb3f7 · b9bb3f7
2 parents 9bbb4fd + 8744c68
commit b9bb3f7
Show file tree

Hide file tree

Showing 4 changed files with 668 additions and 4 deletions.
diff --git a/subsystem-test/framework/src/main/java/org/jboss/as/subsystem/test/TransformationUtils.java b/subsystem-test/framework/src/main/java/org/jboss/as/subsystem/test/TransformationUtils.java
@@ -96,10 +96,6 @@ private static Resource modelToResource(final PathAddress startAddress, final Im
             }
             allFields.remove(name);
         }
-        if (!value.isDefined() && model.isDefined() && reg.getChildAddresses(PathAddress.EMPTY_ADDRESS).isEmpty()) {
-            value.setEmptyObject();
-        }
-        res.writeModel(value);
 
         for (String childType : reg.getChildNames(PathAddress.EMPTY_ADDRESS)) {
             if (model.hasDefined(childType)) {
@@ -113,6 +109,12 @@ private static Resource modelToResource(final PathAddress startAddress, final Im
             allFields.remove(childType);
         }
 
+        if (!value.isDefined() && model.isDefined() && (reg.getChildAddresses(PathAddress.EMPTY_ADDRESS).isEmpty() || res.getChildTypes().isEmpty())) {
+            value.setEmptyObject();
+        }
+        res.writeModel(value);
+
+
         if (!allFields.isEmpty()){
             throw ControllerLogger.ROOT_LOGGER.modelFieldsNotKnown(allFields, startAddress.append(fullPath));
         }

diff --git a/...-test/tests/src/test/java/org/jboss/as/subsystem/test/InternalPackageProtectedAccess.java b/...-test/tests/src/test/java/org/jboss/as/subsystem/test/InternalPackageProtectedAccess.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.jboss.as.subsystem.test;
+
+import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
+import org.jboss.as.controller.registry.Resource;
+import org.jboss.dmr.ModelNode;
+
+/**
+ * For tests to call package protected methods in this package
+ */
+public class InternalPackageProtectedAccess {
+    public static Resource modelToResource(final ImmutableManagementResourceRegistration reg, final ModelNode model, boolean includeUndefined) {
+        return TransformationUtils.modelToResource(reg, model, includeUndefined);
+    }
+}