Skip to content

Commit

Permalink
Merge pull request #13230 from pferraro/WFLY-13014
Browse files Browse the repository at this point in the history 
WFLY-13014 Consolidate instances of DefaultValueAttributeConverter
  • Loading branch information
@jamezp
jamezp committed Apr 27, 2020
2 parents 00649d3 + 52ef43f commit 29f63b8
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 53 deletions.
3 changes: 1 addition & 2 deletions ...n/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java
View file
Expand Up @@ -44,7 +44,6 @@
import org.jboss.as.controller.capability.RuntimeCapability;
import org.jboss.as.controller.client.helpers.MeasurementUnit;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
Expand Down Expand Up @@ -174,7 +173,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc

if (InfinispanModel.VERSION_5_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder()
.setValueConverter(new DefaultValueAttributeConverter(Attribute.REMOTE_TIMEOUT.getDefinition()), Attribute.REMOTE_TIMEOUT.getDefinition())
.setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.REMOTE_TIMEOUT.getName())
.end();
}

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/jboss/as/clustering/infinispan/subsystem/DistributedCacheResourceDefinition.java
View file
Expand Up @@ -100,7 +100,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc

if (InfinispanModel.VERSION_5_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder()
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Attribute.L1_LIFESPAN.getDefinition()), Attribute.L1_LIFESPAN.getDefinition())
.setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.L1_LIFESPAN.getName())
.end();
}

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/jboss/as/clustering/infinispan/subsystem/LockingResourceDefinition.java
View file
Expand Up @@ -44,7 +44,7 @@
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.client.helpers.MeasurementUnit;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
Expand Down Expand Up @@ -139,7 +139,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc
ResourceTransformationDescriptionBuilder builder = InfinispanModel.VERSION_4_0_0.requiresTransformation(version) ? parent.addChildRedirection(PATH, LEGACY_PATH, RequiredChildResourceDiscardPolicy.NEVER) : parent.addChildResource(PATH);

if (InfinispanModel.VERSION_3_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(Attribute.ISOLATION.getDefinition()), Attribute.ISOLATION.getDefinition());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.ISOLATION.getName());
}
}

Expand Down
3 changes: 1 addition & 2 deletions ...n/java/org/jboss/as/clustering/infinispan/subsystem/SegmentedCacheResourceDefinition.java
View file
Expand Up @@ -81,8 +81,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc

if (InfinispanModel.VERSION_4_1_0.requiresTransformation(version)) {
builder.getAttributeBuilder()
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Attribute.CONSISTENT_HASH_STRATEGY.getDefinition()), Attribute.CONSISTENT_HASH_STRATEGY.getDefinition())
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Attribute.SEGMENTS.getDefinition()), Attribute.SEGMENTS.getDefinition())
.setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.CONSISTENT_HASH_STRATEGY.getName(), Attribute.SEGMENTS.getName())
.end();
}

Expand Down
3 changes: 1 addition & 2 deletions ...in/java/org/jboss/as/clustering/infinispan/subsystem/StateTransferResourceDefinition.java
View file
Expand Up @@ -122,8 +122,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc

if (InfinispanModel.VERSION_4_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder()
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Attribute.TIMEOUT.getDefinition()), Attribute.TIMEOUT.getDefinition())
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Attribute.CHUNK_SIZE.getDefinition()), Attribute.CHUNK_SIZE.getDefinition())
.setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.TIMEOUT.getName(), Attribute.CHUNK_SIZE.getName())
.end();
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/jboss/as/clustering/infinispan/subsystem/StoreWriteBehindResourceDefinition.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.client.helpers.MeasurementUnit;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
Expand Down Expand Up @@ -98,7 +98,7 @@ static void buildTransformation(ModelVersion version, ResourceTransformationDesc
ResourceTransformationDescriptionBuilder builder = InfinispanModel.VERSION_4_0_0.requiresTransformation(version) ? parent.addChildRedirection(PATH, LEGACY_PATH) : parent.addChildResource(PATH);

if (InfinispanModel.VERSION_3_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(DeprecatedAttribute.FLUSH_LOCK_TIMEOUT.getDefinition()), DeprecatedAttribute.FLUSH_LOCK_TIMEOUT.getDefinition());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, DeprecatedAttribute.FLUSH_LOCK_TIMEOUT.getName());
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/jboss/as/clustering/infinispan/subsystem/TransactionResourceDefinition.java
View file
Expand Up @@ -66,7 +66,7 @@
import org.jboss.as.controller.transform.OperationResultTransformer;
import org.jboss.as.controller.transform.ResourceTransformationContext;
import org.jboss.as.controller.transform.ResourceTransformer;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
Expand Down Expand Up @@ -282,7 +282,7 @@ public void transformResource(ResourceTransformationContext context, PathAddress
builder.setCustomResourceTransformer(modeTransformer);

// change default value of stop-timeout attribute
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(Attribute.STOP_TIMEOUT.getDefinition()), Attribute.STOP_TIMEOUT.getDefinition());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.STOP_TIMEOUT.getName());
}

