Generalize election policy capability.

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyBuilder.java

@@ -23,10 +23,12 @@
 package org.wildfly.extension.clustering.singleton;
 
 import static org.wildfly.extension.clustering.singleton.ElectionPolicyResourceDefinition.Attribute.*;
+import static org.wildfly.extension.clustering.singleton.ElectionPolicyResourceDefinition.Capability.*;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.jboss.as.clustering.controller.CapabilityServiceNameProvider;
 import org.jboss.as.clustering.controller.CommonUnaryRequirement;
 import org.jboss.as.clustering.controller.ResourceServiceBuilder;
 import org.jboss.as.clustering.dmr.ModelNodes;
@@ -52,13 +54,13 @@
  * Builds a service that provides an election policy.
  * @author Paul Ferraro
  */
-public abstract class ElectionPolicyBuilder extends ElectionPolicyServiceNameProvider implements ResourceServiceBuilder<SingletonElectionPolicy>, Value<SingletonElectionPolicy> {
+public abstract class ElectionPolicyBuilder extends CapabilityServiceNameProvider implements ResourceServiceBuilder<SingletonElectionPolicy>, Value<SingletonElectionPolicy> {
 
     private final List<Preference> preferences = new CopyOnWriteArrayList<>();
     private final List<Dependency> dependencies = new CopyOnWriteArrayList<>();
 
-    protected ElectionPolicyBuilder(PathAddress policyAddress) {
-        super(policyAddress);
+    protected ElectionPolicyBuilder(PathAddress address) {
+        super(ELECTION_POLICY, address);
     }
 
     @Override

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java

@@ -22,9 +22,16 @@
 
 package org.wildfly.extension.clustering.singleton;
 
-import org.jboss.as.clustering.controller.ChildResourceDefinition;
+import java.util.function.Consumer;
+
 import org.jboss.as.clustering.controller.CapabilityReference;
+import org.jboss.as.clustering.controller.ChildResourceDefinition;
 import org.jboss.as.clustering.controller.CommonUnaryRequirement;
+import org.jboss.as.clustering.controller.ResourceDescriptor;
+import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory;
+import org.jboss.as.clustering.controller.ResourceServiceHandler;
+import org.jboss.as.clustering.controller.SimpleResourceRegistration;
+import org.jboss.as.clustering.controller.SimpleResourceServiceHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.CapabilityReferenceRecorder;
 import org.jboss.as.controller.PathAddress;
@@ -33,6 +40,7 @@
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
+import org.wildfly.clustering.singleton.SingletonElectionPolicy;
 
 /**
  * Definition of an election policy resource.
@@ -47,12 +55,12 @@ static PathElement pathElement(String value) {
     }
 
     enum Capability implements org.jboss.as.clustering.controller.Capability {
-        SOCKET_BINDING_PREFERENCE("org.wildfly.clustering.singleton.singleton-policy.election-policy.socket-binding-preference"),
+        ELECTION_POLICY("org.wildfly.clustering.singleton.policy.election", SingletonElectionPolicy.class),
         ;
         private final RuntimeCapability<Void> definition;
 
-        Capability(String name) {
-            this.definition = RuntimeCapability.Builder.of(name, true).build();
+        Capability(String name, Class<?> type) {
+            this.definition = RuntimeCapability.Builder.of(name, true, type).build();
         }
 
         @Override
@@ -68,7 +76,7 @@ public RuntimeCapability<Void> resolve(PathAddress address) {
 
     enum Attribute implements org.jboss.as.clustering.controller.Attribute {
         NAME_PREFERENCES("name-preferences", "socket-binding-preferences"),
-        SOCKET_BINDING_PREFERENCES("socket-binding-preferences", "name-preferences", new CapabilityReference(Capability.SOCKET_BINDING_PREFERENCE, CommonUnaryRequirement.OUTBOUND_SOCKET_BINDING)),
+        SOCKET_BINDING_PREFERENCES("socket-binding-preferences", "name-preferences", new CapabilityReference(Capability.ELECTION_POLICY, CommonUnaryRequirement.OUTBOUND_SOCKET_BINDING)),
         ;
         private final AttributeDefinition definition;
 
@@ -96,7 +104,25 @@ private static StringListAttributeDefinition.Builder createBuilder(String name,
         }
     }
 
-    ElectionPolicyResourceDefinition(PathElement path, ResourceDescriptionResolver resolver) {
+    private final Consumer<ResourceDescriptor> configurator;
+    private final ResourceServiceBuilderFactory<SingletonElectionPolicy> builderFactory;
+
+    ElectionPolicyResourceDefinition(PathElement path, ResourceDescriptionResolver resolver, Consumer<ResourceDescriptor> configurator, ResourceServiceBuilderFactory<SingletonElectionPolicy> builderFactory) {
         super(path, resolver);
+        this.configurator = configurator;
+        this.builderFactory = builderFactory;
+    }
+
+    @Override
+    public void register(ManagementResourceRegistration parentRegistration) {
+        ManagementResourceRegistration registration = parentRegistration.registerSubModel(this);
+
+        ResourceDescriptor descriptor = new ResourceDescriptor(this.getResourceDescriptionResolver())
+                .addAttributes(ElectionPolicyResourceDefinition.Attribute.class)
+                .addCapabilities(ElectionPolicyResourceDefinition.Capability.class)
+                ;
+        this.configurator.accept(descriptor);
+        ResourceServiceHandler handler = new SimpleResourceServiceHandler<>(this.builderFactory);
+        new SimpleResourceRegistration(descriptor, handler).register(registration);
     }
 }

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/RandomElectionPolicyResourceDefinition.java

@@ -22,12 +22,8 @@
 
 package org.wildfly.extension.clustering.singleton;
 
-import org.jboss.as.clustering.controller.ResourceDescriptor;
-import org.jboss.as.clustering.controller.SimpleResourceRegistration;
-import org.jboss.as.clustering.controller.ResourceServiceHandler;
-import org.jboss.as.clustering.controller.SimpleResourceServiceHandler;
+import org.jboss.as.clustering.function.Consumers;
 import org.jboss.as.controller.PathElement;
-import org.jboss.as.controller.registry.ManagementResourceRegistration;
 
 /**
  * @author Paul Ferraro
@@ -38,18 +34,6 @@ public class RandomElectionPolicyResourceDefinition extends ElectionPolicyResour
     static final PathElement PATH = pathElement(PATH_VALUE);
 
     RandomElectionPolicyResourceDefinition() {
-        super(PATH, new SingletonResourceDescriptionResolver(PATH, WILDCARD_PATH));
-    }
-
-    @Override
-    public void register(ManagementResourceRegistration parentRegistration) {
-        ManagementResourceRegistration registration = parentRegistration.registerSubModel(this);
-
-        ResourceDescriptor descriptor = new ResourceDescriptor(this.getResourceDescriptionResolver())
-                .addAttributes(ElectionPolicyResourceDefinition.Attribute.class)
-                .addCapabilities(ElectionPolicyResourceDefinition.Capability.class)
-                ;
-        ResourceServiceHandler handler = new SimpleResourceServiceHandler<>(address -> new RandomElectionPolicyBuilder(address.getParent()));
-        new SimpleResourceRegistration(descriptor, handler).register(registration);
+        super(PATH, new SingletonResourceDescriptionResolver(PATH, WILDCARD_PATH), Consumers.empty(), address -> new RandomElectionPolicyBuilder(address));
     }
 }

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/SimpleElectionPolicyResourceDefinition.java

@@ -22,14 +22,9 @@
 
 package org.wildfly.extension.clustering.singleton;
 
-import org.jboss.as.clustering.controller.ResourceDescriptor;
-import org.jboss.as.clustering.controller.SimpleResourceRegistration;
-import org.jboss.as.clustering.controller.ResourceServiceHandler;
-import org.jboss.as.clustering.controller.SimpleResourceServiceHandler;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
-import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
 
@@ -62,19 +57,6 @@ public SimpleAttributeDefinition getDefinition() {
     }
 
     SimpleElectionPolicyResourceDefinition() {
-        super(PATH, new SingletonResourceDescriptionResolver(PATH, WILDCARD_PATH));
-    }
-
-    @Override
-    public void register(ManagementResourceRegistration parentRegistration) {
-        ManagementResourceRegistration registration = parentRegistration.registerSubModel(this);
-
-        ResourceDescriptor descriptor = new ResourceDescriptor(this.getResourceDescriptionResolver())
-                .addAttributes(Attribute.class)
-                .addAttributes(ElectionPolicyResourceDefinition.Attribute.class)
-                .addCapabilities(ElectionPolicyResourceDefinition.Capability.class)
-                ;
-        ResourceServiceHandler handler = new SimpleResourceServiceHandler<>(address -> new SimpleElectionPolicyBuilder(address.getParent()));
-        new SimpleResourceRegistration(descriptor, handler).register(registration);
+        super(PATH, new SingletonResourceDescriptionResolver(PATH, WILDCARD_PATH), descriptor -> descriptor.addAttributes(Attribute.class), address -> new SimpleElectionPolicyBuilder(address));
     }
 }

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/SingletonPolicyBuilder.java

@@ -25,6 +25,9 @@
 import static org.wildfly.extension.clustering.singleton.SingletonPolicyResourceDefinition.Attribute.*;
 import static org.wildfly.extension.clustering.singleton.SingletonPolicyResourceDefinition.Capability.*;
 
+import java.util.stream.Stream;
+
+import org.jboss.as.clustering.controller.CapabilityServiceNameProvider;
 import org.jboss.as.clustering.controller.ResourceServiceBuilder;
 import org.jboss.as.clustering.dmr.ModelNodes;
 import org.jboss.as.controller.OperationContext;
@@ -38,7 +41,6 @@
 import org.jboss.msc.service.ServiceTarget;
 import org.jboss.msc.service.ValueService;
 import org.jboss.msc.value.ImmediateValue;
-import org.jboss.msc.value.InjectedValue;
 import org.wildfly.clustering.service.Builder;
 import org.wildfly.clustering.service.InjectedValueDependency;
 import org.wildfly.clustering.service.ValueDependency;
@@ -51,31 +53,24 @@
  * Builds a service that provides a {@link SingletonPolicy}.
  * @author Paul Ferraro
  */
-public class SingletonPolicyBuilder implements ResourceServiceBuilder<SingletonPolicy>, SingletonPolicy {
-
-    private final InjectedValue<SingletonElectionPolicy> policy = new InjectedValue<>();
+public class SingletonPolicyBuilder extends CapabilityServiceNameProvider implements ResourceServiceBuilder<SingletonPolicy>, SingletonPolicy {
 
-    private final PathAddress address;
+    private final ValueDependency<SingletonElectionPolicy> policy;
 
     private volatile ValueDependency<SingletonServiceBuilderFactory> factory;
     private volatile int quorum;
 
     public SingletonPolicyBuilder(PathAddress address) {
-        this.address = address;
-    }
-
-    @Override
-    public ServiceName getServiceName() {
-        return POLICY.getServiceName(this.address);
+        super(POLICY, address);
+        this.policy = new InjectedValueDependency<>(ElectionPolicyResourceDefinition.Capability.ELECTION_POLICY.getServiceName(address.append(ElectionPolicyResourceDefinition.WILDCARD_PATH)), SingletonElectionPolicy.class);
     }
 
     @Override
     public ServiceBuilder<SingletonPolicy> build(ServiceTarget target) {
-        ServiceBuilder<SingletonPolicy> builder = target.addService(this.getServiceName(), new ValueService<>(new ImmediateValue<SingletonPolicy>(this)))
-                .addDependency(new ElectionPolicyServiceNameProvider(this.address).getServiceName(), SingletonElectionPolicy.class, this.policy)
-                .setInitialMode(ServiceController.Mode.PASSIVE)
-        ;
-        return this.factory.register(builder);
+        Service<SingletonPolicy> service = new ValueService<>(new ImmediateValue<>(this));
+        ServiceBuilder<SingletonPolicy> builder = target.addService(this.getServiceName(), service).setInitialMode(ServiceController.Mode.PASSIVE);
+        Stream.of(this.policy, this.factory).forEach(dependency -> dependency.register(builder));
+        return builder;
     }
 
     @Override
@@ -105,6 +100,6 @@ public <T> Builder<T> createSingletonServiceBuilder(ServiceName name, Service<T>
 
     @Override
     public String toString() {
-        return this.address.getLastElement().getValue();
+        return this.getServiceName().getSimpleName();
     }
 }