WFLY-7732 Clustering subsystems use deprecated SimpleAttributeDefinit…

…ion.setAllowNull(boolean)
wildfly · Dec 5, 2016 · d3795ee · d3795ee
1 parent 267c85e
commit d3795ee
Show file tree

Hide file tree

Showing 36 changed files with 56 additions and 63 deletions.
diff --git a/...java/org/jboss/as/clustering/controller/validation/AbstractParameterValidatorBuilder.java b/...java/org/jboss/as/clustering/controller/validation/AbstractParameterValidatorBuilder.java
@@ -48,7 +48,7 @@ public ParameterValidatorBuilder allowExpression(boolean allowsExpressions) {
     @Override
     public ParameterValidatorBuilder configure(AttributeDefinition definition) {
         this.allowsExpressions = definition.isAllowExpression();
-        this.allowsUndefined = definition.isAllowNull();
+        this.allowsUndefined = !definition.isRequired();
         return this;
     }
 

diff --git a/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/BackupForResourceDefinition.java b/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/BackupForResourceDefinition.java
@@ -58,7 +58,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/.../src/main/java/org/jboss/as/clustering/infinispan/subsystem/BackupResourceDefinition.java b/.../src/main/java/org/jboss/as/clustering/infinispan/subsystem/BackupResourceDefinition.java
@@ -98,7 +98,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/BinaryTableResourceDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/BinaryTableResourceDefinition.java
@@ -59,7 +59,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/...n/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerResourceDefinition.java b/...n/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerResourceDefinition.java
@@ -154,7 +154,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
 
         Attribute(String name) {
             this.definition = new StringListAttributeDefinition.Builder(name)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setAttributeParser(AttributeParsers.COLLECTION)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();
@@ -204,7 +204,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 ;

diff --git a/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheResourceDefinition.java b/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheResourceDefinition.java
@@ -152,7 +152,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 ;

diff --git a/...n/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java b/...n/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java
@@ -46,7 +46,7 @@
 public class ClusteredCacheResourceDefinition extends CacheResourceDefinition {
 
     enum Attribute implements org.jboss.as.clustering.controller.Attribute {
-        MODE("mode", ModelType.STRING, null, new EnumValidatorBuilder<>(Mode.class)),
+        MODE("mode", ModelType.STRING, new EnumValidatorBuilder<>(Mode.class)),
         REMOTE_TIMEOUT("remote-timeout", ModelType.LONG, new ModelNode(10000L)),
         ;
         private final AttributeDefinition definition;
@@ -55,8 +55,8 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
             this.definition = createBuilder(name, type, defaultValue).build();
         }
 
-        Attribute(String name, ModelType type, ModelNode defaultValue, ParameterValidatorBuilder validator) {
+        Attribute(String name, ModelType type, ParameterValidatorBuilder validator) {
-            SimpleAttributeDefinitionBuilder builder = createBuilder(name, type, defaultValue);
+            SimpleAttributeDefinitionBuilder builder = createBuilder(name, type, null);
             this.definition = builder.setValidator(validator.configure(builder).build()).build();
         }
 
@@ -87,7 +87,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(defaultValue != null)
+                .setRequired(defaultValue == null)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/CustomStoreResourceDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/CustomStoreResourceDefinition.java
@@ -58,7 +58,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(false)
+                    .setRequired(true)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();
         }

diff --git a/...java/org/jboss/as/clustering/infinispan/subsystem/DistributedCacheResourceDefinition.java b/...java/org/jboss/as/clustering/infinispan/subsystem/DistributedCacheResourceDefinition.java
@@ -78,7 +78,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
             return new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...rc/main/java/org/jboss/as/clustering/infinispan/subsystem/EvictionResourceDefinition.java b/...rc/main/java/org/jboss/as/clustering/infinispan/subsystem/EvictionResourceDefinition.java
@@ -78,7 +78,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
             return new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     ;

diff --git a/.../main/java/org/jboss/as/clustering/infinispan/subsystem/ExpirationResourceDefinition.java b/.../main/java/org/jboss/as/clustering/infinispan/subsystem/ExpirationResourceDefinition.java
@@ -59,7 +59,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, ModelType.LONG)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setMeasurementUnit(MeasurementUnit.MILLISECONDS)

diff --git a/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/FileStoreResourceDefinition.java b/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/FileStoreResourceDefinition.java
@@ -63,7 +63,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/JDBCStoreResourceDefinition.java b/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/JDBCStoreResourceDefinition.java
@@ -93,11 +93,11 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         private final AttributeDefinition definition;
 
         Attribute(String name, ModelType type, CapabilityReferenceRecorder reference) {
-            this.definition = createBuilder(name, type, true).setAllowExpression(false).setCapabilityReference(reference).build();
+            this.definition = createBuilder(name, type, false).setAllowExpression(false).setCapabilityReference(reference).build();
         }
 
         Attribute(String name, ModelType type, ParameterValidatorBuilder validator) {
-            SimpleAttributeDefinitionBuilder builder = createBuilder(name, type, true).setAllowExpression(true);
+            SimpleAttributeDefinitionBuilder builder = createBuilder(name, type, false).setAllowExpression(true);
             this.definition = builder.setValidator(validator.configure(builder).build()).build();
         }
 
@@ -113,7 +113,7 @@ enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute
         private final AttributeDefinition definition;
 
         DeprecatedAttribute(String name, ModelType type, InfinispanModel deprecation) {
-            this.definition = createBuilder(name, type, true).setAllowExpression(true).setDeprecated(deprecation.getVersion()).build();
+            this.definition = createBuilder(name, type, false).setAllowExpression(true).setDeprecated(deprecation.getVersion()).build();
         }
 
         @Override
@@ -122,9 +122,9 @@ public AttributeDefinition getDefinition() {
         }
     }
 
-    static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, boolean allowNull) {
+    static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, boolean required) {
         return new SimpleAttributeDefinitionBuilder(name, type)
-                .setAllowNull(allowNull)
+                .setRequired(required)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
         ;
     }
