rename all *Wiring which are actually *Module accordingly

as per updated doc from the previous commit:

    *Wiring is pure Java

    *Module is Guice specific

Signed-off-by: Michael Vorburger <mike@vorburger.ch>

diff --git a/src/main/java/org/opendaylight/aaa/simple/AAAWiring.java b/src/main/java/org/opendaylight/aaa/simple/AAAModule.java
similarity index 73%
rename from src/main/java/org/opendaylight/aaa/simple/AAAWiring.java
rename to src/main/java/org/opendaylight/aaa/simple/AAAModule.java
index 73a3b403f61bafa73e9d505391d4f93eda231c7e..849f0de3742ca14e1b2f0766820abc36951a6b58 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/AAAWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/AAAModule.java
@@ -9,13 +9,13 @@ package org.opendaylight.aaa.simple;
 
 import com.google.inject.AbstractModule;
 
-public class AAAWiring extends AbstractModule {
+public class AAAModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        install(new EncryptWiring());
-        install(new CertWiring());
-        install(new ShiroWiring());
+        install(new EncryptModule());
+        install(new CertModule());
+        install(new ShiroModule());
     }
 
 }

diff --git a/src/main/java/org/opendaylight/aaa/simple/CertWiring.java b/src/main/java/org/opendaylight/aaa/simple/CertModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/aaa/simple/CertWiring.java
rename to src/main/java/org/opendaylight/aaa/simple/CertModule.java
index ecf1d62c4dc170a3a2eb5c756ff6962a093b51c0..3c58ed84d3d5b9c4e3d78c26f5a8c5d363c211f1 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/CertWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/CertModule.java
@@ -15,7 +15,7 @@ import com.google.inject.AbstractModule;
  *
  * @author Michael Vorburger.ch
  */
