net package rename

src/main/java/com/kingston/GameServer.java

@@ -16,9 +16,9 @@ import com.kingston.game.database.config.ConfigDatasPool;
 import com.kingston.game.http.HttpServer;
 import com.kingston.monitor.jmx.GameMonitor;
 import com.kingston.monitor.jmx.GameMonitorMXBean;
-import com.kingston.net.MessageFactory;
 import com.kingston.net.SocketServer;
-import com.kingston.net.context.TaskHandlerContext;
+import com.kingston.net.message.MessageFactory;
+import com.kingston.net.task.TaskHandlerContext;
 import com.kingston.orm.OrmProcessor;
 import com.kingston.orm.utils.DbUtils;
 import com.kingston.redis.RedisCluster;

src/main/java/com/kingston/db/BaseEntity.java

@@ -14,7 +14,7 @@ public abstract class BaseEntity extends AbstractCacheable
 	private static final long serialVersionUID = 5416347850924361417L;
 
 	/**
-	 * 每个db实体必须有个long型id
+	 * entity id
 	 * @return
 	 */
 	public abstract long getId() ;
@@ -27,7 +27,6 @@ public abstract class BaseEntity extends AbstractCacheable
 		return result;
 	}
 
-	@SuppressWarnings("rawtypes")
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)

src/main/java/com/kingston/db/DbService.java

@@ -28,13 +28,12 @@ public class DbService {
 	}
 
 	/**
-	 * 启动消费者线程
+	 * start consumer thread
 	 */
 	public void init() {
 		new NameableThreadFactory("db-save-service").newThread(new Worker()).start();
 	}
 
-	@SuppressWarnings("rawtypes")
 	private BlockingQueue<BaseEntity> queue = new BlockingUniqueQueue<>();
 
 	private final AtomicBoolean run = new AtomicBoolean(true);

src/main/java/com/kingston/game/activity/AbstractActivityHandler.java

@@ -3,7 +3,7 @@ package com.kingston.game.activity;
 import org.apache.commons.lang3.StringUtils;
 
 import com.kingston.game.database.user.player.Player;
