rename ControllerModule to InMemoryControllerModule

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

diff --git a/src/main/java/org/opendaylight/controller/simple/ControllerModule.java b/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java
similarity index 97%
rename from src/main/java/org/opendaylight/controller/simple/ControllerModule.java
rename to src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java
index 87962c0e65c9cf44d9dbafb28937fd41e0db032a..dec0a4655712f1d810ea42100f0c3392e9238bc2 100644 (file)
--- a/src/main/java/org/opendaylight/controller/simple/ControllerModule.java
+++ b/src/main/java/org/opendaylight/controller/simple/InMemoryControllerModule.java
@@ -34,8 +34,7 @@ import org.opendaylight.mdsal.simple.MdsalModule;
 import org.opendaylight.mdsal.simple.PingPong;
 
 @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
-public class ControllerModule extends AbstractCloseableModule {
-    // TODO rename this to InMemoryDataStoreModule - because that's what most of this really is
+public class InMemoryControllerModule extends AbstractCloseableModule {
 
     // TODO re-use org.opendaylight.controller.md.sal.binding.impl.BindingBrokerWiring
 

diff --git a/src/main/java/org/opendaylight/genius/simple/GeniusModule.java b/src/main/java/org/opendaylight/genius/simple/GeniusModule.java
index 54a517d5785e4da8e2b0f8982695e9178e4f54c7..3973d963a4c3a704796910d4443091d73b7a47ce 100644 (file)
--- a/src/main/java/org/opendaylight/genius/simple/GeniusModule.java
+++ b/src/main/java/org/opendaylight/genius/simple/GeniusModule.java
@@ -8,7 +8,7 @@
 package org.opendaylight.genius.simple;
 
 import com.google.inject.AbstractModule;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.daexim.DataImportBootReady;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
@@ -34,7 +34,7 @@ public class GeniusModule extends AbstractModule {
         install(new InfraUtilsModule());
 
         // MD SAL
-        install(new ControllerModule());
+        install(new InMemoryControllerModule());
 
         // ServiceUtils
         install(new ServiceUtilsModule());

diff --git a/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java b/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
index 3094d61863fe6ee9a451126481f4aa0ef783d9cc..db67472870cfc5473ff03226bb3393e2f200e544 100644 (file)
--- a/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
+++ b/src/test/java/org/opendaylight/aaa/simple/test/AAAModuleTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.aaa.simple.test;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
@@ -18,7 +18,7 @@ import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTe
 @Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
 public class AAAModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(new AAAModule(), new ControllerModule(),
+    public @Rule GuiceRule2 guice = new GuiceRule2(new AAAModule(), new InMemoryControllerModule(),
             // TODO new WebWiring(true), new ReferencesWiring(),
             new AnnotationsModule());
 

diff --git a/src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java b/src/test/java/org/opendaylight/controller/simple/test/InMemoryControllerModuleTest.java
similarity index 70%
rename from src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java
rename to src/test/java/org/opendaylight/controller/simple/test/InMemoryControllerModuleTest.java
index d83ce3f735ca60116835833cfec542c6b0216094..9a4120e6e296be1abd90892a668157d931e7ee7a 100644 (file)
--- a/src/test/java/org/opendaylight/controller/simple/test/ControllerModuleTest.java
+++ b/src/test/java/org/opendaylight/controller/simple/test/InMemoryControllerModuleTest.java
@@ -8,13 +8,13 @@
 package org.opendaylight.controller.simple.test;
 
 import org.junit.Rule;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 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 ControllerModuleTest extends AbstractSimpleDistributionTest {
+public class InMemoryControllerModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(ControllerModule.class, AnnotationsModule.class);
+    public @Rule GuiceRule2 guice = new GuiceRule2(InMemoryControllerModule.class, AnnotationsModule.class);
 
 }

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 1d66b74e399698103e7203742b227d9240754cd2..ba1e92ba96d8ca0c3588b0662d6968b2aa8079d7 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,7 +15,7 @@ import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
@@ -31,7 +31,7 @@ import org.opendaylight.neutron.simple.NeutronModule;
 public class NeutronModuleTest extends AbstractSimpleDistributionTest {
 
     public @Rule GuiceRule2 guice = new GuiceRule2(
-            NeutronModule.class, ControllerModule.class, WebModule.class, AnnotationsModule.class);
+            NeutronModule.class, InMemoryControllerModule.class, WebModule.class, AnnotationsModule.class);
 
     @Inject WebServer webServer;
     @Inject TestHttpClient http;

diff --git a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
index 1c676f9a2ef77245b261e8e336a6b830bdd89259..1dd28f4150f199725cf9a867157438860a9a3d83 100644 (file)
--- a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
+++ b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginModuleTest.java
@@ -12,7 +12,7 @@ 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.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
@@ -31,7 +31,7 @@ public class OpenFlowPluginModuleTest extends AbstractSimpleDistributionTest {
     private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
 
     public @Rule GuiceRule2 guice = new GuiceRule2(new OpenFlowPluginModule(CLASS_PATH_BINDER),
-            new ServiceUtilsModule(), new ControllerModule(), new DiagStatusModule(), new WebModule(),
+            new ServiceUtilsModule(), new InMemoryControllerModule(), new DiagStatusModule(), new WebModule(),
             new ReadyModule(), new AnnotationsModule());
 
     @Inject OpenFlowPluginProvider ofpProvider;

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 60f8e5532b7f682f56031ab61b8ce024253cf6b9..9dc7f3a7c91bc8b899b0078a2f49144739f4fd5f 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,7 +15,7 @@ import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
@@ -31,7 +31,7 @@ import org.opendaylight.restconf.simple.RestConfModule;
 public class RestConfModuleTest extends AbstractSimpleDistributionTest {
 
     public @Rule GuiceRule2 guice = new GuiceRule2(
-            RestConfModule.class, ControllerModule.class, WebModule.class, AnnotationsModule.class);
+            RestConfModule.class, InMemoryControllerModule.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 65122750fed9d1e2addec16401578d8c5f0b4b1e..f6c18fa7db927f18691a1fd4a330523a22c0f234 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,7 +9,7 @@ package org.opendaylight.serviceutils.simple.test;
 
 import javax.inject.Inject;
 import org.junit.Rule;
-import org.opendaylight.controller.simple.ControllerModule;
+import org.opendaylight.controller.simple.InMemoryControllerModule;
 import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
 import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
@@ -23,7 +23,7 @@ import org.opendaylight.serviceutils.upgrade.UpgradeState;
  */
 public class ServiceUtilsModuleTest extends AbstractSimpleDistributionTest {
 
-    public @Rule GuiceRule2 guice = new GuiceRule2(ServiceUtilsModule.class, ControllerModule.class,
+    public @Rule GuiceRule2 guice = new GuiceRule2(ServiceUtilsModule.class, InMemoryControllerModule.class,
             AnnotationsModule.class);
 
     @Inject UpgradeState upgradeState;