Use new AbstractGuiceJsr250Module, which simplifies AclServiceModule

Change-Id: Id9fc5fccbb12e721ad8197afeacfe05dc6d9eed3
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java
index 4b37c89dd7b8497b08c65b2aa1c8a1ff0cb6aac4..16a12278c2ba4380d25ab30429480a9315a335c5 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java
@@ -7,9 +7,7 @@
  */
 package org.opendaylight.netvirt.aclservice.tests;
 
-import com.google.inject.AbstractModule;
-import com.mycila.guice.ext.closeable.CloseableModule;
-import com.mycila.guice.ext.jsr250.Jsr250Module;
+import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
 import org.opendaylight.netvirt.aclservice.AclServiceManagerImpl;
 import org.opendaylight.netvirt.aclservice.api.AclServiceManager;
 import org.opendaylight.netvirt.aclservice.listeners.AclEventListener;
@@ -22,25 +20,15 @@ import org.opendaylight.netvirt.aclservice.listeners.AclNodeListener;
  *
  * @author Michael Vorburger
  */
-public class AclServiceModule extends AbstractModule {
+public class AclServiceModule extends AbstractGuiceJsr250Module {
 
     @Override
-    protected void configure() {
-        // This is needed so that @PostConstruct & @PreDestroy works
-        //
-        install(new CloseableModule());
-        install(new Jsr250Module());
-
-        // asEagerSingleton() is required here, because of ODL architecture:
-        // These *Listener classes MUST be "eagerly" created, and not "lazily",
-        // only if something needs them @Inject-ed (because nothing ever will;
-        // they register themselves on the DataBroker in their @PostConstruct start).
-        //
-        bind(AclServiceManager.class).to(AclServiceManagerImpl.class).asEagerSingleton();
-        bind(AclInterfaceStateListener.class).asEagerSingleton();
-        bind(AclNodeListener.class).asEagerSingleton();
-        bind(AclInterfaceListener.class).asEagerSingleton();
-        bind(AclEventListener.class).asEagerSingleton();
+    protected void configureBindings() {
+        bind(AclServiceManager.class).to(AclServiceManagerImpl.class);
+        bind(AclInterfaceStateListener.class);
+        bind(AclNodeListener.class);
+        bind(AclInterfaceListener.class);
+        bind(AclEventListener.class);
     }
 
 }