Skip to content

Commit

Permalink
Eliminate lambdas from Attribute definitions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pferraro
pferraro committed Mar 31, 2018
1 parent f88631c commit d6b7eb0
Show file tree
Hide file tree
Showing 14 changed files with 299 additions and 120 deletions.
29 changes: 22 additions & 7 deletions .../src/main/java/org/jboss/as/clustering/infinispan/subsystem/BackupResourceDefinition.java
View file
Expand Up @@ -57,22 +57,37 @@ static PathElement pathElement(String name) {
return PathElement.pathElement("backup", name);
}

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
ENABLED("enabled", ModelType.BOOLEAN, new ModelNode(true), UnaryOperator.identity()),
FAILURE_POLICY("failure-policy", ModelType.STRING, new ModelNode(BackupFailurePolicy.WARN.name()), builder -> builder.setValidator(new EnumValidator<>(BackupFailurePolicy.class))),
STRATEGY("strategy", ModelType.STRING, new ModelNode(BackupStrategy.ASYNC.name()), builder -> builder.setValidator(new EnumValidator<>(BackupStrategy.class))),
TIMEOUT("timeout", ModelType.LONG, new ModelNode(10000L), UnaryOperator.identity()),
enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
ENABLED("enabled", ModelType.BOOLEAN, new ModelNode(true)),
FAILURE_POLICY("failure-policy", ModelType.STRING, new ModelNode(BackupFailurePolicy.WARN.name())) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setValidator(new EnumValidator<>(BackupFailurePolicy.class));
}
},
STRATEGY("strategy", ModelType.STRING, new ModelNode(BackupStrategy.ASYNC.name())) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setValidator(new EnumValidator<>(BackupStrategy.class));
}
},
TIMEOUT("timeout", ModelType.LONG, new ModelNode(10000L)),
;
private final AttributeDefinition definition;

Attribute(String name, ModelType type, ModelNode defaultValue, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = configurator.apply(createBuilder(name, type, defaultValue)).build();
Attribute(String name, ModelType type, ModelNode defaultValue) {
this.definition = this.apply(createBuilder(name, type, defaultValue)).build();
}

@Override
public AttributeDefinition getDefinition() {
return this.definition;
}

@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder;
}
}

enum TakeOfflineAttribute implements org.jboss.as.clustering.controller.Attribute {
Expand Down
13 changes: 9 additions & 4 deletions ...ain/java/org/jboss/as/clustering/infinispan/subsystem/BinaryMemoryResourceDefinition.java
View file
Expand Up @@ -43,13 +43,18 @@ public class BinaryMemoryResourceDefinition extends MemoryResourceDefinition {

static final PathElement PATH = pathElement("binary");

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
EVICTION_TYPE("eviction-type", ModelType.STRING, new ModelNode(EvictionType.COUNT.name()), builder -> builder.setValidator(new EnumValidator<>(EvictionType.class))),
enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
EVICTION_TYPE("eviction-type", ModelType.STRING, new ModelNode(EvictionType.COUNT.name())) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setValidator(new EnumValidator<>(EvictionType.class));
}
},
;
private final AttributeDefinition definition;

Attribute(String name, ModelType type, ModelNode defaultValue, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = configurator.apply(new SimpleAttributeDefinitionBuilder(name, type)
Attribute(String name, ModelType type, ModelNode defaultValue) {
this.definition = this.apply(new SimpleAttributeDefinitionBuilder(name, type)
.setAllowExpression(true)
.setRequired(false)
.setDefaultValue(defaultValue)
Expand Down
56 changes: 45 additions & 11 deletions ...n/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerResourceDefinition.java
View file
Expand Up @@ -125,16 +125,33 @@ public org.jboss.as.clustering.controller.Capability getCapability() {
.setDeprecated(InfinispanModel.VERSION_3_0_0.getVersion())
.build();

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
ALIASES("aliases"),
DEFAULT_CACHE("default-cache", ModelType.STRING, builder -> builder.setAllowExpression(false).setCapabilityReference(new CapabilityReference(DEFAULT_CAPABILITIES.get(InfinispanCacheRequirement.CONFIGURATION), InfinispanCacheRequirement.CONFIGURATION))),
MODULE("module", ModelType.STRING, builder -> builder.setDefaultValue(new ModelNode("org.jboss.as.clustering.infinispan")).setValidator(new ModuleIdentifierValidatorBuilder().configure(builder).build())),
STATISTICS_ENABLED("statistics-enabled", ModelType.BOOLEAN, builder -> builder.setDefaultValue(new ModelNode(false))),
DEFAULT_CACHE("default-cache", ModelType.STRING) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setAllowExpression(false).setCapabilityReference(new CapabilityReference(DEFAULT_CAPABILITIES.get(InfinispanCacheRequirement.CONFIGURATION), InfinispanCacheRequirement.CONFIGURATION));
}
},
MODULE("module", ModelType.STRING) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode("org.jboss.as.clustering.infinispan"))
.setValidator(new ModuleIdentifierValidatorBuilder().configure(builder).build())
;
}
},
STATISTICS_ENABLED("statistics-enabled", ModelType.BOOLEAN) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(false));
}
},
;
private final AttributeDefinition definition;

