Switch to io.netty-3.10.6

This is the last release of netty-3, switch to it to get bugfixes
and platform alignment.

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

diff --git a/nemo-renderers/cli-renderer/pom.xml b/nemo-renderers/cli-renderer/pom.xml
index c3e0ab969314646705404ad8e016b915a73898bf..5431877bf53763faa18ebabdeb011ea295132aa0 100644 (file)
--- a/nemo-renderers/cli-renderer/pom.xml
+++ b/nemo-renderers/cli-renderer/pom.xml
@@ -41,9 +41,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.netty</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.2.6.Final</version>
+      <version>3.10.6.Final</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
index 1929580e3b36f9bfc45c7d4033afb9eeb82f4f4f..6e4420389ae4ce51fdaf35e1b3bca7b18cf4cbe4 100644 (file)
--- a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
+++ b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
@@ -8,17 +8,23 @@
 \r
 package org.opendaylight.nemo.renderer.cli;\r
 \r
+import java.net.InetSocketAddress;\r
+import java.util.concurrent.Executors;\r
 import org.jboss.netty.bootstrap.ClientBootstrap;\r
-import org.jboss.netty.channel.*;\r
+import org.jboss.netty.channel.ChannelFactory;\r
+import org.jboss.netty.channel.ChannelHandlerContext;\r
+import org.jboss.netty.channel.ChannelPipeline;\r
+import org.jboss.netty.channel.ChannelStateEvent;\r
+import org.jboss.netty.channel.Channels;\r
+import org.jboss.netty.channel.ExceptionEvent;\r
+import org.jboss.netty.channel.MessageEvent;\r
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;\r
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;\r
 import org.jboss.netty.handler.codec.string.StringDecoder;\r
 import org.jboss.netty.handler.codec.string.StringEncoder;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
-import java.net.InetSocketAddress;\r
-import java.util.concurrent.Executors;\r
-\r
 /**\r
  *\r
  * @author Shixing Liu\r
@@ -43,6 +49,7 @@ public class TelnetUtils implements AutoCloseable {
      *\r
      * @throws Exception\r
      */\r
