Replace redundant ComponentServiceNameFactory with ResourceServiceNam…

…eFactory.
wildfly · May 12, 2017 · 5f5c52d · 5f5c52d
1 parent 1691af0
commit 5f5c52d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 38 deletions.
diff --git a/.../extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java b/.../extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java
@@ -24,6 +24,7 @@
 
 import java.util.stream.Stream;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.msc.service.ServiceName;
@@ -32,7 +33,7 @@
  * Enumerates the configurable cache components
  * @author Paul Ferraro
  */
-public enum CacheComponent implements ComponentServiceNameFactory {
+public enum CacheComponent implements ResourceServiceNameFactory {
 
     MODULE("module"),
     EVICTION(EvictionResourceDefinition.PATH),

diff --git a/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java b/...n/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java
@@ -22,14 +22,15 @@
 
 package org.jboss.as.clustering.infinispan.subsystem;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.msc.service.ServiceName;
 
 /**
  * @author Paul Ferraro
  */
-public enum CacheContainerComponent implements ComponentServiceNameFactory {
+public enum CacheContainerComponent implements ResourceServiceNameFactory {
 
     MODULE("module"),
     SITE("site"),

diff --git a/...xtension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java b/...xtension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java
@@ -22,6 +22,7 @@
 
 package org.jboss.as.clustering.infinispan.subsystem;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.msc.service.ServiceBuilder;
 import org.jboss.msc.service.ServiceController;
@@ -39,7 +40,7 @@ public abstract class ComponentBuilder<C> implements Builder<C>, Value<C> {
 
     private final ServiceName name;
 
-    ComponentBuilder(ComponentServiceNameFactory factory, PathAddress parentAddress) {
+    ComponentBuilder(ResourceServiceNameFactory factory, PathAddress parentAddress) {
         this.name = factory.getServiceName(parentAddress);
     }
 

diff --git a/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentServiceNameFactory.java b/...c/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentServiceNameFactory.java
diff --git a/...main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java b/...main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java
@@ -23,11 +23,12 @@
 package org.jboss.as.clustering.infinispan.subsystem;
 
 import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 
 /**
  * @author Paul Ferraro
  */
-public interface ScheduledThreadPoolDefinition extends ComponentServiceNameFactory {
+public interface ScheduledThreadPoolDefinition extends ResourceServiceNameFactory {
 
     Attribute getMaxThreads();
 

diff --git a/...sion/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java b/...sion/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java
@@ -23,11 +23,12 @@
 package org.jboss.as.clustering.infinispan.subsystem;
 
 import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 
 /**
  * @author Paul Ferraro
  */
-public interface ThreadPoolDefinition extends ComponentServiceNameFactory {
+public interface ThreadPoolDefinition extends ResourceServiceNameFactory {
 
     Attribute getMinThreads();