Remove unused code from He design

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / HandshakeManagerImpl.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
index 785a568b4ac38a65ec1a6cf80fcd556c57db9f10..9392e8ee7eea9b6ab175af0ce2a39ddc5c00e1fb 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
@@ -7,12 +7,16 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.core;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.JdkFutureAdapters;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Future;
-
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
-import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;
+import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.core.ErrorHandler;
 import org.opendaylight.openflowplugin.api.openflow.md.core.HandshakeListener;
 import org.opendaylight.openflowplugin.api.openflow.md.core.HandshakeManager;
@@ -26,16 +30,6 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.JdkFutureAdapters;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-
-/**
- * @author mirehak
- *
- */
 public class HandshakeManagerImpl implements HandshakeManager {
 
     private static final long activeXID = 20L;
@@ -118,7 +112,7 @@ public class HandshakeManagerImpl implements HandshakeManager {
                 handleStepByStepVersionNegotiation(remoteVersion);
             }
         } catch (Exception ex) {
-            errorHandler.handleException(ex, null);
+            errorHandler.handleException(ex);
             LOG.trace("ret - shake fail - closing");
             handshakeListener.onHandshakeFailure();
         }
@@ -144,7 +138,7 @@ public class HandshakeManagerImpl implements HandshakeManager {
                     try {
                         stepByStepVersionSubStep(remoteVersion, lastProposedVersion);
                     } catch (Exception e) {
-                        errorHandler.handleException(e, null);
+                        errorHandler.handleException(e);
                         handshakeListener.onHandshakeFailure();
                     }
                 }
@@ -267,7 +261,7 @@ public class HandshakeManagerImpl implements HandshakeManager {
             for(Elements element : list) {
                 List<Boolean> bitmap = element.getVersionBitmap();
                 // check for version bitmap
-                for(short bitPos : ConnectionConductor.VERSION_ORDER) {
+                for(short bitPos : OFConstants.VERSION_ORDER) {
                     // with all the version it should work.
                     if(bitmap.get(bitPos % Integer.SIZE)) {
                         supportedHighestVersion = bitPos;