Netty 降级到4.x

mpusher · Aug 22, 2016 · bb6c1fe · bb6c1fe
1 parent 64e9119
commit bb6c1fe
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/mpush-client/src/main/java/com/mpush/client/connect/ConnClientChannelHandler.java b/mpush-client/src/main/java/com/mpush/client/connect/ConnClientChannelHandler.java
@@ -52,7 +52,7 @@
  * @author ohun@live.cn
  */
 @ChannelHandler.Sharable
-public final class ConnClientChannelHandler extends ChannelHandlerAdapter {
+public final class ConnClientChannelHandler extends ChannelInboundHandlerAdapter {
     private static final Logger LOGGER = LoggerFactory.getLogger(ConnClientChannelHandler.class);
     private static final Timer HASHED_WHEEL_TIMER = new HashedWheelTimer(new PoolThreadFactory(ThreadNames.T_NETTY_TIMER));
 

diff --git a/mpush-client/src/main/java/com/mpush/client/gateway/GatewayClientChannelHandler.java b/mpush-client/src/main/java/com/mpush/client/gateway/GatewayClientChannelHandler.java
@@ -31,6 +31,7 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,7 @@
  * @author ohun@live.cn
  */
 @ChannelHandler.Sharable
-public final class GatewayClientChannelHandler extends ChannelHandlerAdapter {
+public final class GatewayClientChannelHandler extends ChannelInboundHandlerAdapter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GatewayClientChannelHandler.class);
 

diff --git a/mpush-core/src/main/java/com/mpush/core/handler/AdminHandler.java b/mpush-core/src/main/java/com/mpush/core/handler/AdminHandler.java
@@ -62,7 +62,7 @@ public AdminHandler(AdminServer adminServer) {
     }
 
     @Override
-    protected void messageReceived(ChannelHandlerContext ctx, String request) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, String request) throws Exception {
         Command command = Command.help;
         String arg = null;
         String[] args = null;

diff --git a/mpush-core/src/main/java/com/mpush/core/handler/HttpProxyHandler.java b/mpush-core/src/main/java/com/mpush/core/handler/HttpProxyHandler.java
@@ -119,7 +119,7 @@ public void onResponse(HttpResponse httpResponse) {
                     .from(request)
                     .setStatusCode(httpResponse.status().code())
                     .setReasonPhrase(httpResponse.status().reasonPhrase().toString());
-            for (Map.Entry<CharSequence, CharSequence> entry : httpResponse.headers()) {
+            for (Map.Entry<String, String> entry : httpResponse.headers()) {
                 response.addHeader(entry.getKey().toString(), entry.getValue().toString());
             }
 

diff --git a/mpush-core/src/main/java/com/mpush/core/server/ServerChannelHandler.java b/mpush-core/src/main/java/com/mpush/core/server/ServerChannelHandler.java
@@ -30,8 +30,8 @@
 import com.mpush.tools.event.EventBus;
 import com.mpush.tools.log.Logs;
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +41,7 @@
  * @author ohun@live.cn
  */
 @ChannelHandler.Sharable
-public final class ServerChannelHandler extends ChannelHandlerAdapter {
+public final class ServerChannelHandler extends ChannelInboundHandlerAdapter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ServerChannelHandler.class);
 

diff --git a/mpush-netty/src/main/java/com/mpush/netty/http/HttpClientHandler.java b/mpush-netty/src/main/java/com/mpush/netty/http/HttpClientHandler.java
@@ -1,8 +1,8 @@
 package com.mpush.netty.http;
 
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.http.*;
 import io.netty.util.IllegalReferenceCountException;
 import io.netty.util.ReferenceCountUtil;
@@ -13,7 +13,7 @@
 import java.net.URLDecoder;
 
 @ChannelHandler.Sharable
-public class HttpClientHandler extends ChannelHandlerAdapter {
+public class HttpClientHandler extends ChannelInboundHandlerAdapter {
     private static final Logger LOGGER = LoggerFactory.getLogger(NettyHttpClient.class);
     private final NettyHttpClient client;
 

diff --git a/mpush-netty/src/main/java/com/mpush/netty/http/RequestContext.java b/mpush-netty/src/main/java/com/mpush/netty/http/RequestContext.java
@@ -48,8 +48,9 @@ public RequestContext(FullHttpRequest request, HttpCallback callback) {
     }
 
     private int parseTimeout() {
-        String timeout = request.headers().getAndRemoveAndConvert(Constants.HTTP_HEAD_READ_TIMEOUT);
+        String timeout = request.headers().get(Constants.HTTP_HEAD_READ_TIMEOUT);
         if (timeout != null) {
+            request.headers().remove(Constants.HTTP_HEAD_READ_TIMEOUT);
             Integer integer = Ints.tryParse(timeout);
             if (integer != null && integer > 0) {
                 return integer;

diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
         <mpush-boot-version>${mpush.version}</mpush-boot-version>
         <mpush-test-version>${mpush.version}</mpush-test-version>
         <mpush-zk-version>${mpush.version}</mpush-zk-version>
-        <netty.version>5.0.0.Alpha2</netty.version>
+        <netty.version>4.1.4.Final</netty.version>
         <os.detected.classifier>linux-x86_64</os.detected.classifier>
     </properties>