buildOperationTransformation(builder, ModelDescriptionConstants.ADD, addOperationTransformers);
Expand Down
4 changes: 2 additions & 2 deletions ...oss/as/clustering/infinispan/subsystem/remote/RemoteCacheContainerResourceDefinition.java
View file
Expand Up @@ -49,7 +49,7 @@
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.DiscardAttributeChecker.DiscardAttributeValueChecker;
import org.jboss.as.controller.transform.description.RejectAttributeChecker;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
Expand Down Expand Up @@ -153,7 +153,7 @@ public static void buildTransformation(ModelVersion version, ResourceTransformat
.end();
}
if (InfinispanModel.VERSION_9_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(Attribute.PROTOCOL_VERSION.getDefinition()), Attribute.PROTOCOL_VERSION.getDefinition());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.PROTOCOL_VERSION.getName());
}

RemoteCacheContainerMetric.buildTransformation(version, builder);
Expand Down
12 changes: 4 additions & 8 deletions ...src/main/java/org/jboss/as/clustering/jgroups/subsystem/ThreadPoolResourceDefinition.java
View file
Expand Up @@ -47,7 +47,7 @@
import org.jboss.as.controller.client.helpers.MeasurementUnit;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
Expand All @@ -65,9 +65,7 @@ void buildTransformation(ModelVersion version, ResourceTransformationDescription
ResourceTransformationDescriptionBuilder builder = parent.addChildResource(this.getDefinition());

if (JGroupsModel.VERSION_6_0_0.requiresTransformation(version)) {
for (Attribute attribute : Arrays.asList(this.getMinThreads(), this.getMaxThreads(), this.getQueueLength())) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(attribute.getDefinition()), attribute.getName());
}
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, this.getMinThreads().getName(), this.getMaxThreads().getName(), this.getQueueLength().getName());
}
}
},
Expand Down Expand Up @@ -166,13 +164,11 @@ void buildTransformation(ModelVersion version, ResourceTransformationDescription
ResourceTransformationDescriptionBuilder builder = parent.addChildResource(this.definition);

if (JGroupsModel.VERSION_6_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(this.queueLength.getDefinition()), this.queueLength.getName());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, this.queueLength.getName());
}

