fixing some spelling and formatting issues including a lot of trailing whitespace

Change-Id: I724dc470753a9c97db36df870645df704530ef22
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductor.java
index b918304e7942b4d26220bc5d7ba3f1f8c30b7984..668bb57515a6008d2f0abc8fe0793a417f606a7b 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductor.java
@@ -23,10 +23,6 @@ import com.google.common.collect.Lists;
 /**
  * @author mirehak
  */
-/**
- * @author mirehak
- *
- */
 public interface ConnectionConductor {
 
     /** distinguished connection states */

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
index ddc38d79084f478e043c97a62003d50264f71fb3..bc05506042e9ca60177a18f1121d0e7b1517fce6 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
@@ -120,10 +120,10 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
                 builder.setVersion(echoRequestMessage.getVersion());
                 builder.setXid(echoRequestMessage.getXid());
                 builder.setData(echoRequestMessage.getData());
-                
+
                 getConnectionAdapter().echoReply(builder.build());
             }
-        }).start();            
+        }).start();
     }
 
     @Override
@@ -149,7 +149,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
      * 2. If HelloMessage contains bitmap and common version found in bitmap
      *    then continue connection processing. if no common version found, just disconnect.
      * 3. If HelloMessage version is not supported, send HelloMessage with lower supported version.
-     *    If Hello message received again with not supported version, just disconnect.
+     * 4. If Hello message received again with not supported version, just disconnect.
      *
      *   TODO: Better to handle handshake into a maintainable innerclass which uses State-Pattern.
      */
@@ -168,7 +168,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
         // TODO:: get from configuration
         return 2000;
     }
-    
+
     /**
      * @return milliseconds
      */
@@ -213,10 +213,10 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
                     EchoInputBuilder builder = new EchoInputBuilder();
                     builder.setVersion(getVersion());
                     builder.setXid(getSessionContext().getNextXid());
-                    
+
                     Future<RpcResult<EchoOutput>> echoReplyFuture = getConnectionAdapter()
                             .echo(builder.build());
-                    
+
                     try {
                         RpcResult<EchoOutput> echoReplyValue = echoReplyFuture.get(getMaxTimeout(),
                                 getMaxTimeoutUnit());
@@ -241,7 +241,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
                     }
                 }
             }
-            
+
         }).start();
     }
 
@@ -283,7 +283,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
     @Override
     public Future<Boolean> disconnect() {
         LOG.info("disconnecting: sessionCtx="+sessionContext+"|auxId="+auxiliaryKey);
-        
+
         Future<Boolean> result = null;
         if (connectionAdapter.isAlive()) {
             result = connectionAdapter.disconnect();
@@ -291,8 +291,8 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
             LOG.debug("connection already disconnected");
             result = Futures.immediateFuture(true);
         }
-        
-        return result; 
+
+        return result;
     }
 
     @Override
@@ -314,7 +314,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
     public SessionContext getSessionContext() {
         return sessionContext;
     }
