Merge "Use String(byte[], Charset)"

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / core / TcpConnectionInitializer.java

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
index 5d80d844f617f7e7994c3b687d81bae59d2b259e..2c0f711f4e3972882eb14ee4296771a0227b2ac8 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpConnectionInitializer.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowjava.protocol.impl.core;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.bootstrap.Bootstrap;
@@ -24,17 +24,16 @@ import org.slf4j.LoggerFactory;
  *
  * @author martin.uhlir
  */
-public class TcpConnectionInitializer implements ServerFacade,
-        ConnectionInitializer {
+public class TcpConnectionInitializer implements ServerFacade, ConnectionInitializer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TcpConnectionInitializer.class);
 
-    private static final Logger LOG = LoggerFactory
-            .getLogger(TcpConnectionInitializer.class);
     private final EventLoopGroup workerGroup;
-    private ThreadConfiguration threadConfig;
+    private final boolean isEpollEnabled;
+    private final SettableFuture<Boolean> hasRun = SettableFuture.create();
 
     private TcpChannelInitializer channelInitializer;
     private Bootstrap bootstrap;
-    private final boolean isEpollEnabled;
 
     /**
      * Constructor.
@@ -42,8 +41,7 @@ public class TcpConnectionInitializer implements ServerFacade,
      * @param workerGroup - shared worker group
      */
     public TcpConnectionInitializer(EventLoopGroup workerGroup, boolean isEpollEnabled) {
-        Preconditions.checkNotNull(workerGroup, "WorkerGroup can't be null");
-        this.workerGroup = workerGroup;
+        this.workerGroup = requireNonNull(workerGroup, "WorkerGroup can't be null");
         this.isEpollEnabled = isEpollEnabled;
     }
 
@@ -51,12 +49,11 @@ public class TcpConnectionInitializer implements ServerFacade,
     public void run() {
         bootstrap = new Bootstrap();
         if (isEpollEnabled) {
-            bootstrap.group(workerGroup).channel(EpollSocketChannel.class)
-                    .handler(channelInitializer);
+            bootstrap.group(workerGroup).channel(EpollSocketChannel.class).handler(channelInitializer);
         } else {
-            bootstrap.group(workerGroup).channel(NioSocketChannel.class)
-                    .handler(channelInitializer);
+            bootstrap.group(workerGroup).channel(NioSocketChannel.class).handler(channelInitializer);
         }
+        hasRun.set(true);
     }
 
     @Override
@@ -68,12 +65,12 @@ public class TcpConnectionInitializer implements ServerFacade,
 
     @Override
     public ListenableFuture<Boolean> getIsOnlineFuture() {
-        return null;
+        return hasRun;
     }
 
     @Override
     public void setThreadConfig(ThreadConfiguration threadConfig) {
-        this.threadConfig = threadConfig;
+        // IGNORE
     }
 
     @Override