WFLY-5145 Add return types description to migrate operations, make re…

…sult messages uniform

legacy/jacorb/src/main/java/org/jboss/as/jacorb/JacORBSubsystemAdd.java

@@ -22,6 +22,7 @@
 
 package org.jboss.as.jacorb;
 
+import java.util.List;
 import java.util.Properties;
 
 import org.jboss.as.controller.AttributeDefinition;
@@ -74,7 +75,15 @@ protected void populateModel(final OperationContext context, final ModelNode ope
         // domain controller in normal mode works normally - it may send old parameters to legacy hosts - such configuration is
         // valid
         if (adminOnly || !hostController) {
-            TransformUtils.checkLegacyModel(model, !adminOnly);
+            final List<String> unsupportedProperites = TransformUtils.checkLegacyModel(model);
+            if(!unsupportedProperites.isEmpty()) {
+                if (adminOnly) {
+                    final String warning = JacORBLogger.ROOT_LOGGER.cannotEmulatePropertiesWarning(unsupportedProperites);
+                    JacORBLogger.ROOT_LOGGER.warn(warning);
+                } else {
+                    throw JacORBLogger.ROOT_LOGGER.cannotEmulateProperties(unsupportedProperites);
+                }
+            }
         }
     }
 

legacy/jacorb/src/main/java/org/jboss/as/jacorb/MigrateOperation.java

@@ -32,6 +32,7 @@
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.jboss.as.controller.OperationContext;
@@ -40,6 +41,7 @@
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.RunningMode;
+import org.jboss.as.controller.SimpleMapAttributeDefinition;
 import org.jboss.as.controller.SimpleOperationDefinitionBuilder;
 import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
 import org.jboss.as.controller.operations.MultistepUtil;
