Remove trailing whitespace

[openflowjava.git] / simple-client / src / main / java / org / opendaylight / openflowjava / protocol / impl / clients / SimpleClient.java

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
index 72ef9d435c86561b5ff7cd0df28a461264bbadc9..b097b1d16cf8f422f0b9b6e1a485a5f791a02d60 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
@@ -27,7 +27,7 @@ import com.google.common.util.concurrent.SettableFuture;
  *
  * @author michal.polkorab
  */
-public class SimpleClient extends Thread {
+public class SimpleClient implements OFClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SimpleClient.class);
     private final String host;
@@ -36,9 +36,8 @@ public class SimpleClient extends Thread {
     private EventLoopGroup group;
     private SettableFuture<Boolean> isOnlineFuture;
     private SettableFuture<Boolean> scenarioDone;
-    private SimpleClientInitializer clientInitializer;
     private ScenarioHandler scenarioHandler;
-    
+
     /**
      * Constructor of class
      *
@@ -55,14 +54,14 @@ public class SimpleClient extends Thread {
         isOnlineFuture = SettableFuture.create();
         scenarioDone = SettableFuture.create();
     }
-    
+
     /**
      * Starting class of {@link SimpleClient}
      */
     @Override
     public void run() {
         group = new NioEventLoopGroup();
-        clientInitializer = new SimpleClientInitializer(isOnlineFuture, securedClient);
+        SimpleClientInitializer clientInitializer = new SimpleClientInitializer(isOnlineFuture, securedClient);
         clientInitializer.setScenario(scenarioHandler);
         try {
             Bootstrap b = new Bootstrap();
@@ -74,7 +73,9 @@ public class SimpleClient extends Thread {
 
             synchronized (scenarioHandler) {
                 LOGGER.debug("WAITING FOR SCENARIO");
-                scenarioHandler.wait();
+                while (! scenarioHandler.isScenarioFinished()) {
+                    scenarioHandler.wait();
+                }
             }
         } catch (Exception ex) {
             LOGGER.error(ex.getMessage(), ex);
@@ -98,9 +99,7 @@ public class SimpleClient extends Thread {
         return group.shutdownGracefully();
     }
 
-    /**
-     * @param securedClient
-     */
+    @Override
     public void setSecuredClient(boolean securedClient) {
         this.securedClient = securedClient;
     }
@@ -131,27 +130,20 @@ public class SimpleClient extends Thread {
             sc = new SimpleClient(host, port);
             sc.setSecuredClient(Boolean.parseBoolean(args[2]));
         }
-        sc.start();
-        
+        sc.run();
     }
-    
-    /**
-     * @return the isOnlineFuture
-     */
+
+    @Override
     public SettableFuture<Boolean> getIsOnlineFuture() {
         return isOnlineFuture;
     }
-    
-    /**
-     * @return the scenarioDone
-     */
+
+    @Override
     public SettableFuture<Boolean> getScenarioDone() {
         return scenarioDone;
     }
-    
-    /**
-     * @param scenario list of wanted actions
-     */
+
+    @Override
     public void setScenarioHandler(ScenarioHandler scenario) {
         this.scenarioHandler = scenario;
     }