Use simplified LegacyAddOperationTransformation constructor - a legac…

…y add operation is one that is missing all override attributes.
wildfly · May 24, 2017 · cfd0416 · cfd0416
1 parent 65c6bcb
commit cfd0416
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/...in/java/org/jboss/as/clustering/jgroups/subsystem/AbstractProtocolResourceDefinition.java b/...in/java/org/jboss/as/clustering/jgroups/subsystem/AbstractProtocolResourceDefinition.java
@@ -22,6 +22,8 @@
 
 package org.jboss.as.clustering.jgroups.subsystem;
 
+import java.util.EnumSet;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -172,6 +174,14 @@ protected void convertAttribute(PathAddress address, String name, ModelNode valu
     static class LegacyAddOperationTransformation implements UnaryOperator<OperationStepHandler> {
         private final Predicate<ModelNode> legacy;
 
+        <E extends Enum<E> & org.jboss.as.clustering.controller.Attribute> LegacyAddOperationTransformation(Class<E> attributeClass) {
+            this(EnumSet.allOf(attributeClass));
+        }
+
+        LegacyAddOperationTransformation(Set<? extends org.jboss.as.clustering.controller.Attribute> attributes) {
+            this(operation -> attributes.stream().noneMatch(attribute -> operation.hasDefined(attribute.getName())));
+        }
+
         LegacyAddOperationTransformation(Predicate<ModelNode> legacy) {
             this.legacy = legacy;
         }

diff --git a/...ain/java/org/jboss/as/clustering/jgroups/subsystem/EncryptProtocolResourceDefinition.java b/...ain/java/org/jboss/as/clustering/jgroups/subsystem/EncryptProtocolResourceDefinition.java
@@ -78,7 +78,7 @@ static void addTransformations(ModelVersion version, ResourceTransformationDescr
     public EncryptProtocolResourceDefinition(String name, Consumer<ResourceDescriptor> descriptorConfigurator, ResourceServiceBuilderFactory<ChannelFactory> parentBuilderFactory) {
         super(pathElement(name), descriptorConfigurator.andThen(descriptor -> descriptor
                 .addAttributes(Attribute.class)
-                .setAddOperationTransformation(new LegacyAddOperationTransformation(operation -> !operation.hasDefined(Attribute.KEY_STORE.getName()) && !operation.hasDefined(Attribute.KEY_ALIAS.getName()) && !operation.hasDefined(Attribute.CREDENTIAL.getName())))
+                .setAddOperationTransformation(new LegacyAddOperationTransformation(Attribute.class))
                 ), address -> new EncryptProtocolConfigurationBuilder<>(address), parentBuilderFactory);
     }
 }
diff --git a/...c/main/java/org/jboss/as/clustering/jgroups/subsystem/JDBCProtocolResourceDefinition.java b/...c/main/java/org/jboss/as/clustering/jgroups/subsystem/JDBCProtocolResourceDefinition.java
@@ -72,7 +72,7 @@ static void addTransformations(ModelVersion version, ResourceTransformationDescr
     JDBCProtocolResourceDefinition(String name, Consumer<ResourceDescriptor> descriptorConfigurator, ResourceServiceBuilderFactory<ChannelFactory> parentBuilderFactory) {
         super(pathElement(name), descriptorConfigurator.andThen(descriptor -> descriptor
                 .addAttributes(Attribute.class)
-                .setAddOperationTransformation(new LegacyAddOperationTransformation(operation -> !operation.hasDefined(Attribute.DATA_SOURCE.getName())))
+                .setAddOperationTransformation(new LegacyAddOperationTransformation(Attribute.class))
                 ), address -> new JDBCProtocolConfigurationBuilder<>(address), parentBuilderFactory);
     }
 }
diff --git a/.../org/jboss/as/clustering/jgroups/subsystem/SocketDiscoveryProtocolResourceDefinition.java b/.../org/jboss/as/clustering/jgroups/subsystem/SocketDiscoveryProtocolResourceDefinition.java
@@ -76,7 +76,7 @@ static void addTransformations(ModelVersion version, ResourceTransformationDescr
     SocketDiscoveryProtocolResourceDefinition(String name, Consumer<ResourceDescriptor> descriptorConfigurator, ResourceServiceBuilderFactory<ChannelFactory> parentBuilderFactory) {
         super(pathElement(name), descriptorConfigurator.andThen(descriptor -> descriptor
                 .addAttributes(Attribute.class)
-                .setAddOperationTransformation(new LegacyAddOperationTransformation(operation -> !operation.hasDefined(Attribute.OUTBOUND_SOCKET_BINDINGS.getName())))
+                .setAddOperationTransformation(new LegacyAddOperationTransformation(Attribute.class))
             ), address -> new SocketDiscoveryProtocolConfigurationBuilder<>(address), parentBuilderFactory);
     }
 }