very minor clean ups

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

diff --git a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
index 629e561b736deba6ae8fab6c2454b544bb0b0c4a..01738459d69a5f22ff898e481557301e7caa7bb6 100644 (file)
--- a/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
+++ b/src/main/java/org/opendaylight/openflowplugin/simple/OpenFlowPluginWiring.java
@@ -22,7 +22,6 @@ import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationS
 import org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker;
 import org.opendaylight.openflowplugin.impl.PingPongDataBroker;
 import org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryImpl;
-import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketOutput;
@@ -44,10 +43,6 @@ public class OpenFlowPluginWiring extends AutoWiringModule {
     protected void configure() {
         super.configure(); // this does the auto-wiring
 
-        install(new ServiceUtilsWiring());
-
-        // TODO remove the remaining manual wiring as soon as these service have switched like https://git.opendaylight.org/gerrit/#/c/77386/
-
         // TODO remove NoPacketProcessingService and replace by real PacketProcessingServiceImpl
         bind(PacketProcessingService.class).to(NoPacketProcessingService.class);
 

diff --git a/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/GuiceRuleLambdaTest.java b/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/GuiceRuleLambdaTest.java
index 9b3a4ff3d107a92a2382ab98aed59219f2a4ebd8..38199212a5ea40928c191c72ac7ca89ea5c505c4 100644 (file)
--- a/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/GuiceRuleLambdaTest.java
+++ b/src/test/java/org/opendaylight/infrautils/inject/guice/testutils/tests/GuiceRuleLambdaTest.java
@@ -23,6 +23,7 @@ import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule2;
  */
 public class GuiceRuleLambdaTest {
 
+    @SuppressWarnings("BindingToUnqualifiedCommonType")
     public @Rule GuiceRule guice = new GuiceRule2(
         binder -> binder.bind(String.class).toInstance("hello, world"),
         new AnnotationsModule());

diff --git a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
index fc8e15949902e2f757b2415f9cf2997a744b44d1..63917f7ce0deb47e0e25ccfabe11979d7fc217bb 100644 (file)
--- a/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
+++ b/src/test/java/org/opendaylight/openflowplugin/simple/test/OpenFlowPluginWiringTest.java
@@ -17,12 +17,14 @@ import org.opendaylight.infrautils.simple.ReadyWiring;
 import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
 import org.opendaylight.infrautils.web.WebWiring;
 import org.opendaylight.openflowplugin.simple.OpenFlowPluginWiring;
+import org.opendaylight.serviceutils.simple.ServiceUtilsWiring;
 
 public class OpenFlowPluginWiringTest extends AbstractSimpleDistributionTest {
 
     private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
 
-    public @Rule GuiceRule guice = new GuiceRule(new OpenFlowPluginWiring(CLASS_PATH_BINDER), new ControllerWiring(),
-            new DiagStatusWiring(), new WebWiring(), new ReadyWiring(), new AnnotationsModule());
+    public @Rule GuiceRule guice = new GuiceRule(new OpenFlowPluginWiring(CLASS_PATH_BINDER), new ServiceUtilsWiring(),
+            new ControllerWiring(), new DiagStatusWiring(), new WebWiring(), new ReadyWiring(),
+            new AnnotationsModule());
 
 }