modify DefaultSession rename to NetSession

Author: zzh

okra-core/src/main/java/org/ogcs/app/DefaultSession.java

@@ -51,7 +51,7 @@ public Channel channel() {
     }
 
     @Override
-    public boolean isOnline() {
+    public boolean isActive() {
         return ctx != null && ctx.channel().isActive();
     }
 
@@ -87,26 +87,34 @@ public void writeAndFlush(Object message, ChannelFutureListener listener) {
     }
 
     @Override
-    public void offline() {
-        if (ctx != null) {
-            ctx.close();
+    public void active() {
+        if (null != connector)
+            connector.sessionActive();
+    }
+
+    @Override
+    public void inactive() {
+        if (null != connector) {
+            connector.sessionInactive();
+            connector = null;
         }
     }
 
     @Override
-    public void close() {
+    public void offline() {
         if (ctx != null) {
             ctx.close();
         }
     }
 
     @Override
-    public void release() {
-        ctx = null;
-        if (null != connector) {
-            connector.disconnect();
-            connector.setSession(null);
-            connector = null;
+    public void close() {
+        Channel channel = ctx.channel();
+        if (channel != null) {
+            inactive();
+            if (channel.isActive())
+                channel.close();
+            ctx = null;
         }
     }
 }

okra-core/src/main/java/org/ogcs/app/NetSession.java

@@ -29,6 +29,7 @@
 public class NetSession implements Session {
 
     private static final Logger LOG = LogManager.getLogger(NetSession.class);
+    /**
      * Netty channel.
      */
     private volatile Channel channel;

okra-demo/src/main/java/okra/demo/placement/component/ItemComponent.java

@@ -50,7 +50,7 @@ public void showAllItem(JsonSession session) {
         ItemModule module = role.module(ItemModule.class);
         if (module != null) {
             List<MemItem> all = module.getAll();
-            session.callback().callbackShowBag(all.toArray(new MemItem[all.size()]));
+            session.proxy().callbackShowBag(all.toArray(new MemItem[all.size()]));
         }
     }
 
@@ -68,9 +68,9 @@ public void useItem(Session session, long itemId, int count) {
         PmRole role = (PmRole) session.getConnector();
         ItemModule module = role.module(Consts.MODULE_ITEM);
         if (module == null || !module.delete(itemId, count)) {
-            ((JsonSession)session).callback().callbackUseItem(-1, itemId, count);
+            ((JsonSession)session).proxy().callbackUseItem(-1, itemId, count);
         }
-        ((JsonSession)session).callback().callbackUseItem(0, itemId, count);
+        ((JsonSession)session).proxy().callbackUseItem(0, itemId, count);
     }
 
     /**

okra-demo/src/main/java/okra/demo/placement/component/RoleComponent.java

@@ -65,7 +65,7 @@ public void login(JsonSession session, String account) {
             MemAccount memAccount = roleMapper.select(account);
             if (memAccount != null) {
                 role = new PmRole(memAccount);
-                session.callback().callbackLogin(memAccount);
+                session.proxy().callbackLogin(memAccount);
             }
         }
         if (role == null) {
@@ -97,6 +97,6 @@ public void createRole(JsonSession session, long uid) {
         if (memChar == null) {
 
         }
-        session.callback().callbackCreateRole(memChar);
+        session.proxy().callbackCreateRole(memChar);
     }
 }

okra-demo/src/main/java/okra/demo/placement/json/JsonSession.java

@@ -19,15 +19,15 @@
 import io.netty.channel.ChannelHandlerContext;
 import okra.demo.placement.ClientCallback;
 import org.ogcs.app.DefaultSession;
-import org.ogcs.app.ProxySession;
+import org.ogcs.app.ServiceProxy;
 
 import java.lang.reflect.Proxy;
 
 /**
  * @author TinyZ
  * @date 2017-01-24.
  */
-public class JsonSession extends DefaultSession implements ProxySession<ClientCallback> {
+public class JsonSession extends DefaultSession implements ServiceProxy<ClientCallback> {
 
     private volatile ClientCallback callback;
 
@@ -36,7 +36,7 @@ public JsonSession(ChannelHandlerContext ctx) {
     }
 
     @Override
-    public ClientCallback callback() {
+    public ClientCallback proxy() {
         if (this.callback == null) {
             this.callback = (ClientCallback) Proxy.newProxyInstance(
                     this.getClass().getClassLoader(),