improve AutoWiringModule so that you don't have to super.configure()

also made it an AbstractCheckedModule while at it

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

diff --git a/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java b/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java
index 00993814755674cb4e06ede69e91e3c51a956b52..d6e5f655308be3ac5f49bced19f2d3a721cad835 100644 (file)
--- a/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java
+++ b/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java
@@ -7,15 +7,15 @@
  */
 package org.opendaylight.infrautils.inject.guice;
 
-import com.google.inject.AbstractModule;
 import java.util.Optional;
+import org.opendaylight.infrautils.inject.guice.testutils.AbstractCheckedModule;
 
 /**
  * Guice Module with classpath scanning based autowiring.
  *
  * @author Michael Vorburger.ch
  */
-public class AutoWiringModule extends AbstractModule {
+public class AutoWiringModule extends AbstractCheckedModule {
 
     protected final GuiceClassPathBinder classPathBinder;
     private final Optional<String> packagePrefix;
@@ -25,13 +25,18 @@ public class AutoWiringModule extends AbstractModule {
         this.packagePrefix = Optional.of(packagePrefix);
     }
 
+    @Deprecated // TODO Remove this, it makes little sense and should ultimately not really be required anymore
     protected AutoWiringModule(GuiceClassPathBinder classPathBinder) {
         this.classPathBinder = classPathBinder;
         this.packagePrefix = Optional.empty();
     }
 
     @Override
-    protected void configure() {
+    protected final void checkedConfigure() throws Exception {
         packagePrefix.ifPresent(prefix -> classPathBinder.bindAllSingletons(prefix, binder()));
+        configureMore();
+    }
+
+    protected void configureMore() throws Exception {
     }
 }

diff --git a/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java b/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
index 0e8da8c0c232eaacc396d46145a691ea87000504..c3b80d5a01bdab85a39e9bc3ecce4a1345b0dfa6 100644 (file)
--- a/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
+++ b/src/main/java/org/opendaylight/netvirt/simple/NetvirtModule.java
@@ -18,7 +18,7 @@ public class NetvirtModule extends AutoWiringModule {
     }
 
     @Override
-    protected void configure() {
+    protected void configureMore() {
         install(new GeniusModule(classPathBinder));
 
         install(new AclServiceModule());

diff --git a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
index a7a507d5e957a140a83c46fb531fb5564e5ed3e2..3f40e3666d88a338821e20de6541c09f4a658a1d 100644 (file)
--- a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
+++ b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginModule.java
@@ -32,9 +32,7 @@ public class OpenFlowPluginModule extends AutoWiringModule {
     }
 
     @Override
-    protected void configure() {
-        super.configure(); // this does the auto-wiring
-
+    protected void configureMore() {
         // TODO curious that this is needed despite SwitchConnectionProviderFactoryImpl being annotated?!
         bind(SwitchConnectionProviderFactory.class).to(SwitchConnectionProviderFactoryImpl.class);
     }