@@ -201,12 +201,13 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
     static final OperationStepHandler DATA_SOURCE_TRANSLATOR = new OperationStepHandler() {
         @Override
         public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
-            if (!operation.hasDefined(JDBCStoreResourceDefinition.Attribute.DATA_SOURCE.getName())) {
+            String targetAttributeName = JDBCStoreResourceDefinition.Attribute.DATA_SOURCE.getName();
-                if (operation.hasDefined(JDBCStoreResourceDefinition.DeprecatedAttribute.DATASOURCE.getName())) {
+            if (!operation.hasDefined(targetAttributeName)) {
+                ModelNode jndiName = JDBCStoreResourceDefinition.DeprecatedAttribute.DATASOURCE.resolveModelAttribute(context, operation);
+                if (jndiName.isDefined()) {
                     // Translate JNDI name into pool name
-                    String jndiName = JDBCStoreResourceDefinition.DeprecatedAttribute.DATASOURCE.resolveModelAttribute(context, operation).asString();
+                    String poolName = findPoolName(context, jndiName.asString());
-                    String poolName = findPoolName(context, jndiName);
+                    operation.get(targetAttributeName).set(poolName);
-                    operation.get(JDBCStoreResourceDefinition.Attribute.DATA_SOURCE.getName()).set(poolName);
                 } else {
                     throw ControllerLogger.MGMT_OP_LOGGER.validationFailedRequiredParameterNotPresent(JDBCStoreResourceDefinition.Attribute.DATA_SOURCE.getDefinition().getName(), operation.toString());
                 }

diff --git a/...java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java b/...java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java
@@ -144,7 +144,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...src/main/java/org/jboss/as/clustering/infinispan/subsystem/LockingResourceDefinition.java b/...src/main/java/org/jboss/as/clustering/infinispan/subsystem/LockingResourceDefinition.java
@@ -74,7 +74,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
             return new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...ava/org/jboss/as/clustering/infinispan/subsystem/PartitionHandlingResourceDefinition.java b/...ava/org/jboss/as/clustering/infinispan/subsystem/PartitionHandlingResourceDefinition.java
@@ -54,7 +54,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/RemoteStoreResourceDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/RemoteStoreResourceDefinition.java
@@ -99,7 +99,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...a/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolResourceDefinition.java b/...a/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolResourceDefinition.java
@@ -85,7 +85,7 @@ private static PathElement pathElement(String name) {
     private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue, ParameterValidatorBuilder validatorBuilder) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...in/java/org/jboss/as/clustering/infinispan/subsystem/StateTransferResourceDefinition.java b/...in/java/org/jboss/as/clustering/infinispan/subsystem/StateTransferResourceDefinition.java
@@ -89,7 +89,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java b/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java
@@ -70,7 +70,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, boolean defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, ModelType.BOOLEAN)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(new ModelNode(defaultValue))
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/...java/org/jboss/as/clustering/infinispan/subsystem/StoreWriteBehindResourceDefinition.java b/...java/org/jboss/as/clustering/infinispan/subsystem/StoreWriteBehindResourceDefinition.java
@@ -87,7 +87,7 @@ public AttributeDefinition getDefinition() {
     static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/StringTableResourceDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/StringTableResourceDefinition.java
@@ -58,7 +58,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();

diff --git a/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TableResourceDefinition.java b/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TableResourceDefinition.java
@@ -52,7 +52,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         Attribute(String name, ModelType type, ModelNode defaultValue) {
             this.definition = new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .build();
@@ -76,18 +76,18 @@ enum ColumnAttribute implements org.jboss.as.clustering.controller.Attribute {
         ColumnAttribute(String name, String defaultName, String defaultType) {
             this.name = new SimpleAttribute(new SimpleAttributeDefinitionBuilder("name", ModelType.STRING)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setDefaultValue(new ModelNode(defaultName))
                     .build());
             this.type = new SimpleAttribute(new SimpleAttributeDefinitionBuilder("type", ModelType.STRING)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setDefaultValue(new ModelNode(defaultType))
                     .build());
             this.definition = ObjectTypeAttributeDefinition.Builder.of(name, this.name.getDefinition(), this.type.getDefinition())
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setSuffix("column")
                     .build();
         }

diff --git a/.../main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolResourceDefinition.java b/.../main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolResourceDefinition.java
@@ -93,7 +93,7 @@ private static PathElement pathElement(String name) {
     private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue, ParameterValidatorBuilder validatorBuilder) {
         return new SimpleAttributeDefinitionBuilder(name, type)
                 .setAllowExpression(true)
-                .setAllowNull(true)
+                .setRequired(false)
                 .setDefaultValue(defaultValue)
                 .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                 .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)

diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/TransactionResourceDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/TransactionResourceDefinition.java
@@ -94,7 +94,7 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         private static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
             return new SimpleAttributeDefinitionBuilder(name, type)
                     .setAllowExpression(true)
-                    .setAllowNull(true)
+                    .setRequired(false)
                     .setDefaultValue(defaultValue)
                     .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
                     .setMeasurementUnit((type == ModelType.LONG) ? MeasurementUnit.MILLISECONDS : null)