Clean up TcpClientChannelInitializer

There is no need to reference GenericFutureListener/DefaultPromise.
Adjust code accordingly.

Change-Id: I0518ab00611c45ddcf2c19b802ecb810fc94ca94
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java
index 85c3e0fa6460bc8d4c6973acb2b9b5a9825f7944..1e9d1efdd556b2e21b164b2ac556e7b3f1d20aea 100644 (file)
--- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java
+++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java
@@ -11,9 +11,8 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.ChannelPromise;
-import io.netty.channel.DefaultChannelPromise;
 import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.FutureListener;
 import io.netty.util.concurrent.Promise;
 import java.net.SocketAddress;
 
@@ -32,14 +31,14 @@ final class TcpClientChannelInitializer extends AbstractClientChannelInitializer
         //success only after successful negotiation.
         ch.pipeline().addFirst(new ChannelOutboundHandlerAdapter() {
             ChannelPromise connectPromise;
-            GenericFutureListener<Future<NetconfClientSession>> negotiationFutureListener;
+            FutureListener<NetconfClientSession> negotiationFutureListener;
 
             @Override
             public void connect(final ChannelHandlerContext ctx, final SocketAddress remoteAddress,
                                 final SocketAddress localAddress,
                                 final ChannelPromise channelPromise) {
                 connectPromise = channelPromise;
-                ChannelPromise tcpConnectFuture = new DefaultChannelPromise(ch);
+                ChannelPromise tcpConnectFuture = ch.newPromise();
 
                 negotiationFutureListener = future -> {
                     if (future.isSuccess()) {