+    @Override\r
     public void close() throws Exception {\r
         // TODO\r
 \r
@@ -138,14 +145,12 @@ public class TelnetUtils implements AutoCloseable {
                 Executors.newCachedThreadPool(),\r
                 Executors.newCachedThreadPool());\r
         ClientBootstrap bootstrap = new ClientBootstrap(factory);\r
-        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {\r
-            public ChannelPipeline getPipeline() {\r
-                ChannelPipeline p = Channels.pipeline();\r
-                p.addLast("encode", new StringEncoder());\r
-                p.addLast("decode", new StringDecoder());\r
-                p.addLast("handler", new ClientHandlerForClearOldConfig());\r
-                return p;\r
-            }\r
+        bootstrap.setPipelineFactory(() -> {\r
+            ChannelPipeline p = Channels.pipeline();\r
+            p.addLast("encode", new StringEncoder());\r
+            p.addLast("decode", new StringDecoder());\r
+            p.addLast("handler", new ClientHandlerForClearOldConfig());\r
+            return p;\r
         });\r
         bootstrap.setOption("tcpNoDelay" , true);\r
         bootstrap.setOption("keepAlive", true);\r
@@ -174,14 +179,12 @@ public class TelnetUtils implements AutoCloseable {
                 Executors.newCachedThreadPool(),\r
                 Executors.newCachedThreadPool());\r
         ClientBootstrap bootstrap = new ClientBootstrap(factory);\r
-        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {\r
-            public ChannelPipeline getPipeline() {\r
-                ChannelPipeline p = Channels.pipeline();\r
-                p.addLast("encode", new StringEncoder());\r
-                p.addLast("decode", new StringDecoder());\r
-                p.addLast("handler", new ClientHandlerForClearOldConfig());\r
-                return p;\r
-            }\r
+        bootstrap.setPipelineFactory(() -> {\r
+            ChannelPipeline p = Channels.pipeline();\r
+            p.addLast("encode", new StringEncoder());\r
+            p.addLast("decode", new StringDecoder());\r
+            p.addLast("handler", new ClientHandlerForClearOldConfig());\r
+            return p;\r
         });\r
         bootstrap.setOption("tcpNoDelay" , true);\r
         bootstrap.setOption("keepAlive", true);\r
@@ -210,7 +213,7 @@ public class TelnetUtils implements AutoCloseable {
 \r
         @Override\r
         public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)throws Exception {\r
-            String str = (String)(e.getMessage());\r
+            String str = (String)e.getMessage();\r
             System.out.println(e.getMessage());\r
             if(str.contains("Username")){\r
                 e.getChannel().write("lfk\n");\r
@@ -235,9 +238,9 @@ public class TelnetUtils implements AutoCloseable {
                 //System.out.println("------------b3----------");\r
                 e.getChannel().write("undo ip vpn-instance vpn1\n");\r
             }\r
-            else if((isClearOver() == Boolean.FALSE)\r
-                    &&(!str.contains("Error: The VPN instance does not exist."))\r
-                    &&(!str.contains("Error: The VPN instance is in stale state."))){\r
+            else if(isClearOver() == Boolean.FALSE\r
+                    &&!str.contains("Error: The VPN instance does not exist.")\r
+                    &&!str.contains("Error: The VPN instance is in stale state.")){\r
                 //System.out.println("------------b4----------");\r
                 e.getChannel().write("undo ip vpn-instance vpn1\n");\r
             }\r
@@ -261,14 +264,12 @@ public class TelnetUtils implements AutoCloseable {
                 Executors.newCachedThreadPool(),\r
                 Executors.newCachedThreadPool());\r
         ClientBootstrap bootstrap = new ClientBootstrap(factory);\r
-        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {\r
-            public ChannelPipeline getPipeline() {\r
-                ChannelPipeline p = Channels.pipeline();\r
-                p.addLast("encode",new StringEncoder());\r
-                p.addLast("decode",new StringDecoder());\r
-                p.addLast("handler",new ClientHandlerForSendNewConfig());\r
-                return p;\r
-            }\r
+        bootstrap.setPipelineFactory(() -> {\r
+            ChannelPipeline p = Channels.pipeline();\r
+            p.addLast("encode",new StringEncoder());\r
+            p.addLast("decode",new StringDecoder());\r
+            p.addLast("handler",new ClientHandlerForSendNewConfig());\r
+            return p;\r
         });\r
         bootstrap.setOption("connectTimeoutMillis", 6000);\r
         bootstrap.setOption("tcpNoDelay" , true);\r
@@ -314,7 +315,7 @@ public class TelnetUtils implements AutoCloseable {
 \r
         @Override\r
         public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {\r
-            String str = (String)(e.getMessage());\r
+            String str = (String)e.getMessage();\r
             System.out.println(e.getMessage());\r
             if(str.contains("Username")){\r
                 e.getChannel().write("lfk\n");\r

diff --git a/nemo-renderers/cli-renderer/src/test/java/org/opendaylight/nemo/renderer/cli/TelnetUtilsTest.java b/nemo-renderers/cli-renderer/src/test/java/org/opendaylight/nemo/renderer/cli/TelnetUtilsTest.java
index c6a6936459b418b6e6fcd8137a9654aad959eeb2..c6366df72a7d1ce80281fbd854f32cec00f16822 100644 (file)
--- a/nemo-renderers/cli-renderer/src/test/java/org/opendaylight/nemo/renderer/cli/TelnetUtilsTest.java
+++ b/nemo-renderers/cli-renderer/src/test/java/org/opendaylight/nemo/renderer/cli/TelnetUtilsTest.java
@@ -8,36 +8,21 @@
 
 package org.opendaylight.nemo.renderer.cli;
 
+import static org.mockito.Mockito.mock;
+
+import java.lang.reflect.Method;
 import junit.framework.TestCase;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.channel.*;
-
-import java.lang.reflect.Method;
-import java.net.InetSocketAddress;
-import java.util.concurrent.Executors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sun.java2d.pipe.AAShapePipe;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
 /**
  * Created by zhangmeng on 2015/12/8.
  */
 public class TelnetUtilsTest extends TestCase {
     private TelnetUtils telnetUtils;
+    @Override
     @Before
     public void setUp() throws Exception {
         telnetUtils = new TelnetUtils();