-import com.kingston.net.Message;
+import com.kingston.net.message.Message;
 
 public abstract class AbstractActivityHandler implements IActivityHandler {
 	

src/main/java/com/kingston/game/activity/IActivityHandler.java

@@ -1,7 +1,7 @@
 package com.kingston.game.activity;
 
 import com.kingston.game.database.user.player.Player;
-import com.kingston.net.Message;
+import com.kingston.net.message.Message;
 
 public interface IActivityHandler {
 	

src/main/java/com/kingston/game/activity/message/ReqOpenActivityPanelMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.activity.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.activity.ActivityDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.ACTIVITY, cmd=ActivityDataPool.REQ_OPEN_PANEL)
 public class ReqOpenActivityPanelMessage extends Message {

src/main/java/com/kingston/game/cronjob/DailyResetJob.java

@@ -13,7 +13,7 @@ import com.kingston.game.database.user.player.Player;
 import com.kingston.game.player.DailyResetTask;
 import com.kingston.game.player.PlayerManager;
 import com.kingston.logs.LoggerSystem;
-import com.kingston.net.context.TaskHandlerContext;
+import com.kingston.net.task.TaskHandlerContext;
 
 /**
  * 每日５点定时job

src/main/java/com/kingston/game/database/user/player/Player.java

@@ -3,9 +3,9 @@ package com.kingston.game.database.user.player;
 import org.apache.mina.core.session.IoSession;
 
 import com.kingston.db.BaseEntity;
-import com.kingston.net.SessionManager;
-import com.kingston.net.SessionProperties;
-import com.kingston.net.context.IDistributable;
+import com.kingston.net.session.SessionManager;
+import com.kingston.net.session.SessionProperties;
+import com.kingston.net.task.IDistributable;
 import com.kingston.orm.annotation.Column;
 import com.kingston.orm.annotation.Entity;
 import com.kingston.orm.annotation.Id;

src/main/java/com/kingston/game/gm/GmManager.java

@@ -13,7 +13,7 @@ import com.kingston.game.database.user.player.Player;
 import com.kingston.game.gm.command.AbstractGmCommand;
 import com.kingston.game.gm.message.ResGmResultMessage;
 import com.kingston.game.player.PlayerManager;
-import com.kingston.net.MessagePusher;
+import com.kingston.net.message.MessagePusher;
 import com.kingston.utils.ClassFilter;
 import com.kingston.utils.ClassScanner;
 

src/main/java/com/kingston/game/gm/message/ReqGmExecMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.gm.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.gm.GmConstant;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.GM, cmd=GmConstant.REQ_GM_EXEC)
 public class ReqGmExecMessage extends Message {

src/main/java/com/kingston/game/gm/message/ResGmResultMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.gm.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.gm.GmConstant;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 /**
  * gm执行结果

src/main/java/com/kingston/game/http/HttpServer.java

@@ -21,9 +21,9 @@ import org.slf4j.LoggerFactory;
 
 import com.google.gson.Gson;
 import com.kingston.ServerConfig;
-import com.kingston.net.SessionManager;
+import com.kingston.net.session.SessionManager;
 
-public class HttpServer {  
+public class HttpServer {
 
 	private Logger logger = LoggerFactory.getLogger(HttpServer.class);
 
@@ -32,13 +32,13 @@ public class HttpServer {
 	//http端口
 	int port = ServerConfig.getInstance().getHttpPort();
 
-	public void start() throws Exception {  
-		acceptor = new NioSocketAcceptor();  
-		acceptor.getFilterChain().addLast("codec", new HttpServerCodec());  
-		acceptor.setHandler(new HttpServerHandle()); 
+	public void start() throws Exception {
+		acceptor = new NioSocketAcceptor();
+		acceptor.getFilterChain().addLast("codec", new HttpServerCodec());
+		acceptor.setHandler(new HttpServerHandle());
 
-		acceptor.bind(new InetSocketAddress(port));  
-	}  
+		acceptor.bind(new InetSocketAddress(port));
+	}
 
 	public void shutdown() {
 		if (acceptor != null) {
@@ -47,20 +47,20 @@ public class HttpServer {
 		}
 		logger.error("---------> http server stop at port:{}", port);
 	}
-}  
+}
 
-class HttpServerHandle extends IoHandlerAdapter {  
+class HttpServerHandle extends IoHandlerAdapter {
 
 	private static Logger logger = LoggerFactory.getLogger(HttpServer.class);
 
-	@Override  
-	public void exceptionCaught(IoSession session, Throwable cause)  
-			throws Exception {  
-		cause.printStackTrace();  
-	}  
+	@Override
+	public void exceptionCaught(IoSession session, Throwable cause)
+			throws Exception {
+		cause.printStackTrace();
+	}
 
-	@Override 
-	public void sessionOpened(IoSession session) throws Exception { 
+	@Override
+	public void sessionOpened(IoSession session) throws Exception {
 		String ipAddr = SessionManager.INSTANCE.getRemoteIp(session);
 		if (!ServerConfig.getInstance().isInWhiteIps(ipAddr)) {
 			logger.error("非法后台登录,remoteIp=[{}]", ipAddr);
@@ -71,35 +71,35 @@ class HttpServerHandle extends IoHandlerAdapter {
 			session.write(out);
 			session.close(false);
 		}
-	} 
+	}
 
-	@Override  
-	public void messageReceived(IoSession session, Object message)  
-			throws Exception {  
-		if (message instanceof HttpRequest) {  
-			// 请求，解码器将请求转换成HttpRequest对象  
-			HttpRequest request = (HttpRequest) message;  
+	@Override
+	public void messageReceived(IoSession session, Object message)
+			throws Exception {
+		if (message instanceof HttpRequest) {
+			// 请求，解码器将请求转换成HttpRequest对象
+			HttpRequest request = (HttpRequest) message;
 			HttpCommandResponse commandResponse = handleCommand(request);
-			// 响应HTML  
-			String responseHtml = new Gson().toJson(commandResponse);  
-			byte[] responseBytes = responseHtml.getBytes("UTF-8");  
-			int contentLength = responseBytes.length;  
+			// 响应HTML
+			String responseHtml = new Gson().toJson(commandResponse);
+			byte[] responseBytes = responseHtml.getBytes("UTF-8");
+			int contentLength = responseBytes.length;
 
-			// 构造HttpResponse对象，HttpResponse只包含响应的status line和header部分  
-			Map<String, String> headers = new HashMap<String, String>();  
-			headers.put("Content-Type", "text/html; charset=utf-8");  
-			headers.put("Content-Length", Integer.toString(contentLength));  
-			HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SUCCESS_OK, headers);  
+			// 构造HttpResponse对象，HttpResponse只包含响应的status line和header部分
+			Map<String, String> headers = new HashMap<String, String>();
+			headers.put("Content-Type", "text/html; charset=utf-8");
+			headers.put("Content-Length", Integer.toString(contentLength));
+			HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SUCCESS_OK, headers);
 
-			// 响应BODY  
-			IoBuffer responseIoBuffer = IoBuffer.allocate(contentLength);  
-			responseIoBuffer.put(responseBytes);  
-			responseIoBuffer.flip();  
+			// 响应BODY
+			IoBuffer responseIoBuffer = IoBuffer.allocate(contentLength);
+			responseIoBuffer.put(responseBytes);
+			responseIoBuffer.flip();
 
-			session.write(response); // 响应的status line和header部分  
-			session.write(responseIoBuffer); // 响应body部分  
-		}  
-	}  
+			session.write(response); // 响应的status line和header部分
+			session.write(responseIoBuffer); // 响应body部分
+		}
+	}
 
 	private HttpCommandResponse handleCommand(HttpRequest request) {
 		HttpCommandParams httpParams = toHttpParams(request);
@@ -119,11 +119,11 @@ class HttpServerHandle extends IoHandlerAdapter {
 	}
 
 	private HttpCommandParams toHttpParams(HttpRequest httpReq) {
-		String cmd = httpReq.getParameter("cmd"); 
+		String cmd = httpReq.getParameter("cmd");
 		if (StringUtils.isEmpty(cmd)) {
 			return null;
 		}
-		String paramJson = httpReq.getParameter("params"); 
+		String paramJson = httpReq.getParameter("params");
 		if (StringUtils.isNotEmpty(paramJson)) {
 			try{
 				@SuppressWarnings("unchecked")
@@ -135,4 +135,4 @@ class HttpServerHandle extends IoHandlerAdapter {
 		return null;
 	}
 
-}  
+}

src/main/java/com/kingston/game/login/LoginManager.java

@@ -2,17 +2,16 @@ package com.kingston.game.login;
 
 import org.apache.mina.core.session.IoSession;
 
-import com.kingston.game.core.SystemParameters;
 import com.kingston.game.database.user.player.Player;
 import com.kingston.game.gm.message.ResGmResultMessage;
 import com.kingston.game.login.message.ResLoginMessage;
 import com.kingston.game.player.PlayerManager;
 import com.kingston.game.scene.message.ResPlayerEnterSceneMessage;
-import com.kingston.net.Message;
-import com.kingston.net.MessagePusher;
-import com.kingston.net.SessionManager;
-import com.kingston.net.SessionProperties;
 import com.kingston.net.combine.CombineMessage;
+import com.kingston.net.message.Message;
+import com.kingston.net.message.MessagePusher;
+import com.kingston.net.session.SessionManager;
+import com.kingston.net.session.SessionProperties;
 
 public class LoginManager {
 

src/main/java/com/kingston/game/login/message/ReqLoginMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.login.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.login.LoginDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 /**
  * 请求－账号登录

src/main/java/com/kingston/game/login/message/ReqSelectPlayerMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.login.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.login.LoginDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.LOGIN, cmd=LoginDataPool.REQ_SELECT_PLAYER)
 public class ReqSelectPlayerMessage extends Message {

src/main/java/com/kingston/game/login/message/ResLoginMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.login.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.login.LoginDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.LOGIN, cmd=LoginDataPool.RES_LOGIN)
 public class ResLoginMessage extends Message {

src/main/java/com/kingston/game/player/DailyResetTask.java

@@ -1,7 +1,7 @@
 package com.kingston.game.player;
 
 import com.kingston.game.database.user.player.Player;
-import com.kingston.net.context.TimerTask;
+import com.kingston.net.task.TimerTask;
 
 public class DailyResetTask extends TimerTask {
 

src/main/java/com/kingston/game/player/PlayerManager.java

@@ -10,8 +10,8 @@ import com.kingston.cache.CacheService;
 import com.kingston.game.core.SystemParameters;
 import com.kingston.game.database.user.player.Player;
 import com.kingston.game.player.message.ResKickPlayerMessage;
-import com.kingston.net.MessagePusher;
-import com.kingston.net.SessionManager;
+import com.kingston.net.message.MessagePusher;
+import com.kingston.net.session.SessionManager;
 import com.kingston.orm.utils.DbUtils;
 
 /**

src/main/java/com/kingston/game/player/message/ResKickPlayerMessage.java

@@ -2,8 +2,8 @@ package com.kingston.game.player.message;
 
 import com.kingston.game.Modules;
 import com.kingston.game.player.PlayerDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.PLAYER, cmd= PlayerDataPool.RES_KICK_PLAYER)
 public class ResKickPlayerMessage extends Message {

src/main/java/com/kingston/game/scene/message/ResPlayerEnterSceneMessage.java

@@ -3,8 +3,8 @@ package com.kingston.game.scene.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.game.Modules;
 import com.kingston.game.scene.SceneDataPool;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 @MessageMeta(module=Modules.SCENE, cmd=SceneDataPool.RES_ENTER_SCENE)
 public class ResPlayerEnterSceneMessage extends Message {

src/main/java/com/kingston/net/ServerSocketIoHandler.java

@@ -4,7 +4,10 @@ import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
 
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.dispatch.MessageDispatcher;
+import com.kingston.net.message.Message;
+import com.kingston.net.message.MessageDispatcher;
+import com.kingston.net.session.SessionManager;
+import com.kingston.net.session.SessionProperties;
 
 public class ServerSocketIoHandler extends IoHandlerAdapter {
 

src/main/java/com/kingston/net/codec/MessageDecoder.java

@@ -12,20 +12,19 @@ import org.slf4j.Logger;
 import com.baidu.bjf.remoting.protobuf.Codec;
 import com.baidu.bjf.remoting.protobuf.ProtobufProxy;
 import com.kingston.logs.LoggerSystem;
-import com.kingston.net.Message;
-import com.kingston.net.MessageFactory;
-import com.kingston.net.SessionManager;
-import com.kingston.net.SessionProperties;
 import com.kingston.net.combine.CombineMessage;
 import com.kingston.net.combine.Packet;
+import com.kingston.net.message.Message;
+import com.kingston.net.message.MessageFactory;
+import com.kingston.net.session.SessionManager;
+import com.kingston.net.session.SessionProperties;
 
 public class MessageDecoder implements ProtocolDecoder{
-	
+
 	private static final Logger logger = LoggerSystem.EXCEPTION.getLogger();
 
 	public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception {
 		_decode(session, in, out);
-
 	}
 
 	private void _decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) {
@@ -59,7 +58,7 @@ public class MessageDecoder implements ProtocolDecoder{
 				byte[] body = new byte[length-4];
 				ioBuffer.get(body);
 				Message msg = readMessage(moduleId, cmd, body);
-				
+
 				if (moduleId > 0) {
 					out.write(msg);
 				} else { //属于组合包
@@ -97,12 +96,10 @@ public class MessageDecoder implements ProtocolDecoder{
 	}
 
 	public void dispose(IoSession arg0) throws Exception {
-		// TODO Auto-generated method stub
 
 	}
 
 	public void finishDecode(IoSession arg0, ProtocolDecoderOutput arg1) throws Exception {
-		// TODO Auto-generated method stub
 
 	}
 

src/main/java/com/kingston/net/codec/MessageEncoder.java

@@ -10,9 +10,9 @@ import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 import com.baidu.bjf.remoting.protobuf.Codec;
 import com.baidu.bjf.remoting.protobuf.ProtobufProxy;
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.Message;
-import com.kingston.net.MessageFactory;
-import com.kingston.net.SessionProperties;
+import com.kingston.net.message.Message;
+import com.kingston.net.message.MessageFactory;
+import com.kingston.net.session.SessionProperties;
 
 public class MessageEncoder implements ProtocolEncoder{
 

src/main/java/com/kingston/net/combine/CombineMessage.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
-import com.kingston.net.Message;
 import com.kingston.net.annotation.MessageMeta;
+import com.kingston.net.message.Message;
 
 /**
  * special message used to combine lots of messages together

src/main/java/com/kingston/net/combine/Packet.java

@@ -7,8 +7,8 @@ import com.baidu.bjf.remoting.protobuf.FieldType;
 import com.baidu.bjf.remoting.protobuf.ProtobufProxy;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.Message;
-import com.kingston.net.MessageFactory;
+import com.kingston.net.message.Message;
+import com.kingston.net.message.MessageFactory;
 
 /**
  * message min unit

src/main/java/com/kingston/net/message/CmdExecutor.java

@@ -1,4 +1,4 @@
-package com.kingston.net.dispatch;
+package com.kingston.net.message;
 
 import java.lang.reflect.Method;
 

src/main/java/com/kingston/net/message/Message.java

@@ -1,4 +1,4 @@
-package com.kingston.net;
+package com.kingston.net.message;
 
 import com.kingston.net.annotation.MessageMeta;
 

src/main/java/com/kingston/net/message/MessageDispatcher.java

@@ -1,4 +1,4 @@
-package com.kingston.net.dispatch;
+package com.kingston.net.message;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -8,14 +8,13 @@ import java.util.Set;
 import org.apache.mina.core.session.IoSession;
 
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.Message;
-import com.kingston.net.SessionManager;
-import com.kingston.net.SessionProperties;
 import com.kingston.net.annotation.Controller;
 import com.kingston.net.annotation.MessageMeta;
 import com.kingston.net.annotation.RequestMapping;
-import com.kingston.net.context.MessageTask;
-import com.kingston.net.context.TaskHandlerContext;
+import com.kingston.net.session.SessionManager;
+import com.kingston.net.session.SessionProperties;
+import com.kingston.net.task.MessageTask;
+import com.kingston.net.task.TaskHandlerContext;
 import com.kingston.utils.ClassScanner;
 
 public class MessageDispatcher {

src/main/java/com/kingston/net/message/MessageFactory.java

@@ -1,4 +1,4 @@
-package com.kingston.net;
+package com.kingston.net.message;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/kingston/net/message/MessagePusher.java

@@ -1,7 +1,10 @@
-package com.kingston.net;
+package com.kingston.net.message;
 
 import org.apache.mina.core.session.IoSession;
 
+import com.kingston.net.session.SessionManager;
+
+
 /**
  * util used to push message to client
  * @author kingston

src/main/java/com/kingston/net/session/SessionManager.java

@@ -1,4 +1,4 @@
-package com.kingston.net;
+package com.kingston.net.session;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/com/kingston/net/session/SessionProperties.java

@@ -1,4 +1,4 @@
-package com.kingston.net;
+package com.kingston.net.session;
 
 import org.apache.mina.core.session.AttributeKey;
 

src/main/java/com/kingston/net/task/AbstractDistributeTask.java

@@ -1,4 +1,4 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 /**
  * provides a skeletal implementation of the <tt>IDistributeTask</tt>

src/main/java/com/kingston/net/task/IDistributable.java

@@ -1,4 +1,4 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 /**
  * @author kingston

src/main/java/com/kingston/net/task/IDistributeTask.java

@@ -1,4 +1,4 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 /**
  * @author kingston

src/main/java/com/kingston/net/task/MessageTask.java

@@ -1,9 +1,9 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 import java.lang.reflect.Method;
 
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.Message;
+import com.kingston.net.message.Message;
 
 /**
  * when server receives a message, wrapped it into a MessageTask,

src/main/java/com/kingston/net/task/TaskHandlerContext.java

@@ -1,4 +1,4 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/kingston/net/task/TimerTask.java

@@ -1,4 +1,4 @@
-package com.kingston.net.context;
+package com.kingston.net.task;
 
 /**
  * timer task, for thread safe

src/main/java/com/kingston/tools/ProtoFileGenerator.java

@@ -7,7 +7,7 @@ import java.text.MessageFormat;
 import java.util.Set;
 
 import com.baidu.bjf.remoting.protobuf.ProtobufIDLGenerator;
-import com.kingston.net.Message;
+import com.kingston.net.message.Message;
 import com.kingston.utils.ClassScanner;
 
 /**

src/test/java/com/kingston/client/ClientStartup.java

@@ -1,7 +1,7 @@
 package com.kingston.client;
 
 import com.kingston.ServerConfig;
-import com.kingston.net.MessageFactory;
+import com.kingston.net.message.MessageFactory;
 import com.kingston.robot.SocketRobot;
 
 /**

src/test/java/com/kingston/robot/SocketRobot.java

@@ -12,8 +12,8 @@ import com.kingston.ServerConfig;
 import com.kingston.game.login.message.ReqLoginMessage;
 import com.kingston.game.login.message.ReqSelectPlayerMessage;
 import com.kingston.logs.LoggerUtils;
-import com.kingston.net.Message;
 import com.kingston.net.codec.MessageCodecFactory;
+import com.kingston.net.message.Message;
 
 public class SocketRobot {