Attribute(String name, ModelType type, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = configurator.apply(createBuilder(name, type)).build();
Attribute(String name, ModelType type) {
this.definition = this.apply(createBuilder(name, type)).build();
}

Attribute(String name) {
Expand All @@ -148,6 +165,11 @@ enum Attribute implements org.jboss.as.clustering.controller.Attribute {
public AttributeDefinition getDefinition() {
return this.definition;
}

@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder;
}
}

@Deprecated
Expand All @@ -169,20 +191,32 @@ public AttributeDefinition getDefinition() {
}

@Deprecated
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute {
JNDI_NAME("jndi-name", ModelType.STRING, UnaryOperator.identity(), InfinispanModel.VERSION_6_0_0),
START("start", ModelType.STRING, builder -> builder.setDefaultValue(new ModelNode(StartMode.LAZY.name())).setValidator(new EnumValidator<>(StartMode.class)), InfinispanModel.VERSION_3_0_0),
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
JNDI_NAME("jndi-name", ModelType.STRING, InfinispanModel.VERSION_6_0_0),
START("start", ModelType.STRING, InfinispanModel.VERSION_3_0_0) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(StartMode.LAZY.name()))
.setValidator(new EnumValidator<>(StartMode.class))
;
}
},
;
private final AttributeDefinition definition;

DeprecatedAttribute(String name, ModelType type, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator, InfinispanModel deprecation) {
this.definition = configurator.apply(createBuilder(name, type)).setDeprecated(deprecation.getVersion()).build();
DeprecatedAttribute(String name, ModelType type, InfinispanModel deprecation) {
this.definition = this.apply(createBuilder(name, type)).setDeprecated(deprecation.getVersion()).build();
}

@Override
public AttributeDefinition getDefinition() {
return this.definition;
}

@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder;
}
}

static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type) {
Expand Down
70 changes: 51 additions & 19 deletions ...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheResourceDefinition.java
View file
Expand Up @@ -41,7 +41,6 @@
import org.jboss.as.clustering.controller.SimpleResourceRegistration;
import org.jboss.as.clustering.controller.validation.EnumValidator;
import org.jboss.as.clustering.controller.validation.ModuleIdentifierValidatorBuilder;
import org.jboss.as.controller.AbstractAttributeDefinitionBuilder;
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.ModelVersion;
import org.jboss.as.controller.OperationFailedException;
Expand Down Expand Up @@ -89,14 +88,24 @@ public org.jboss.as.clustering.controller.Capability getCapability() {
}
}

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
MODULE("module", ModelType.STRING, builder -> builder.setValidator(new ModuleIdentifierValidatorBuilder().configure(builder).build())),
STATISTICS_ENABLED("statistics-enabled", ModelType.BOOLEAN, builder -> builder.setDefaultValue(new ModelNode(false))),
enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
MODULE("module", ModelType.STRING) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setValidator(new ModuleIdentifierValidatorBuilder().configure(builder).build());
}
},
STATISTICS_ENABLED("statistics-enabled", ModelType.BOOLEAN) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(false));
}
},
;
private final AttributeDefinition definition;

Attribute(String name, ModelType type, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = configurator.apply(createBuilder(name, type)).build();
Attribute(String name, ModelType type) {
this.definition = this.apply(createBuilder(name, type)).build();
}

@Override
Expand All @@ -106,31 +115,54 @@ public AttributeDefinition getDefinition() {
}

@Deprecated
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute {
@Deprecated BATCHING("batching", ModelType.BOOLEAN, builder -> builder.setDefaultValue(new ModelNode(false)), InfinispanModel.VERSION_3_0_0),
@Deprecated INDEXING("indexing", ModelType.STRING, builder -> builder.setDefaultValue(new ModelNode(Index.NONE.name())).setValidator(new EnumValidator<>(Index.class)), InfinispanModel.VERSION_4_0_0),
@Deprecated INDEXING_PROPERTIES("indexing-properties", InfinispanModel.VERSION_4_0_0),
@Deprecated JNDI_NAME("jndi-name", ModelType.STRING, UnaryOperator.identity(), InfinispanModel.VERSION_6_0_0),
@Deprecated START("start", ModelType.STRING, builder -> builder.setDefaultValue(new ModelNode(StartMode.LAZY.name())).setValidator(new EnumValidator<>(StartMode.class)), InfinispanModel.VERSION_3_0_0),
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
BATCHING("batching", ModelType.BOOLEAN, InfinispanModel.VERSION_3_0_0) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(false));
}
},
INDEXING("indexing", ModelType.STRING, InfinispanModel.VERSION_4_0_0) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(Index.NONE.name()))
.setValidator(new EnumValidator<>(Index.class))
;
}
},
INDEXING_PROPERTIES("indexing-properties", InfinispanModel.VERSION_4_0_0),
JNDI_NAME("jndi-name", ModelType.STRING, InfinispanModel.VERSION_6_0_0),
START("start", ModelType.STRING, InfinispanModel.VERSION_3_0_0) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setDefaultValue(new ModelNode(StartMode.LAZY.name()))
.setValidator(new EnumValidator<>(StartMode.class))
;
}
},
;
private final AttributeDefinition definition;