-    
+
     @Override
     public ConnectionAdapter getConnectionAdapter() {
         return connectionAdapter;

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeper.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeper.java
index f98b2df061eca5c7ee59ddd8c1ca9f762aca5cfb..627dc555fe393765adc24dac27a5d2601bb43829 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeper.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeper.java
@@ -39,9 +39,9 @@ public interface QueueKeeper<IN, OUT> {
 
     /**
      * @param registeredMessageClazz registered message type
-     * @param message 
-     * @param conductor 
+     * @param message
+     * @param conductor
      */
     void push(Class<? extends IN> registeredMessageClazz, IN message, 
             ConnectionConductor conductor);
-}
\ No newline at end of file
+}

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketImpl.java
index 8b80eccbf7896fe7b7feff057289b1c7e10b9cce..75da4c114780ef0c1c2d6b791955386b80a6f3cc 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketImpl.java
@@ -27,7 +27,7 @@ public class TicketImpl<IN, OUT> implements Ticket<IN, OUT> {
     private Class<? extends IN> registeredMessageType;
     
     /**
-     * default ctor 
+     * default ctor
      */
     public TicketImpl() {
         future = SettableFuture.create();
@@ -75,7 +75,7 @@ public class TicketImpl<IN, OUT> implements Ticket<IN, OUT> {
             Class<? extends IN> registeredMessageType) {
         this.registeredMessageType = registeredMessageType;
     }
-    
+
     /**
      * @return the registeredMessageType
      */

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java
index 47affab8d0a29871352f3e00371ae8bd22f88ec1..f3b50b8a0ea0153b7bc1fe0919eee134aa2bb067 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java
@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author mirehak
- * 
+ *
  */
 public abstract class TicketProcessorFactory {
 
@@ -56,7 +56,7 @@ public abstract class TicketProcessorFactory {
             }
 
             /**
-             * @param listenerMapping
+             *
              */
             private List<OUT> translate() {
                 List<OUT> result = new ArrayList<>();

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
index fbbeb3c0848008f95bf9ca960995f5d180078a79..67bdb1f3888fc4b45b127e302fe81cc5dcec42ec 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
@@ -66,7 +66,7 @@ public class ConnectionConductorImplTest {
 
     /** in [ms] */
     private final int maxProcessingTimeout = 500;
-    
+
     protected ConnectionAdapterStackImpl adapter;
     private ConnectionConductorImpl connectionConductor;
     private MDController controller;
@@ -125,13 +125,13 @@ public class ConnectionConductorImplTest {
     @Before
     public void setUp() throws Exception {
         adapter = new ConnectionAdapterStackImpl();
-        
+
         popListener = new PopListenerCountingImpl<>();
         
         queueKeeper = new QueueKeeperLightImpl();
         queueKeeper.init();
         queueKeeper.addPopListener(popListener);
-        
+
         connectionConductor = new ConnectionConductorImpl(adapter);
         connectionConductor.setQueueKeeper(queueKeeper);
         connectionConductor.init();
@@ -279,7 +279,7 @@ public class ConnectionConductorImplTest {
         builder1.setExperimenter(84L).setExpType(4L);
         eventPlan.add(0, EventFactory.createDefaultNotificationEvent(42L,
                 EventFactory.DEFAULT_VERSION, builder1));
-        
+
         executeLater();
 
         Runnable sendExperimenterCmd = new Runnable() {
@@ -333,7 +333,7 @@ public class ConnectionConductorImplTest {
      * Test method for
      * {@link org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl#onFlowRemovedMessage(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowRemovedMessage)}
      * .
-     * @throws InterruptedException 
+     * @throws InterruptedException
      */
     @Test
     public void testOnFlowRemovedMessage() throws InterruptedException {
@@ -350,7 +350,7 @@ public class ConnectionConductorImplTest {
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(43,
           EventFactory.DEFAULT_VERSION, getFeatureResponseMsg()));
         execute(true);
-        
+
         // Now send Flow Removed messages
         FlowRemovedMessageBuilder builder1 = new FlowRemovedMessageBuilder();
         builder1.setVersion((short) 4);
@@ -395,7 +395,7 @@ public class ConnectionConductorImplTest {
      * Test method for
      * {@link org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl#onPacketInMessage(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage)}
      * .
-     * @throws InterruptedException 
+     * @throws InterruptedException
      */
     @Test
     public void testOnPacketInMessage() throws InterruptedException {
@@ -412,7 +412,7 @@ public class ConnectionConductorImplTest {
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(43,
           EventFactory.DEFAULT_VERSION, getFeatureResponseMsg()));
         execute(true);
-        
+
         // Now send PacketIn
         PacketInMessageBuilder builder1 = new PacketInMessageBuilder();
         builder1.setVersion((short) 4);
@@ -434,7 +434,7 @@ public class ConnectionConductorImplTest {
      * Test method for
      * {@link org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl#onPortStatusMessage(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage)}
      * .
-     * @throws InterruptedException 
+     * @throws InterruptedException
      */
     @Test
     public void testOnPortStatusMessage() throws InterruptedException {
@@ -452,7 +452,7 @@ public class ConnectionConductorImplTest {
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(43,
           EventFactory.DEFAULT_VERSION, getFeatureResponseMsg()));
         execute(true);
-        
+
         // Send Port Status messages
         PortStatusMessageBuilder builder1 = new PortStatusMessageBuilder();
         builder1.setVersion((short) 4);
@@ -824,7 +824,7 @@ public class ConnectionConductorImplTest {
             popListener.wait(maxProcessingTimeout);
         }
         Assert.assertEquals(1, experimenterMessageCounter);
-        
+
         builder1.setExperimenter(85L).setExpType(4L);
         connectionConductor.onExperimenterMessage(builder1.build());
         synchronized (popListener) {
@@ -832,7 +832,7 @@ public class ConnectionConductorImplTest {
         }
         Assert.assertEquals(2, experimenterMessageCounter);
     }
-    
+
     /**
      * Test method for
      * {@link org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductorImpl#onExperimenterMessage(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage)}
@@ -858,7 +858,7 @@ public class ConnectionConductorImplTest {
     }
 
     /**
-     * @return listener mapping for :
+     * @return listener mapping for:
      * <ul>
      * <li>experimenter</li>
      * <li>error</li>