@@ -49,6 +51,7 @@
 import org.jboss.as.controller.registry.Resource;
 import org.jboss.as.jacorb.logging.JacORBLogger;
 import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.ModelType;
 import org.jboss.dmr.Property;
 
 /**
@@ -64,14 +67,20 @@ public class MigrateOperation implements OperationStepHandler {
     public static final String MIGRATION_OPERATIONS = "migration-operations";
     public static final String MIGRATION_ERROR = "migration-error";
 
+    public static final SimpleMapAttributeDefinition MIGRATION_ERROR_ATTR = new SimpleMapAttributeDefinition.Builder(MIGRATION_ERROR, ModelType.OBJECT, true)
+            .setValueType(ModelType.OBJECT)
+            .setAllowNull(true)
+            .build();
 
     static void registerOperation(final ManagementResourceRegistration registry, final ResourceDescriptionResolver resourceDescriptionResolver) {
         registry.registerOperationHandler(new SimpleOperationDefinitionBuilder(MIGRATE, resourceDescriptionResolver)
                         .setRuntimeOnly()
+                        .setReplyParameters(MIGRATION_ERROR_ATTR)
                         .build(),
                 new MigrateOperation(false));
         registry.registerOperationHandler(new SimpleOperationDefinitionBuilder(DESCRIBE_MIGRATION, resourceDescriptionResolver)
                         .setRuntimeOnly()
+                        .setReplyParameters(MIGRATION_ERROR_ATTR)
                         .build(),
                 new MigrateOperation(true));
 
@@ -109,10 +118,20 @@ public void execute(final OperationContext context, final ModelNode operation) t
         context.addStep(new OperationStepHandler() {
             @Override
             public void execute(OperationContext operationContext, ModelNode modelNode) throws OperationFailedException {
+
                 final Resource jacorbResource = context.readResourceForUpdate(PathAddress.EMPTY_ADDRESS);
                 final ModelNode jacorbModel = Resource.Tools.readModel(jacorbResource).clone();
 
-                TransformUtils.checkLegacyModel(jacorbModel, true);
+                List<String> unsupportedProperties = TransformUtils.checkLegacyModel(jacorbModel);
+                if (!unsupportedProperties.isEmpty()) {
+                    context.setRollbackOnly();
+
+                    ModelNode result = new ModelNode();
+                    final String error =JacORBLogger.ROOT_LOGGER.cannotEmulatePropertiesWarning(unsupportedProperties);
+                    result.get(MIGRATION_ERROR).set(error);
+                    context.getResult().set(result);
+                    return;
+                }
 
                 final ModelNode openjdkModel = TransformUtils.transformModel(jacorbModel);
 

legacy/jacorb/src/main/java/org/jboss/as/jacorb/TransformUtils.java

@@ -5,7 +5,6 @@
 
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.jacorb.logging.JacORBLogger;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
 import org.wildfly.iiop.openjdk.Constants;
@@ -18,7 +17,7 @@ public class TransformUtils {
     private TransformUtils() {
     }
 
-    static List<String> checkLegacyModel(final ModelNode model, final boolean failOnErrors) throws OperationFailedException {
+    static List<String> checkLegacyModel(final ModelNode model) throws OperationFailedException {
         final List<String> propertiesToReject = new LinkedList<>();
         for (final AttributeDefinition attribute : JacORBSubsystemDefinitions.ON_OFF_ATTRIBUTES_TO_REJECT) {
             if (model.hasDefined(attribute.getName())
@@ -31,13 +30,6 @@ static List<String> checkLegacyModel(final ModelNode model, final boolean failOn
                 propertiesToReject.add(attribute.getName());
             }
         }
-        if (!propertiesToReject.isEmpty()) {
-            if(failOnErrors) {
-                throw JacORBLogger.ROOT_LOGGER.cannotEmulateProperties(propertiesToReject);
-            } else {
-                JacORBLogger.ROOT_LOGGER.cannotEmulatePropertiesWarning(propertiesToReject);
-            }
-        }
         return propertiesToReject;
     }
 

legacy/jacorb/src/main/java/org/jboss/as/jacorb/logging/JacORBLogger.java

@@ -455,9 +455,9 @@ public interface JacORBLogger extends BasicLogger {
             + "using OpenJDK ORB will be removed in future.")
     void jacorbEmulationWarning();
 
-    @LogMessage(level = WARN)
+
     @Message(id = 134, value = "Properties %s cannot be emulated using OpenJDK ORB and are not supported")
-    void cannotEmulatePropertiesWarning(List<String> property);
+    String cannotEmulatePropertiesWarning(List<String> property);
 
     @Message(id = 135, value = "Migration failed, see results for more details.")
     String migrationFailed();

legacy/jacorb/src/main/resources/org/jboss/as/jacorb/LocalDescriptions.properties

@@ -2,7 +2,9 @@ jacorb=The JacORB subsystem configuration.
 jacorb.add=Adds the JacORB subsystem.
 jacorb.remove=Removes the JacORB subsystem.
 jacorb.migrate=Migrate to new OpenJDK subsystem.
+jacorb.migrate.migration-error=The error that occured during migration.
 jacorb.describe-migration=Describes the steps that will be taken to migrate this configuration to OpenJDK ORB
+jacorb.describe-migration.migration-error=The error that occured during describe-migration operation.
 jacorb.deprecated=The JacORB subsystem is deprecated and may be removed or limited to managed domain legacy server use in future versions.
 
 # orb configuration properties.

legacy/jacorb/src/test/java/org/jboss/as/jacorb/TransformUtilsTestCase.java

@@ -5,6 +5,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 /**
  * @author <a href=mailto:tadamski@redhat.com>Tomasz Adamski</a>
  * */
@@ -35,21 +37,24 @@ public void testTransformation() {
     public void testRejectedOnOffAttributeTurnedOff() throws Exception {
         ModelNode model = new ModelNode();
         model.get("iona").set("off");
-        TransformUtils.checkLegacyModel(model, true);
+        List<String> result =TransformUtils.checkLegacyModel(model);
+        Assert.assertTrue(result.isEmpty());
     }
 
-    @Test(expected = OperationFailedException.class)
+    @Test
     public void testRejectedOnOffAttribute() throws Exception {
         ModelNode model = new ModelNode();
         model.get("iona").set("on");
-        TransformUtils.checkLegacyModel(model, true);
+        List<String> result = TransformUtils.checkLegacyModel(model);
+        Assert.assertFalse(result.isEmpty());
     }
 
-    @Test(expected = OperationFailedException.class)
+    @Test
     public void testRejectedAttribute() throws Exception {
         ModelNode model = new ModelNode();
         model.get("queue-min").set(5);
-        TransformUtils.checkLegacyModel(model, true);
+        List<String> result = TransformUtils.checkLegacyModel(model);
+        Assert.assertFalse(result.isEmpty());
     }
 
 }