DeprecatedAttribute(String name, ModelType type, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator, InfinispanModel deprecation) {
this(configurator.apply(createBuilder(name, type)), deprecation);
DeprecatedAttribute(String name, ModelType type, InfinispanModel deprecation) {
this.definition = this.apply(createBuilder(name, type)).setDeprecated(deprecation.getVersion()).build();
}

DeprecatedAttribute(String name, InfinispanModel deprecation) {
this(new PropertiesAttributeDefinition.Builder(name).setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES), deprecation);
}

<A extends AttributeDefinition, B extends AbstractAttributeDefinitionBuilder<B, A>> DeprecatedAttribute(B builder, InfinispanModel deprecation) {
this.definition = builder.setDeprecated(deprecation.getVersion()).build();
this.definition = new PropertiesAttributeDefinition.Builder(name)
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.setDeprecated(deprecation.getVersion())
.build();
}

@Override
public AttributeDefinition getDefinition() {
return this.definition;
}

@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder;
}
}

static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type) {
Expand Down
26 changes: 16 additions & 10 deletions ...n/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java
View file
Expand Up @@ -72,12 +72,12 @@ public RuntimeCapability<?> resolve(PathAddress address) {
}

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
REMOTE_TIMEOUT("remote-timeout", ModelType.LONG, new ModelNode(10000L), UnaryOperator.identity()),
REMOTE_TIMEOUT("remote-timeout", ModelType.LONG, new ModelNode(10000L)),
;
private final AttributeDefinition definition;

Attribute(String name, ModelType type, ModelNode defaultValue, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = configurator.apply(createBuilder(name, type, defaultValue)).build();
Attribute(String name, ModelType type, ModelNode defaultValue) {
this.definition = createBuilder(name, type, defaultValue).build();
}

@Override
Expand All @@ -87,26 +87,32 @@ public AttributeDefinition getDefinition() {
}

@Deprecated
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute {
enum DeprecatedAttribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<SimpleAttributeDefinitionBuilder> {
ASYNC_MARSHALLING("async-marshalling", ModelType.BOOLEAN, new ModelNode(false), InfinispanModel.VERSION_4_0_0),
MODE("mode", ModelType.STRING, new ModelNode(Mode.SYNC.name()), InfinispanModel.VERSION_6_0_0, builder -> builder.setValidator(new EnumValidator<>(Mode.class))),
MODE("mode", ModelType.STRING, new ModelNode(Mode.SYNC.name()), InfinispanModel.VERSION_6_0_0) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setValidator(new EnumValidator<>(Mode.class));
}
},
QUEUE_FLUSH_INTERVAL("queue-flush-interval", ModelType.LONG, new ModelNode(10L), InfinispanModel.VERSION_4_1_0),
QUEUE_SIZE("queue-size", ModelType.INT, new ModelNode(0), InfinispanModel.VERSION_4_1_0),
;
private final AttributeDefinition definition;

DeprecatedAttribute(String name, ModelType type, ModelNode defaultValue, InfinispanModel deprecation) {
this(name, type, defaultValue, deprecation, UnaryOperator.identity());
}

DeprecatedAttribute(String name, ModelType type, ModelNode defaultValue, InfinispanModel deprecation, UnaryOperator<SimpleAttributeDefinitionBuilder> configurator) {
this.definition = createBuilder(name, type, defaultValue).setDeprecated(deprecation.getVersion()).build();
this.definition = this.apply(createBuilder(name, type, defaultValue)).setDeprecated(deprecation.getVersion()).build();
}

@Override
public AttributeDefinition getDefinition() {
return this.definition;
}

@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder;
}
}

static SimpleAttributeDefinitionBuilder createBuilder(String name, ModelType type, ModelNode defaultValue) {
Expand Down

0 comments on commit d6b7eb0

Please sign in to comment.