Undo weaving of IDebugCounterService into the OFSwitch class for previous...

Undo weaving of IDebugCounterService into the OFSwitch class for previous SwitchCounters implementation.

src/main/java/net/floodlightcontroller/core/OFSwitch.java

@@ -41,7 +41,6 @@ import net.floodlightcontroller.core.annotations.LogMessageDoc;
 import net.floodlightcontroller.core.internal.IOFSwitchManager;
 import net.floodlightcontroller.core.util.AppCookie;
 import net.floodlightcontroller.core.util.URIUtil;
-import net.floodlightcontroller.debugcounter.IDebugCounterService;
 
 import org.projectfloodlight.openflow.protocol.OFActionType;
 import org.projectfloodlight.openflow.protocol.OFBsnControllerConnection;
@@ -123,7 +122,7 @@ public class OFSwitch implements IOFSwitchBackend {
     }
 
     public OFSwitch(IOFConnectionBackend connection, @Nonnull OFFactory factory, @Nonnull IOFSwitchManager switchManager,
-            @Nonnull DatapathId datapathId, @Nonnull IDebugCounterService debugCounterService) {
+            @Nonnull DatapathId datapathId) {
         if(connection == null)
             throw new NullPointerException("connection must not be null");
         if(!connection.getAuxId().equals(OFAuxId.MAIN))

src/main/java/net/floodlightcontroller/core/internal/ISwitchDriverRegistry.java

@@ -4,7 +4,6 @@ import net.floodlightcontroller.core.IOFConnectionBackend;
 import net.floodlightcontroller.core.IOFSwitchBackend;
 import net.floodlightcontroller.core.IOFSwitchDriver;
 import net.floodlightcontroller.core.SwitchDescription;
-import net.floodlightcontroller.debugcounter.IDebugCounterService;
 
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.types.DatapathId;
@@ -64,5 +63,5 @@ public interface ISwitchDriverRegistry {
      * @throws NullPointerException If the SwitchDescription or any of its
      * members is null.
      */
-    IOFSwitchBackend getOFSwitchInstance(IOFConnectionBackend connection, SwitchDescription description, OFFactory factory, DatapathId datapathId, IDebugCounterService debugCounterService);
+    IOFSwitchBackend getOFSwitchInstance(IOFConnectionBackend connection, SwitchDescription description, OFFactory factory, DatapathId datapathId);
 }

src/main/java/net/floodlightcontroller/core/internal/NaiveSwitchDriverRegistry.java

@@ -13,7 +13,6 @@ import net.floodlightcontroller.core.IOFSwitchBackend;
 import net.floodlightcontroller.core.IOFSwitchDriver;
 import net.floodlightcontroller.core.OFSwitch;
 import net.floodlightcontroller.core.SwitchDescription;
-import net.floodlightcontroller.debugcounter.IDebugCounterService;
 
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.types.DatapathId;
@@ -71,7 +70,7 @@ class NaiveSwitchDriverRegistry implements ISwitchDriverRegistry {
     // but it's probably not worth it.
     public synchronized IOFSwitchBackend
             getOFSwitchInstance(@Nonnull IOFConnectionBackend connection, @Nonnull SwitchDescription description,
-                    @Nonnull OFFactory factory, @Nonnull DatapathId id, @Nonnull IDebugCounterService debugCounterService) {
+                    @Nonnull OFFactory factory, @Nonnull DatapathId id) {
         Preconditions.checkNotNull(connection, "connection");
         Preconditions.checkNotNull(description, "description");
         Preconditions.checkNotNull(factory, "factory");
@@ -96,7 +95,7 @@ class NaiveSwitchDriverRegistry implements ISwitchDriverRegistry {
             }
         }
         // no switch found
-        IOFSwitchBackend sw = new OFSwitch(connection, factory, switchManager, id, debugCounterService);
+        IOFSwitchBackend sw = new OFSwitch(connection, factory, switchManager, id);
         sw.setSwitchProperties(description);
         return sw;
     }

src/main/java/net/floodlightcontroller/core/internal/OFSwitchManager.java

@@ -470,7 +470,7 @@ public class OFSwitchManager implements IOFSwitchManager, INewOFConnectionListen
 	public IOFSwitchBackend getOFSwitchInstance(IOFConnectionBackend connection,
 			SwitchDescription description,
 			OFFactory factory, DatapathId datapathId) {
-		return this.driverRegistry.getOFSwitchInstance(connection, description, factory, datapathId, debugCounterService);
+		return this.driverRegistry.getOFSwitchInstance(connection, description, factory, datapathId);
 	}
 
 	@Override