add hand shake

mpusher · Dec 25, 2015 · 64674d5 · 64674d5
1 parent 08dcb3d
commit 64674d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/...nnection/netty/encoder/PacketDecoder.java → ...connection/netty/codec/PacketDecoder.java b/...nnection/netty/encoder/PacketDecoder.java → ...connection/netty/codec/PacketDecoder.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.connection.netty.encoder;
+package com.shinemo.mpush.connection.netty.codec;
 
 import com.shinemo.mpush.api.Constants;
 import com.shinemo.mpush.api.exception.DecodeException;

diff --git a/...nnection/netty/encoder/PacketEncoder.java → ...connection/netty/codec/PacketEncoder.java b/...nnection/netty/encoder/PacketEncoder.java → ...connection/netty/codec/PacketEncoder.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.connection.netty.encoder;
+package com.shinemo.mpush.connection.netty.codec;
 
 import com.shinemo.mpush.api.Constants;
 import com.shinemo.mpush.api.protocol.Packet;

diff --git a/...-connection/src/main/java/com/shinemo/mpush/connection/netty/server/ConnectionServer.java b/...-connection/src/main/java/com/shinemo/mpush/connection/netty/server/ConnectionServer.java
@@ -7,8 +7,8 @@
 
 import com.shinemo.mpush.api.Server;
 import com.shinemo.mpush.connection.netty.NettySharedHolder;
-import com.shinemo.mpush.connection.netty.encoder.PacketDecoder;
-import com.shinemo.mpush.connection.netty.encoder.PacketEncoder;
+import com.shinemo.mpush.connection.netty.codec.PacketDecoder;
+import com.shinemo.mpush.connection.netty.codec.PacketEncoder;
 import com.shinemo.mpush.connection.netty.handler.ConnectionHandler;
 import com.shinemo.mpush.core.MessageReceiver;
 import com.shinemo.mpush.core.thread.ThreadPoolUtil;
@@ -21,10 +21,6 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by ohun on 2015/12/22.

diff --git a/mpush-connection/src/test/java/com/shinemo/mpush/connection/ClientTest.java b/mpush-connection/src/test/java/com/shinemo/mpush/connection/ClientTest.java
@@ -10,8 +10,8 @@
 import com.shinemo.mpush.api.protocol.Command;
 import com.shinemo.mpush.api.protocol.Packet;
 import com.shinemo.mpush.connection.netty.NettySharedHolder;
-import com.shinemo.mpush.connection.netty.encoder.PacketDecoder;
-import com.shinemo.mpush.connection.netty.encoder.PacketEncoder;
+import com.shinemo.mpush.connection.netty.codec.PacketDecoder;
+import com.shinemo.mpush.connection.netty.codec.PacketEncoder;
 import com.shinemo.mpush.core.ConnectionManager;
 
 import io.netty.bootstrap.Bootstrap;