Remove trailing whitespace

[openflowjava.git] / openflow-protocol-it / src / test / java / org / opendaylight / openflowjava / protocol / it / integration / IntegrationTest.java

diff --git a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
index 8a94cd0556d8897467570b0c81136aa544cc9bc2..411bc5ea2c5cd23465fd68a2ca42bc65ea38bb6a 100644 (file)
--- a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
+++ b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
@@ -28,9 +28,10 @@ import org.opendaylight.openflowjava.protocol.impl.clients.SimpleClient;
 import org.opendaylight.openflowjava.protocol.impl.clients.SleepEvent;
 import org.opendaylight.openflowjava.protocol.impl.clients.UdpSimpleClient;
 import org.opendaylight.openflowjava.protocol.impl.clients.WaitForMessageEvent;
-import org.opendaylight.openflowjava.protocol.impl.connection.SwitchConnectionProviderImpl;
+import org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderImpl;
 import org.opendaylight.openflowjava.protocol.impl.core.TcpHandler;
 import org.opendaylight.openflowjava.protocol.impl.core.UdpHandler;
+import org.opendaylight.openflowjava.protocol.impl.core.connection.ConnectionConfigurationImpl;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.KeystoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType;
@@ -46,7 +47,7 @@ public class IntegrationTest {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(IntegrationTest.class);
-    
+
     private static int port;
     private TlsConfiguration tlsConfiguration;
     private static final int SWITCH_IDLE_TIMEOUT = 2000;
@@ -62,7 +63,7 @@ public class IntegrationTest {
      */
     public void setUp(TransportProtocol protocol) throws Exception {
         LOGGER.debug("\n starting test -------------------------------");
-        
+
         String currentDir = System.getProperty("user.dir");
         LOGGER.debug("Current dir using System:" +currentDir);
         startupAddress = InetAddress.getLocalHost();
@@ -75,7 +76,7 @@ public class IntegrationTest {
         connConfig = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT);
         connConfig.setTransferProtocol(protocol);
         mockPlugin = new MockPlugin();
-        
+
         switchConnectionProvider = new SwitchConnectionProviderImpl();
         switchConnectionProvider.setSwitchConnectionHandler(mockPlugin);
         switchConnectionProvider.setConfiguration(connConfig);
@@ -100,7 +101,7 @@ public class IntegrationTest {
 
     /**
      * Library integration and communication test with handshake
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testHandshake() throws Exception {
@@ -112,13 +113,13 @@ public class IntegrationTest {
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);
-        
+
         LOGGER.debug("testHandshake() Finished") ;
     }
 
     /**
      * Library integration and secured communication test with handshake
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testTlsHandshake() throws Exception {
@@ -130,13 +131,13 @@ public class IntegrationTest {
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);
-        
+
         LOGGER.debug("testTlsHandshake() Finished") ;
     }
 
     /**
      * Library integration and communication test with handshake + echo exchange
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testHandshakeAndEcho() throws Exception {
@@ -157,7 +158,7 @@ public class IntegrationTest {
 
     /**
      * Library integration and secured communication test with handshake + echo exchange
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testTlsHandshakeAndEcho() throws Exception {
@@ -178,7 +179,7 @@ public class IntegrationTest {
 
     /**
      * Library udp integration and communication test with handshake + echo exchange
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testUdpHandshakeAndEcho() throws Exception {
@@ -207,7 +208,7 @@ public class IntegrationTest {
     }
 
     /**
-     * @param amountOfCLients 
+     * @param amountOfCLients
      * @param protocol true if encrypted connection should be used
      * @return new clients up and running
      * @throws ExecutionException if some client could not start