Rename HandShake -> Handshake

Change-Id: I7e474aceb9c0726b252b6520e2fad8dd000b00aa

@@ -33,9 +33,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /**
 /**
  * Corsa switch handshaker.
  * Corsa switch handshaker.
  */
  */
-public class CorsaSwitchHandShaker extends AbstractOpenFlowSwitch {
+public class CorsaSwitchHandshaker extends AbstractOpenFlowSwitch {
 
 
-    private AtomicBoolean handShakeComplete = new AtomicBoolean(false);
+    private AtomicBoolean handshakeComplete = new AtomicBoolean(false);
 
 
     private int barrierXid;
     private int barrierXid;
 
 
@@ -72,7 +72,7 @@ public class CorsaSwitchHandShaker extends AbstractOpenFlowSwitch {
         if (!startDriverHandshakeCalled) {
         if (!startDriverHandshakeCalled) {
             throw new SwitchDriverSubHandshakeAlreadyStarted();
             throw new SwitchDriverSubHandshakeAlreadyStarted();
         }
         }
-        return handShakeComplete.get();
+        return handshakeComplete.get();
     }
     }
 
 
     @Override
     @Override
@@ -80,12 +80,12 @@ public class CorsaSwitchHandShaker extends AbstractOpenFlowSwitch {
         if (!startDriverHandshakeCalled) {
         if (!startDriverHandshakeCalled) {
             throw new SwitchDriverSubHandshakeNotStarted();
             throw new SwitchDriverSubHandshakeNotStarted();
         }
         }
-        if (handShakeComplete.get()) {
+        if (handshakeComplete.get()) {
             throw new SwitchDriverSubHandshakeCompleted(m);
             throw new SwitchDriverSubHandshakeCompleted(m);
         }
         }
         if (m.getType() == OFType.BARRIER_REPLY &&
         if (m.getType() == OFType.BARRIER_REPLY &&
                 m.getXid() == barrierXid) {
                 m.getXid() == barrierXid) {
-            handShakeComplete.set(true);
+            handshakeComplete.set(true);
         }
         }
     }
     }
 
 

@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 /**
 /**
  * Default driver to fallback on if no other driver is available.
  * Default driver to fallback on if no other driver is available.
  */
  */
-public class DefaultSwitchHandShaker extends AbstractOpenFlowSwitch {
+public class DefaultSwitchHandshaker extends AbstractOpenFlowSwitch {
 
 
     private static final int LOWEST_PRIORITY = 0;
     private static final int LOWEST_PRIORITY = 0;
 
 

@@ -21,7 +21,7 @@ import org.projectfloodlight.openflow.protocol.OFVersion;
 /**
 /**
  * Default driver to fallback on if no other driver is available.
  * Default driver to fallback on if no other driver is available.
  */
  */
-public class NiciraSwitchHandShaker extends DefaultSwitchHandShaker {
+public class NiciraSwitchHandshaker extends DefaultSwitchHandshaker {
 
 
     @Override
     @Override
     public Boolean supportNxRole() {
     public Boolean supportNxRole() {

@@ -20,12 +20,12 @@
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/>
                    impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/>
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                   impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
+                   impl="org.onosproject.driver.handshaker.DefaultSwitchHandshaker"/>
     </driver>
     </driver>
     <driver name="ovs" extends="default"
     <driver name="ovs" extends="default"
             manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*">
             manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*">
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                   impl="org.onosproject.driver.handshaker.NiciraSwitchHandShaker"/>
+                   impl="org.onosproject.driver.handshaker.NiciraSwitchHandshaker"/>
     </driver>
     </driver>
     <driver name="ovs-corsa" extends="ovs"
     <driver name="ovs-corsa" extends="ovs"
             manufacturer="Corsa" hwVersion="emulation" swVersion="0.0.0">
             manufacturer="Corsa" hwVersion="emulation" swVersion="0.0.0">
@@ -55,7 +55,7 @@
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.CorsaPipeline"/>
                    impl="org.onosproject.driver.pipeline.CorsaPipeline"/>
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
-                   impl="org.onosproject.driver.handshaker.CorsaSwitchHandShaker"/>
+                   impl="org.onosproject.driver.handshaker.CorsaSwitchHandshaker"/>
     </driver>
     </driver>
     <driver name="ofdpa" extends="default"
     <driver name="ofdpa" extends="default"
             manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">
             manufacturer="Broadcom Corp." hwVersion="OF-DPA 1.0" swVersion="OF-DPA 1.0">