if (JGroupsModel.VERSION_5_0_0.requiresTransformation(version)) {
for (Attribute attribute : Arrays.asList(this.minThreads, this.maxThreads)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(attribute.getDefinition()), attribute.getName());
}
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, this.minThreads.getName(), this.maxThreads.getName());
}
}
}
4 changes: 2 additions & 2 deletions .../src/main/java/org/jboss/as/clustering/jgroups/subsystem/TransportResourceDefinition.java
View file
Expand Up @@ -70,7 +70,7 @@
import org.jboss.as.controller.transform.OperationTransformer;
import org.jboss.as.controller.transform.ResourceTransformationContext;
import org.jboss.as.controller.transform.ResourceTransformer;
import org.jboss.as.controller.transform.description.AttributeConverter.DefaultValueAttributeConverter;
import org.jboss.as.controller.transform.description.AttributeConverter;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
Expand Down Expand Up @@ -184,7 +184,7 @@ static void addTransformations(ModelVersion version, ResourceTransformationDescr
AbstractProtocolResourceDefinition.addTransformations(version, builder);

if (JGroupsModel.VERSION_3_0_0.requiresTransformation(version)) {
builder.getAttributeBuilder().setValueConverter(new DefaultValueAttributeConverter(Attribute.SHARED.getDefinition()), Attribute.SHARED.getDefinition());
builder.getAttributeBuilder().setValueConverter(AttributeConverter.DEFAULT_VALUE, Attribute.SHARED.getName());

builder.setCustomResourceTransformer(new ResourceTransformer() {
@Override
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesTransformers.java
View file
Expand Up @@ -185,7 +185,7 @@ private static TransformationDescription get400TransformationDescription(Resourc
.setDiscard(DiscardAttributeChecker.UNDEFINED, AUTHENTICATION_CONTEXT, CREDENTIAL_REFERENCE)
.addRejectCheck(RejectAttributeChecker.DEFINED, ELYTRON_ENABLED, AUTHENTICATION_CONTEXT, CREDENTIAL_REFERENCE)
.addRejectCheck(createConnURLRejectChecker(), CONNECTION_URL)
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(ENLISTMENT_TRACE), ENLISTMENT_TRACE)
.setValueConverter(AttributeConverter.DEFAULT_VALUE, ENLISTMENT_TRACE)
.end();
builder = parentBuilder.addChildResource(PATH_XA_DATASOURCE);
builder.getAttributeBuilder()
Expand All @@ -204,7 +204,7 @@ private static TransformationDescription get400TransformationDescription(Resourc
CREDENTIAL_REFERENCE,
AUTHENTICATION_CONTEXT)

.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(ENLISTMENT_TRACE), ENLISTMENT_TRACE)
.setValueConverter(AttributeConverter.DEFAULT_VALUE, ENLISTMENT_TRACE)
.end();
parentBuilder.addChildResource(PATH_DRIVER).getAttributeBuilder()
.addRejectCheck(RejectAttributeChecker.SIMPLE_EXPRESSIONS, MODULE_SLOT, JDBC_COMPLIANT, PROFILE,
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/jboss/as/connector/subsystems/resourceadapters/ResourceAdaptersTransformers.java
View file
Expand Up @@ -81,7 +81,7 @@ public void registerTransformers(SubsystemTransformerRegistration subsystemRegis
.setDiscard(DiscardAttributeChecker.UNDEFINED, Constants.AUTHENTICATION_CONTEXT, Constants.AUTHENTICATION_CONTEXT_AND_APPLICATION, Constants.RECOVERY_AUTHENTICATION_CONTEXT)
.addRejectCheck(RejectAttributeChecker.DEFINED, Constants.ELYTRON_ENABLED, Constants.RECOVERY_ELYTRON_ENABLED, Constants.RECOVERY_CREDENTIAL_REFERENCE)
.addRejectCheck(RejectAttributeChecker.DEFINED, Constants.AUTHENTICATION_CONTEXT, Constants.AUTHENTICATION_CONTEXT_AND_APPLICATION, Constants.RECOVERY_AUTHENTICATION_CONTEXT)
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(Constants.ENLISTMENT_TRACE), Constants.ENLISTMENT_TRACE)
.setValueConverter(AttributeConverter.DEFAULT_VALUE, Constants.ENLISTMENT_TRACE)
.end();

parentBuilder = chainedBuilder.createBuilder(EAP_7_0, EAP_6_2);
Expand Down
2 changes: 1 addition & 1 deletion iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/IIOPTransformers.java
View file
Expand Up @@ -57,7 +57,7 @@ public void registerTransformers(SubsystemTransformerRegistration subsystemRegis

ResourceTransformationDescriptionBuilder builder_2_0 = chained.createBuilder(CURRENT_MODEL_VERSION, VERSION_2);
builder_2_0.getAttributeBuilder()
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(IIOPRootDefinition.SOCKET_BINDING), IIOPRootDefinition.SOCKET_BINDING);
.setValueConverter(AttributeConverter.DEFAULT_VALUE, IIOPRootDefinition.SOCKET_BINDING);

/*
--- Problems for relative address to root []:
Expand Down
2 changes: 1 addition & 1 deletion legacy/jacorb/src/main/java/org/jboss/as/jacorb/JacORBExtension.java
View file
Expand Up @@ -110,7 +110,7 @@ protected static void registerTransformers(final SubsystemRegistration subsystem
builder64.getAttributeBuilder()
.addRejectCheck(RejectAttributeChecker.DEFINED, JacORBSubsystemDefinitions.PERSISTENT_SERVER_ID)
.setDiscard(DiscardAttributeChecker.DEFAULT_VALUE, JacORBSubsystemDefinitions.PERSISTENT_SERVER_ID)
.setValueConverter(new AttributeConverter.DefaultValueAttributeConverter(JacORBSubsystemDefinitions.INTEROP_CHUNK_RMI_VALUETYPES),JacORBSubsystemDefinitions.INTEROP_CHUNK_RMI_VALUETYPES);
.setValueConverter(AttributeConverter.DEFAULT_VALUE, JacORBSubsystemDefinitions.INTEROP_CHUNK_RMI_VALUETYPES);


ResourceTransformationDescriptionBuilder builder63 = chained.createBuilder(MODEL_VERSION_EAP64, MODEL_VERSION_EAP63);
Expand Down

0 comments on commit 29f63b8

Please sign in to comment.