Remove duplicate AdditionalInitialization implementation.

wildfly · Dec 5, 2016 · 267c85e · 267c85e
1 parent 6f0ace6
commit 267c85e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 69 deletions.
diff --git a/...java/org/jboss/as/clustering/infinispan/subsystem/InfinispanAdditionalInitialization.java b/...java/org/jboss/as/clustering/infinispan/subsystem/InfinispanAdditionalInitialization.java
diff --git a/...est/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanTransformersTestCase.java b/...est/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanTransformersTestCase.java
@@ -40,14 +40,14 @@
 import org.jboss.as.clustering.controller.CommonUnaryRequirement;
 import org.jboss.as.clustering.controller.Operations;
 import org.jboss.as.clustering.jgroups.subsystem.JGroupsSubsystemInitialization;
-import org.jboss.as.clustering.subsystem.AdditionalInitialization;
 import org.jboss.as.controller.ModelVersion;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.model.test.FailedOperationTransformationConfig;
 import org.jboss.as.model.test.ModelFixer;
 import org.jboss.as.model.test.ModelTestControllerVersion;
 import org.jboss.as.model.test.ModelTestUtils;
+import org.jboss.as.subsystem.test.AdditionalInitialization;
 import org.jboss.as.subsystem.test.KernelServices;
 import org.jboss.as.subsystem.test.KernelServicesBuilder;
 import org.jboss.dmr.ModelNode;
@@ -134,7 +134,7 @@ private static String[] getDependencies(ModelTestControllerVersion version) {
                         formatArtifact("org.jboss.eap:wildfly-clustering-common:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-service:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-spi:%s", version),
-                        // Following are needed for InfinispanAdditionalInitialization
+                        // Following are needed for InfinispanSubsystemInitialization
                         formatArtifact("org.jboss.eap:wildfly-clustering-jgroups-extension:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-connector:%s", version),
                         formatArtifact("org.jboss.eap:wildfly-clustering-infinispan-spi:%s", version),
@@ -146,8 +146,8 @@ private static String[] getDependencies(ModelTestControllerVersion version) {
     }
 
     @Override
-    org.jboss.as.subsystem.test.AdditionalInitialization createAdditionalInitialization() {
-        return new InfinispanAdditionalInitialization()
+    AdditionalInitialization createAdditionalInitialization() {
+        return new InfinispanSubsystemInitialization()
                 .require(CommonUnaryRequirement.OUTBOUND_SOCKET_BINDING, "hotrod-server-1", "hotrod-server-2")
                 .require(CommonUnaryRequirement.DATA_SOURCE, "ExampleDS")
                 .require(JGroupsRequirement.CHANNEL_FACTORY, "maximal-channel")
@@ -391,9 +391,9 @@ private void testRejections(final ModelTestControllerVersion controller) throws
 
         // initialize the legacy services
         builder.createLegacyKernelServicesBuilder(createAdditionalInitialization(), controller, version)
-                .addSingleChildFirstClass(InfinispanAdditionalInitialization.class)
+                .addSingleChildFirstClass(InfinispanSubsystemInitialization.class)
                 .addSingleChildFirstClass(JGroupsSubsystemInitialization.class)
-                .addSingleChildFirstClass(AdditionalInitialization.class)
+                .addSingleChildFirstClass(org.jboss.as.clustering.subsystem.AdditionalInitialization.class)
                 .addMavenResourceURL(dependencies)
                 //TODO storing the model triggers the weirdness mentioned in SubsystemTestDelegate.LegacyKernelServiceInitializerImpl.install()
                 //which is strange since it should be loading it all from the current jboss modules