-public class CertWiring extends AbstractModule {
+public class CertModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java b/src/main/java/org/opendaylight/aaa/simple/EncryptModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java
rename to src/main/java/org/opendaylight/aaa/simple/EncryptModule.java
index 6a82f652d8538f2d895e5dd089c0dbac5111583b..81780b859ed7f5ca01958bb2cf9f7279ee6084f1 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/EncryptWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/EncryptModule.java
@@ -9,7 +9,7 @@ package org.opendaylight.aaa.simple;
 
 import com.google.inject.AbstractModule;
 
-public class EncryptWiring extends AbstractModule {
+public class EncryptModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/aaa/simple/ShiroWiring.java b/src/main/java/org/opendaylight/aaa/simple/ShiroModule.java
similarity index 97%
rename from src/main/java/org/opendaylight/aaa/simple/ShiroWiring.java
rename to src/main/java/org/opendaylight/aaa/simple/ShiroModule.java
index ab0459b9df0a887470f179e20b0817f812f0ca83..32141c73fe04a02208cdb6c84124786c5d3df08f 100644 (file)
--- a/src/main/java/org/opendaylight/aaa/simple/ShiroWiring.java
+++ b/src/main/java/org/opendaylight/aaa/simple/ShiroModule.java
@@ -15,7 +15,7 @@ import com.google.inject.AbstractModule;
  *
  * @author Michael Vorburger.ch
  */
-public class ShiroWiring extends AbstractModule {
+public class ShiroModule extends AbstractModule {
 
     // TODO private AAAShiroProvider aaaShiroProvider;
 

diff --git a/src/main/java/org/opendaylight/controller/simple/ControllerWiring.java b/src/main/java/org/opendaylight/controller/simple/ControllerModule.java
similarity index 97%
rename from src/main/java/org/opendaylight/controller/simple/ControllerWiring.java
rename to src/main/java/org/opendaylight/controller/simple/ControllerModule.java
index 13d5a15e33c3e8fb14d108125388fe2159b4d6e4..87962c0e65c9cf44d9dbafb28937fd41e0db032a 100644 (file)
--- a/src/main/java/org/opendaylight/controller/simple/ControllerWiring.java
+++ b/src/main/java/org/opendaylight/controller/simple/ControllerModule.java
@@ -30,11 +30,11 @@ import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
-import org.opendaylight.mdsal.simple.MdsalWiring;
+import org.opendaylight.mdsal.simple.MdsalModule;
 import org.opendaylight.mdsal.simple.PingPong;
 
 @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
-public class ControllerWiring extends AbstractCloseableModule {
+public class ControllerModule extends AbstractCloseableModule {
     // TODO rename this to InMemoryDataStoreModule - because that's what most of this really is
 
     // TODO re-use org.opendaylight.controller.md.sal.binding.impl.BindingBrokerWiring
@@ -47,7 +47,7 @@ public class ControllerWiring extends AbstractCloseableModule {
 
     @Override
     protected void configureCloseables() {
-        install(new MdsalWiring());
+        install(new MdsalModule());
 
         // TODO this is just for early stage POC! switch to real CDS wiring here, eventually..
         DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(true);

diff --git a/src/main/java/org/opendaylight/genius/simple/AlivenessMonitorWiring.java b/src/main/java/org/opendaylight/genius/simple/AlivenessMonitorModule.java
similarity index 81%
rename from src/main/java/org/opendaylight/genius/simple/AlivenessMonitorWiring.java
rename to src/main/java/org/opendaylight/genius/simple/AlivenessMonitorModule.java
index b2aba7782cf2fa8ef56f763df8b801922684684f..c985f88acf6f86db90dd5386534e6a62f6901ed6 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/AlivenessMonitorWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/AlivenessMonitorModule.java
@@ -10,9 +10,9 @@ package org.opendaylight.genius.simple;
 import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 
-public class AlivenessMonitorWiring extends AutoWiringModule {
+public class AlivenessMonitorModule extends AutoWiringModule {
 
-    public AlivenessMonitorWiring(GuiceClassPathBinder classPathBinder) {
+    public AlivenessMonitorModule(GuiceClassPathBinder classPathBinder) {
         super(classPathBinder, "org.opendaylight.genius.alivenessmonitor");
     }
 }

diff --git a/src/main/java/org/opendaylight/genius/simple/DatastoreUtilsWiring.java b/src/main/java/org/opendaylight/genius/simple/DatastoreUtilsModule.java
similarity index 92%
rename from src/main/java/org/opendaylight/genius/simple/DatastoreUtilsWiring.java
rename to src/main/java/org/opendaylight/genius/simple/DatastoreUtilsModule.java
index e6f9b8a979c9354462dc7f4e5cd491b67f411615..79c9d8bbee4db5e7c13022c17d2223735a4fd18f 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/DatastoreUtilsWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/DatastoreUtilsModule.java
@@ -11,7 +11,7 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar;
 import org.opendaylight.genius.datastoreutils.listeners.internal.DataTreeEventCallbackRegistrarImpl;
 
-public class DatastoreUtilsWiring extends AbstractModule {
+public class DatastoreUtilsModule extends AbstractModule {
     @Override
     protected void configure() {
         bind(DataTreeEventCallbackRegistrar.class).to(DataTreeEventCallbackRegistrarImpl.class);

diff --git a/src/main/java/org/opendaylight/genius/simple/GeniusMain.java b/src/main/java/org/opendaylight/genius/simple/GeniusMain.java
index 11ac369abec61c8d3f65353fac62c3c2d6a54faa..eda9acccc173bf5df038a6578f30267ef9f58fba 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/GeniusMain.java
+++ b/src/main/java/org/opendaylight/genius/simple/GeniusMain.java
@@ -16,6 +16,6 @@ public final class GeniusMain {
 
     public static void main(String[] args) {
         GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
-        new ShellMain(new GeniusWiring(classPathBinder)).awaitShutdown();
+        new ShellMain(new GeniusModule(classPathBinder)).awaitShutdown();
     }
 }

diff --git a/src/main/java/org/opendaylight/genius/simple/GeniusWiring.java b/src/main/java/org/opendaylight/genius/simple/GeniusModule.java
similarity index 60%
rename from src/main/java/org/opendaylight/genius/simple/GeniusWiring.java
rename to src/main/java/org/opendaylight/genius/simple/GeniusModule.java
index 5db5bb652829410aa35bb19d0b041572e93d957c..54a517d5785e4da8e2b0f8982695e9178e4f54c7 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/GeniusWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/GeniusModule.java
@@ -8,20 +8,20 @@
 package org.opendaylight.genius.simple;
 
 import com.google.inject.AbstractModule;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.daexim.DataImportBootReady;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.simple.InfraUtilsWiring;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginWiring;
+import org.opendaylight.infrautils.simple.InfraUtilsModule;
+import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
 import org.opendaylight.restconf.simple.RestConfModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
+import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
 
-public class GeniusWiring extends AbstractModule {
+public class GeniusModule extends AbstractModule {
 
     private final GuiceClassPathBinder classPathBinder;
 
-    public GeniusWiring(GuiceClassPathBinder classPathBinder) {
+    public GeniusModule(GuiceClassPathBinder classPathBinder) {
         this.classPathBinder = classPathBinder;
     }
 
@@ -31,13 +31,13 @@ public class GeniusWiring extends AbstractModule {
         install(new AnnotationsModule());
 
         // Infrautils
-        install(new InfraUtilsWiring());
+        install(new InfraUtilsModule());
 
         // MD SAL
-        install(new ControllerWiring());
+        install(new ControllerModule());
 
         // ServiceUtils
-        install(new ServiceUtilsWiring());
+        install(new ServiceUtilsModule());
 
         // RESTCONF
         install(new RestConfModule());
@@ -47,16 +47,16 @@ public class GeniusWiring extends AbstractModule {
         bind(DataImportBootReady.class).toInstance(new DataImportBootReady() {});
 
         // OpenFlowPlugin
-        install(new OpenFlowPluginWiring(classPathBinder));
+        install(new OpenFlowPluginModule(classPathBinder));
 
         // Genius
-        install(new MdsalUtilWiring());
-        install(new LockManagerWiring());
-        install(new IdManagerWiring());
-        install(new AlivenessMonitorWiring(classPathBinder));
-        install(new InterfaceManagerWiring());
-        install(new ItmWiring());
-        install(new DatastoreUtilsWiring());
+        install(new MdsalUtilModule());
+        install(new LockManagerModule());
+        install(new IdManagerModule());
+        install(new AlivenessMonitorModule(classPathBinder));
+        install(new InterfaceManagerModule());
+        install(new ItmModule());
+        install(new DatastoreUtilsModule());
         // TODO install(new ResourceManagerWiring());
     }
 

diff --git a/src/main/java/org/opendaylight/genius/simple/IdManagerWiring.java b/src/main/java/org/opendaylight/genius/simple/IdManagerModule.java
similarity index 92%
rename from src/main/java/org/opendaylight/genius/simple/IdManagerWiring.java
rename to src/main/java/org/opendaylight/genius/simple/IdManagerModule.java
index 2221692b21d11a066a1efce703de787d6c60ca18..af58f84bc583b3d760a39d3f701bfd5aeea50b40 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/IdManagerWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/IdManagerModule.java
@@ -11,7 +11,7 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.genius.idmanager.IdManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 
-public class IdManagerWiring extends AbstractModule {
+public class IdManagerModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/genius/simple/InterfaceManagerWiring.java b/src/main/java/org/opendaylight/genius/simple/InterfaceManagerModule.java
similarity index 98%
rename from src/main/java/org/opendaylight/genius/simple/InterfaceManagerWiring.java
rename to src/main/java/org/opendaylight/genius/simple/InterfaceManagerModule.java
index bdf3638dfa710c57c5b542381c6d936efa23ec8a..711473c0e27aa34a2524854e05427c6c29385549 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/InterfaceManagerWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/InterfaceManagerModule.java
@@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 // TODO unify with org.opendaylight.genius.interfacemanager.test.InterfaceManagerTestModule
-public class InterfaceManagerWiring extends AbstractModule {
+public class InterfaceManagerModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/genius/simple/ItmWiring.java b/src/main/java/org/opendaylight/genius/simple/ItmModule.java
similarity index 98%
rename from src/main/java/org/opendaylight/genius/simple/ItmWiring.java
rename to src/main/java/org/opendaylight/genius/simple/ItmModule.java
index 8366f7a056256f1955339379ec3122edee198ad0..4ebb3fa4e5dc210d2ab780d3680d53e534646126 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/ItmWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/ItmModule.java
@@ -26,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService;
 
-public class ItmWiring extends AbstractModule {
+public class ItmModule extends AbstractModule {
 
     // TODO share code here with ItmTestModule instead of copy/pasting it from there!
 

diff --git a/src/main/java/org/opendaylight/genius/simple/LockManagerWiring.java b/src/main/java/org/opendaylight/genius/simple/LockManagerModule.java
similarity index 93%
rename from src/main/java/org/opendaylight/genius/simple/LockManagerWiring.java
rename to src/main/java/org/opendaylight/genius/simple/LockManagerModule.java
index 4e618f2874de89a78ee685204d6c8854a1be2cb1..1555a94892634c24a88641fbb80ac535d2839982 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/LockManagerWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/LockManagerModule.java
@@ -12,7 +12,7 @@ import org.opendaylight.genius.lockmanager.impl.LockListener;
 import org.opendaylight.genius.lockmanager.impl.LockManagerServiceImpl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;
 
-public class LockManagerWiring extends AbstractModule {
+public class LockManagerModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/genius/simple/MdsalUtilWiring.java b/src/main/java/org/opendaylight/genius/simple/MdsalUtilModule.java
similarity index 94%
rename from src/main/java/org/opendaylight/genius/simple/MdsalUtilWiring.java
rename to src/main/java/org/opendaylight/genius/simple/MdsalUtilModule.java
index 9cde4f111d7c008805bd3d9a653b9324efdace7e..71b9ae9969688ebdb58c5aabc185278de7178a34 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/MdsalUtilWiring.java
+++ b/src/main/java/org/opendaylight/genius/simple/MdsalUtilModule.java
@@ -13,7 +13,7 @@ import org.opendaylight.genius.mdsalutil.internal.MDSALManager;
 import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
 import org.opendaylight.genius.utils.hwvtep.internal.HwvtepNodeHACacheImpl;
 
-public class MdsalUtilWiring extends AbstractModule {
+public class MdsalUtilModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/infrautils/simple/CachesWiring.java b/src/main/java/org/opendaylight/infrautils/simple/CachesModule.java
similarity index 94%
rename from src/main/java/org/opendaylight/infrautils/simple/CachesWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/CachesModule.java
index c0cba32e1ea9b2c775098808cabd7dd8c35ef291..ba39bf71366f67e7562fede87e65440c490be2f5 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/CachesWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/CachesModule.java
@@ -13,7 +13,7 @@ import org.opendaylight.infrautils.caches.baseimpl.CacheManagersRegistry;
 import org.opendaylight.infrautils.caches.baseimpl.internal.CacheManagersRegistryImpl;
 import org.opendaylight.infrautils.caches.standard.StandardCacheProvider;
 
-public class CachesWiring extends AbstractModule {
+public class CachesModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/infrautils/simple/DiagStatusWiring.java b/src/main/java/org/opendaylight/infrautils/simple/DiagStatusModule.java
similarity index 95%
rename from src/main/java/org/opendaylight/infrautils/simple/DiagStatusWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/DiagStatusModule.java
index 49939b91d811deb1c57bb6faa50a2e539465ed25..3d5badc713c7d88353092b15dd8c94e991ad79c1 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/DiagStatusWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/DiagStatusModule.java
@@ -20,9 +20,9 @@ import org.opendaylight.infrautils.diagstatus.internal.DiagStatusServiceMBeanImp
 import org.opendaylight.infrautils.diagstatus.spi.NoClusterMemberInfo;
 import org.opendaylight.infrautils.diagstatus.web.WebInitializer;
 
-public class DiagStatusWiring extends AbstractModule {
+public class DiagStatusModule extends AbstractModule {
 
-    // TODO get DiagStatusWiringTest to pass without the 2nd bind() below...
+    // TODO get DiagStatusModuleTest to pass without the 2nd bind() below...
     // maybe using https://github.com/google/guice/wiki/Multibindings ..
     // but how to make it AUTOMATICALLY pickup all beans which ServiceStatusProvider?
     // probably possible via https://github.com/google/guice/wiki/CustomInjections ?

diff --git a/src/main/java/org/opendaylight/infrautils/simple/InfraUtilsWiring.java b/src/main/java/org/opendaylight/infrautils/simple/InfraUtilsModule.java
similarity index 55%
rename from src/main/java/org/opendaylight/infrautils/simple/InfraUtilsWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/InfraUtilsModule.java
index aed30231b98017e97628df89e4d6ad659a3bd82d..082740aadcd7644bfd2b9e5f4c3584d0085b00ad 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/InfraUtilsWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/InfraUtilsModule.java
@@ -8,16 +8,16 @@
 package org.opendaylight.infrautils.simple;
 
 import com.google.inject.AbstractModule;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.web.WebModule;
 
-public class InfraUtilsWiring extends AbstractModule {
+public class InfraUtilsModule extends AbstractModule {
     @Override
     protected void configure() {
-        install(new WebWiring());
-        install(new ReadyWiring());
-        install(new DiagStatusWiring());
-        install(new MetricsWiring());
-        install(new CachesWiring());
-        install(new JobCoordinatorWiring());
+        install(new WebModule());
+        install(new ReadyModule());
+        install(new DiagStatusModule());
+        install(new MetricsModule());
+        install(new CachesModule());
+        install(new JobCoordinatorModule());
     }
 }

diff --git a/src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorWiring.java b/src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorModule.java
similarity index 91%
rename from src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorModule.java
index d9d3c27d1f6e8b86fd0aa78a8ef9da333ab7c5df..1a36d174e284b512dedfa101725bcec0447a6a27 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/JobCoordinatorModule.java
@@ -11,7 +11,7 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.infrautils.jobcoordinator.internal.JobCoordinatorImpl;
 
-public class JobCoordinatorWiring extends AbstractModule {
+public class JobCoordinatorModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/infrautils/simple/MetricsWiring.java b/src/main/java/org/opendaylight/infrautils/simple/MetricsModule.java
similarity index 92%
rename from src/main/java/org/opendaylight/infrautils/simple/MetricsWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/MetricsModule.java
index b5bdabcc9e77d8c1bc44b313b540063892219d7a..0db187b845aa7bcf00fbfdf0d81ea4a68b5193e2 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/MetricsWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/MetricsModule.java
@@ -11,7 +11,7 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.infrautils.metrics.MetricProvider;
 import org.opendaylight.infrautils.metrics.internal.MetricProviderImpl;
 
-public class MetricsWiring extends AbstractModule {
+public class MetricsModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/infrautils/simple/ReadyWiring.java b/src/main/java/org/opendaylight/infrautils/simple/ReadyModule.java
similarity index 94%
rename from src/main/java/org/opendaylight/infrautils/simple/ReadyWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/ReadyModule.java
index 2042516cade3c95789441863bcb114a04ce072a4..5b144ce7c7bc43e2ccb11b8476739ace29c5d622 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/ReadyWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/ReadyModule.java
@@ -12,7 +12,7 @@ import org.opendaylight.infrautils.inject.PostFullSystemInjectionListener;
 import org.opendaylight.infrautils.ready.SystemReadyMonitor;
 import org.opendaylight.infrautils.ready.spi.SimpleSystemReadyMonitor;
 
-public class ReadyWiring extends AbstractModule implements PostFullSystemInjectionListener {
+public class ReadyModule extends AbstractModule implements PostFullSystemInjectionListener {
 
     private final SimpleSystemReadyMonitor systemReadyMonitor = new SimpleSystemReadyMonitor();
 

diff --git a/src/main/java/org/opendaylight/infrautils/simple/ShellTestWiring.java b/src/main/java/org/opendaylight/infrautils/simple/ShellTestModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/infrautils/simple/ShellTestWiring.java
rename to src/main/java/org/opendaylight/infrautils/simple/ShellTestModule.java
index 356dc3e8efd7ed07ae75cfb66507af1edd0e1591..ca27f057c7f840cc6bd21b42f546ada95542cc40 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/simple/ShellTestWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/simple/ShellTestModule.java
@@ -26,7 +26,7 @@ import org.opendaylight.infrautils.karaf.shell.KarafStandaloneShell;
  *
  * @author Michael Vorburger.ch
  */
-public class ShellTestWiring extends AbstractModule {
+public class ShellTestModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/infrautils/web/WebWiring.java b/src/main/java/org/opendaylight/infrautils/web/WebModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/infrautils/web/WebWiring.java
rename to src/main/java/org/opendaylight/infrautils/web/WebModule.java
index d5ac319758b4438e0e6b026d67d043a069188404..1885228400e5dff47c60ef3036f01675e4296a2c 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/web/WebWiring.java
+++ b/src/main/java/org/opendaylight/infrautils/web/WebModule.java
@@ -19,7 +19,7 @@ import org.opendaylight.aaa.web.servlet.jersey2.JerseyServletSupport;
  *
  * @author Michael Vorburger.ch
  */
-public class WebWiring extends AbstractModule {
+public class WebModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/mdsal/simple/MdsalWiring.java b/src/main/java/org/opendaylight/mdsal/simple/MdsalModule.java
similarity index 98%
rename from src/main/java/org/opendaylight/mdsal/simple/MdsalWiring.java
rename to src/main/java/org/opendaylight/mdsal/simple/MdsalModule.java
index 5666173fea59f582b16e6c816a334c9f3f1d22db..692f615e2beaa85a804913e8a3fb79619a99ef67 100644 (file)
--- a/src/main/java/org/opendaylight/mdsal/simple/MdsalWiring.java
+++ b/src/main/java/org/opendaylight/mdsal/simple/MdsalModule.java
@@ -25,7 +25,7 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvid
 import org.opendaylight.mdsal.singleton.dom.impl.DOMClusterSingletonServiceProviderImpl;
 
 @SuppressWarnings("deprecation") // sure, but that's the point of this class...
-public class MdsalWiring extends AbstractModule {
+public class MdsalModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/netvirt/simple/AclServiceWiring.java b/src/main/java/org/opendaylight/netvirt/simple/AclServiceModule.java
similarity index 95%
rename from src/main/java/org/opendaylight/netvirt/simple/AclServiceWiring.java
rename to src/main/java/org/opendaylight/netvirt/simple/AclServiceModule.java
index bd47554e46af4d9ea4ee93183728ccba98ce5a1f..df773f9c80ce3eea721bbb1ad7a06a30acbd8fc0 100644 (file)
--- a/src/main/java/org/opendaylight/netvirt/simple/AclServiceWiring.java
+++ b/src/main/java/org/opendaylight/netvirt/simple/AclServiceModule.java
@@ -16,7 +16,7 @@ import org.opendaylight.netvirt.aclservice.listeners.AclInterfaceStateListener;
 import org.opendaylight.netvirt.aclservice.listeners.AclNodeListener;
 
 // TODO This is copy/pasted from org.opendaylight.netvirt.aclservice.tests.AclServiceModule, but should not be..
-public class AclServiceWiring extends AbstractModule {
+public class AclServiceModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/netvirt/simple/NetvirtMain.java b/src/main/java/org/opendaylight/netvirt/simple/NetvirtMain.java
index 326dc45668f5f92c00d79cd32e40035188f0eb23..d12cf0d258b1b942465b1c99f137c089547ae908 100644 (file)
--- a/src/main/java/org/opendaylight/netvirt/simple/NetvirtMain.java
+++ b/src/main/java/org/opendaylight/netvirt/simple/NetvirtMain.java
@@ -16,6 +16,6 @@ public final class NetvirtMain {
 
     public static void main(String[] args) {
         GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
-        new Main(new NetvirtWiring(classPathBinder)).awaitShutdown();
+        new Main(new NetvirtModule(classPathBinder)).awaitShutdown();
     }
 }

diff --git a/src/main/java/org/opendaylight/netvirt/simple/NetvirtWiring.java b/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
similarity index 68%
rename from src/main/java/org/opendaylight/netvirt/simple/NetvirtWiring.java
rename to src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
index d47398475582c3d6df6e1a053ac54b4d4921a641..0e8da8c0c232eaacc396d46145a691ea87000504 100644 (file)
--- a/src/main/java/org/opendaylight/netvirt/simple/NetvirtWiring.java
+++ b/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
@@ -7,20 +7,20 @@
  */
 package org.opendaylight.netvirt.simple;
 
-import org.opendaylight.genius.simple.GeniusWiring;
+import org.opendaylight.genius.simple.GeniusModule;
 import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 
-public class NetvirtWiring extends AutoWiringModule {
+public class NetvirtModule extends AutoWiringModule {
 
-    public NetvirtWiring(GuiceClassPathBinder classPathBinder) {
+    public NetvirtModule(GuiceClassPathBinder classPathBinder) {
         super(classPathBinder);
     }
 
     @Override
     protected void configure() {
-        install(new GeniusWiring(classPathBinder));
+        install(new GeniusModule(classPathBinder));
 
-        install(new AclServiceWiring());
+        install(new AclServiceModule());
     }
 }

diff --git a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
rename to src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
index 3dd73578136338faae91a005ce3827c0cae28371..a7a507d5e957a140a83c46fb531fb5564e5ed3e2 100644 (file)
--- a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
+++ b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
@@ -25,9 +25,9 @@ import org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFa
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
 
-public class OpenFlowPluginWiring extends AutoWiringModule {
+public class OpenFlowPluginModule extends AutoWiringModule {
 
-    public OpenFlowPluginWiring(GuiceClassPathBinder classPathBinder) {
+    public OpenFlowPluginModule(GuiceClassPathBinder classPathBinder) {
         super(classPathBinder, "org.opendaylight.openflowplugin");
     }
 

diff --git a/src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryWiring.java b/src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryModule.java
similarity index 91%
rename from src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryWiring.java
rename to src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryModule.java
index 3cd22431fd990aace341a716d8700e1cac0d8d42..290ba61c53123623d2e10f4b4beb03b687715667 100644 (file)
--- a/src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryWiring.java
+++ b/src/main/java/org/opendaylight/serviceutils/simple/ServiceRecoveryModule.java
@@ -11,7 +11,7 @@ import com.google.inject.AbstractModule;
 import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry;
 import org.opendaylight.serviceutils.srm.impl.ServiceRecoveryRegistryImpl;
 
-public class ServiceRecoveryWiring extends AbstractModule {
+public class ServiceRecoveryModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsWiring.java b/src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsModule.java
similarity index 75%
rename from src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsWiring.java
rename to src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsModule.java
index fc2f1bdd3fd685701adf93e1632edc81d1de320d..3d4ef66ec5f67ab81b8edcdd3faeec4e1ca3dec8 100644 (file)
--- a/src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsWiring.java
+++ b/src/main/java/org/opendaylight/serviceutils/simple/ServiceUtilsModule.java
@@ -9,10 +9,10 @@ package org.opendaylight.serviceutils.simple;
 
 import com.google.inject.AbstractModule;
 
-public class ServiceUtilsWiring extends AbstractModule {
+public class ServiceUtilsModule extends AbstractModule {
     @Override
     protected void configure() {
-        install(new ServiceRecoveryWiring());
-        install(new UpgradeWiring());
+        install(new ServiceRecoveryModule());
+        install(new UpgradeModule());
     }
 }

diff --git a/src/main/java/org/opendaylight/serviceutils/simple/UpgradeWiring.java b/src/main/java/org/opendaylight/serviceutils/simple/UpgradeModule.java
similarity index 96%
rename from src/main/java/org/opendaylight/serviceutils/simple/UpgradeWiring.java
rename to src/main/java/org/opendaylight/serviceutils/simple/UpgradeModule.java
index e674063a7f59e92cf5693404796225857d3b4933..7fbe2a2b7df4bb715bd6bbb5bf16e755d12f5626 100644 (file)
--- a/src/main/java/org/opendaylight/serviceutils/simple/UpgradeWiring.java
+++ b/src/main/java/org/opendaylight/serviceutils/simple/UpgradeModule.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180
  *
  * @author Michael Vorburger.ch
  */
-public class UpgradeWiring extends AbstractModule {
+public class UpgradeModule extends AbstractModule {
 
     @Override
     protected void configure() {

diff --git a/src/test/java/org/opendaylight/aaa/simple/test/AAAWiringTest.java b/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
similarity index 76%
rename from src/test/java/org/opendaylight/aaa/simple/test/AAAWiringTest.java
rename to src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
index e04cf188d79a3c2c4dd44e2a185b900ac6debd7c..3094d61863fe6ee9a451126481f4aa0ef783d9cc 100644 (file)
--- a/src/test/java/org/opendaylight/aaa/simple/test/AAAWiringTest.java
+++ b/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
@@ -9,16 +9,16 @@ package org.opendaylight.aaa.simple.test;
 
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.opendaylight.aaa.simple.AAAWiring;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.aaa.simple.AAAModule;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 
 @Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
-public class AAAWiringTest extends AbstractSimpleDistributionTest {
+public class AAAModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(new AAAWiring(), new ControllerWiring(),
+    public @Rule GuiceRule2 guice = new GuiceRule2(new AAAModule(), new ControllerModule(),
             // TODO new WebWiring(true), new ReferencesWiring(),
             new AnnotationsModule());
 

diff --git a/src/test/java/org/opendaylight/controller/simple/test/ControllerWiringTest.java b/src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java
similarity index 73%
rename from src/test/java/org/opendaylight/controller/simple/test/ControllerWiringTest.java
rename to src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java
index 1cba33a28a90263e3cee947b6a1d2a8f00316d28..d83ce3f735ca60116835833cfec542c6b0216094 100644 (file)
--- a/src/test/java/org/opendaylight/controller/simple/test/ControllerWiringTest.java
+++ b/src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java
@@ -8,13 +8,13 @@
 package org.opendaylight.controller.simple.test;
 
 import org.junit.Rule;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 
-public class ControllerWiringTest extends AbstractSimpleDistributionTest {
+public class ControllerModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(ControllerWiring.class, AnnotationsModule.class);
+    public @Rule GuiceRule2 guice = new GuiceRule2(ControllerModule.class, AnnotationsModule.class);
 
 }

diff --git a/src/test/java/org/opendaylight/genius/simple/test/GeniusSimpleDistributionTest.java b/src/test/java/org/opendaylight/genius/simple/test/GeniusSimpleDistributionTest.java
index 7992365042ac582688697e0b616406ae01bc7e1d..c7bb566ee54d1261bbc3bac78b794a35da908ff4 100644 (file)
--- a/src/test/java/org/opendaylight/genius/simple/test/GeniusSimpleDistributionTest.java
+++ b/src/test/java/org/opendaylight/genius/simple/test/GeniusSimpleDistributionTest.java
@@ -11,10 +11,10 @@ import javax.inject.Inject;
 import org.junit.Rule;
 import org.opendaylight.genius.interfacemanager.interfaces.InterfaceManagerService;
 import org.opendaylight.genius.itm.api.IITMProvider;
-import org.opendaylight.genius.simple.GeniusWiring;
+import org.opendaylight.genius.simple.GeniusModule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
-import org.opendaylight.infrautils.simple.ShellTestWiring;
+import org.opendaylight.infrautils.simple.ShellTestModule;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 
 /**
@@ -29,7 +29,7 @@ public class GeniusSimpleDistributionTest extends AbstractSimpleDistributionTest
 
     private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(new GeniusWiring(CLASS_PATH_BINDER), new ShellTestWiring());
+    public @Rule GuiceRule2 guice = new GuiceRule2(new GeniusModule(CLASS_PATH_BINDER), new ShellTestModule());
 
     @Inject InterfaceManagerService interfaceManagerService;
 

diff --git a/src/test/java/org/opendaylight/infrautils/diagstatus/web/test/DiagStatusServletTest.java b/src/test/java/org/opendaylight/infrautils/diagstatus/web/test/DiagStatusServletTest.java
index d2705a47d9c198cae050f17c4e5ff59c78554dba..9ead77dd2a00891d64dc52cab2ab0efc048be915 100644 (file)
--- a/src/test/java/org/opendaylight/infrautils/diagstatus/web/test/DiagStatusServletTest.java
+++ b/src/test/java/org/opendaylight/infrautils/diagstatus/web/test/DiagStatusServletTest.java
@@ -28,7 +28,7 @@ import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.testutils.Partials;
 import org.opendaylight.infrautils.testutils.TestHttpClient;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.web.WebModule;
 
 /**
  * Test for {@link DiagStatusServlet}.
@@ -39,7 +39,7 @@ public class DiagStatusServletTest {
 
     private static final TestDiagStatusService SRVC = Partials.newPartial(TestDiagStatusService.class);
 
-    public static class DiagStatusServletTestWiring extends AbstractModule {
+    public static class DiagStatusServletTestModule extends AbstractModule {
         @Override
         protected void configure() {
             bind(DiagStatusService.class).toInstance(SRVC);
@@ -48,7 +48,7 @@ public class DiagStatusServletTest {
     }
 
     public @Rule GuiceRule2 guice = new GuiceRule2(
-            WebWiring.class, DiagStatusServletTestWiring.class, AnnotationsModule.class);
+            WebModule.class, DiagStatusServletTestModule.class, AnnotationsModule.class);
 
     @Inject WebServer webServer;
     @Inject TestHttpClient http;

diff --git a/src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusWiringTest.java b/src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusModuleTest.java
similarity index 74%
rename from src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusWiringTest.java
rename to src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusModuleTest.java
index 67342e1475e7355a067635abaeabe2f6082cff90..ce649ecad0c463e2e6a35aede3e0f2f640222b2e 100644 (file)
--- a/src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusWiringTest.java
+++ b/src/test/java/org/opendaylight/infrautils/simple/test/DiagStatusModuleTest.java
@@ -13,18 +13,18 @@ import org.junit.Test;
 import org.opendaylight.infrautils.diagstatus.DiagStatusService;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
-import org.opendaylight.infrautils.simple.DiagStatusWiring;
-import org.opendaylight.infrautils.simple.ReadyWiring;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.simple.DiagStatusModule;
+import org.opendaylight.infrautils.simple.ReadyModule;
+import org.opendaylight.infrautils.web.WebModule;
 
 /**
- * Unit test for {@link DiagStatusWiring}.
+ * Unit test for {@link DiagStatusModule}.
  *
  * @author Michael Vorburger.ch
  */
-public class DiagStatusWiringTest {
+public class DiagStatusModuleTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(WebWiring.class, DiagStatusWiring.class, ReadyWiring.class,
+    public @Rule GuiceRule2 guice = new GuiceRule2(WebModule.class, DiagStatusModule.class, ReadyModule.class,
             AnnotationsModule.class);
 
     @Inject DiagStatusService diagStatusService;

diff --git a/src/test/java/org/opendaylight/infrautils/simple/test/MainTest.java b/src/test/java/org/opendaylight/infrautils/simple/test/MainTest.java
index 5ab44608e6e733c56bfd324b4f5ef2891af30cfb..dd3213c40133cfbd921f330ad16baff401c6038d 100644 (file)
--- a/src/test/java/org/opendaylight/infrautils/simple/test/MainTest.java
+++ b/src/test/java/org/opendaylight/infrautils/simple/test/MainTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.infrautils.simple.test;
 import org.junit.Test;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
 import org.opendaylight.infrautils.simple.Main;
-import org.opendaylight.infrautils.simple.ReadyWiring;
+import org.opendaylight.infrautils.simple.ReadyModule;
 
 /**
  * Unit test for Main.
@@ -27,7 +27,7 @@ public class MainTest {
     public static class TestModule extends AbstractGuiceJsr250Module {
         @Override
         protected void configureBindings() {
-            install(new ReadyWiring());
+            install(new ReadyModule());
 
             // bind(SomeInterfaceWithPostConstruct.class).to(SomeClassWithPostConstruct.class);
         }

diff --git a/src/test/java/org/opendaylight/infrautils/simple/test/ReadyWiringTest.java b/src/test/java/org/opendaylight/infrautils/simple/test/ReadyModuleTest.java
similarity index 90%
rename from src/test/java/org/opendaylight/infrautils/simple/test/ReadyWiringTest.java
rename to src/test/java/org/opendaylight/infrautils/simple/test/ReadyModuleTest.java
index 101d81bd504c918e6ec2e158f35baac19e7a06ca..aa052bf0984e4fe8e8da7ce03a3b27417f9526c9 100644 (file)
--- a/src/test/java/org/opendaylight/infrautils/simple/test/ReadyWiringTest.java
+++ b/src/test/java/org/opendaylight/infrautils/simple/test/ReadyModuleTest.java
@@ -16,14 +16,14 @@ import org.junit.Test;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.ready.SystemReadyMonitor;
-import org.opendaylight.infrautils.simple.ReadyWiring;
+import org.opendaylight.infrautils.simple.ReadyModule;
 
 /**
- * Unit test for {@link ReadyWiring}.
+ * Unit test for {@link ReadyModule}.
  *
  * @author Michael Vorburger.ch
  */
-public class ReadyWiringTest {
+public class ReadyModuleTest {
 
     public static class TestBean {
         private final SystemReadyMonitor systemReadyMonitor;
@@ -44,7 +44,7 @@ public class ReadyWiringTest {
         }
     }
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(ReadyWiring.class, AnnotationsModule.class);
+    public @Rule GuiceRule2 guice = new GuiceRule2(ReadyModule.class, AnnotationsModule.class);
 
     @Inject TestBean testBean;
 

diff --git a/src/test/java/org/opendaylight/netvirt/simple/test/NetvirtSimpleDistributionTest.java b/src/test/java/org/opendaylight/netvirt/simple/test/NetvirtSimpleDistributionTest.java
index 07c177c7b5c48d72b5ec8377836e5aa22e4fe4ee..874bb81275e57f1f23d6dec255b4fecd3fe2b0fd 100644 (file)
--- a/src/test/java/org/opendaylight/netvirt/simple/test/NetvirtSimpleDistributionTest.java
+++ b/src/test/java/org/opendaylight/netvirt/simple/test/NetvirtSimpleDistributionTest.java
@@ -11,9 +11,9 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
-import org.opendaylight.infrautils.simple.ShellTestWiring;
+import org.opendaylight.infrautils.simple.ShellTestModule;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.netvirt.simple.NetvirtWiring;
+import org.opendaylight.netvirt.simple.NetvirtModule;
 
 /**
  * Netvirt full distribution component test.
@@ -25,6 +25,6 @@ public class NetvirtSimpleDistributionTest extends AbstractSimpleDistributionTes
 
     private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(new NetvirtWiring(CLASS_PATH_BINDER), new ShellTestWiring());
+    public @Rule GuiceRule2 guice = new GuiceRule2(new NetvirtModule(CLASS_PATH_BINDER), new ShellTestModule());
 
 }

diff --git a/src/test/java/org/opendaylight/neutron/simple/test/NeutronModuleTest.java b/src/test/java/org/opendaylight/neutron/simple/test/NeutronModuleTest.java
index 3499a9ec2f3d5e45e017fc01f1e9959e96a41548..1d66b74e399698103e7203742b227d9240754cd2 100644 (file)
--- a/src/test/java/org/opendaylight/neutron/simple/test/NeutronModuleTest.java
+++ b/src/test/java/org/opendaylight/neutron/simple/test/NeutronModuleTest.java
@@ -15,12 +15,12 @@ import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 import org.opendaylight.infrautils.testutils.TestHttpClient;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.web.WebModule;
 import org.opendaylight.neutron.simple.NeutronModule;
 
 /**
@@ -31,7 +31,7 @@ import org.opendaylight.neutron.simple.NeutronModule;
 public class NeutronModuleTest extends AbstractSimpleDistributionTest {
 
     public @Rule GuiceRule2 guice = new GuiceRule2(
-            NeutronModule.class, ControllerWiring.class, WebWiring.class, AnnotationsModule.class);
+            NeutronModule.class, ControllerModule.class, WebModule.class, AnnotationsModule.class);
 
     @Inject WebServer webServer;
     @Inject TestHttpClient http;

diff --git a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
similarity index 74%
rename from src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
rename to src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
index 67b0c6a4618a53563aa7137b11f895aebbecb295..1c676f9a2ef77245b261e8e336a6b830bdd89259 100644 (file)
--- a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
+++ b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
@@ -12,27 +12,27 @@ import static com.google.common.truth.Truth.assertThat;
 import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
-import org.opendaylight.infrautils.simple.DiagStatusWiring;
-import org.opendaylight.infrautils.simple.ReadyWiring;
+import org.opendaylight.infrautils.simple.DiagStatusModule;
+import org.opendaylight.infrautils.simple.ReadyModule;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.web.WebModule;
 import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginWiring;
-import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
+import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
+import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
 
-public class OpenFlowPluginWiringTest extends AbstractSimpleDistributionTest {
+public class OpenFlowPluginModuleTest extends AbstractSimpleDistributionTest {
 
     private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(new OpenFlowPluginWiring(CLASS_PATH_BINDER),
-            new ServiceUtilsWiring(), new ControllerWiring(), new DiagStatusWiring(), new WebWiring(),
-            new ReadyWiring(), new AnnotationsModule());
+    public @Rule GuiceRule2 guice = new GuiceRule2(new OpenFlowPluginModule(CLASS_PATH_BINDER),
+            new ServiceUtilsModule(), new ControllerModule(), new DiagStatusModule(), new WebModule(),
+            new ReadyModule(), new AnnotationsModule());
 
     @Inject OpenFlowPluginProvider ofpProvider;
     @Inject OpenflowProviderConfig ofpConfig;

diff --git a/src/test/java/org/opendaylight/restconf/simple/test/RestConfModuleTest.java b/src/test/java/org/opendaylight/restconf/simple/test/RestConfModuleTest.java
index 552f64be9935c31798fda757a9b5dcd5e2ecb275..60f8e5532b7f682f56031ab61b8ce024253cf6b9 100644 (file)
--- a/src/test/java/org/opendaylight/restconf/simple/test/RestConfModuleTest.java
+++ b/src/test/java/org/opendaylight/restconf/simple/test/RestConfModuleTest.java
@@ -15,12 +15,12 @@ import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 import org.opendaylight.infrautils.testutils.TestHttpClient;
-import org.opendaylight.infrautils.web.WebWiring;
+import org.opendaylight.infrautils.web.WebModule;
 import org.opendaylight.restconf.simple.RestConfModule;
 
 /**
@@ -31,7 +31,7 @@ import org.opendaylight.restconf.simple.RestConfModule;
 public class RestConfModuleTest extends AbstractSimpleDistributionTest {
 
     public @Rule GuiceRule2 guice = new GuiceRule2(
-            RestConfModule.class, ControllerWiring.class, WebWiring.class, AnnotationsModule.class);
+            RestConfModule.class, ControllerModule.class, WebModule.class, AnnotationsModule.class);
 
     @Inject WebServer webServer;
     @Inject TestHttpClient http;

diff --git a/src/test/java/org/opendaylight/serviceutils/simple/test/ServiceUtilsModuleTest.java b/src/test/java/org/opendaylight/serviceutils/simple/test/ServiceUtilsModuleTest.java
index 7ee26a00acfb59202e5f324a3893b71984794522..65122750fed9d1e2addec16401578d8c5f0b4b1e 100644 (file)
--- a/src/test/java/org/opendaylight/serviceutils/simple/test/ServiceUtilsModuleTest.java
+++ b/src/test/java/org/opendaylight/serviceutils/simple/test/ServiceUtilsModuleTest.java
@@ -9,11 +9,11 @@ package org.opendaylight.serviceutils.simple.test;
 
 import javax.inject.Inject;
 import org.junit.Rule;
-import org.opendaylight.controller.simple.ControllerWiring;
+import org.opendaylight.controller.simple.ControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
+import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
 import org.opendaylight.serviceutils.upgrade.UpgradeState;
 
 /**
@@ -23,7 +23,7 @@ import org.opendaylight.serviceutils.upgrade.UpgradeState;
  */
 public class ServiceUtilsModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(ServiceUtilsWiring.class, ControllerWiring.class,
+    public @Rule GuiceRule2 guice = new GuiceRule2(ServiceUtilsModule.class, ControllerModule.class,
             AnnotationsModule.class);
 
     @Inject UpgradeState upgradeState;