变更Player为Connector

重命名isOnline()方法isConnected()
重命名logout()方法为disconnect()

Author: TinyZzh

core/pom.xml

@@ -5,12 +5,15 @@
     <parent>
         <artifactId>ogcs_okra</artifactId>
         <groupId>ogcs</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ogcs_core</artifactId>
-
+    <artifactId>okra_core</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>../okra-utilities</module>
+    </modules>
 
     <dependencies>
         <dependency>

core/src/main/java/org/ogcs/app/Player.java renamed to core/src/main/java/org/ogcs/app/Connector.java

@@ -1,17 +1,17 @@
 package org.ogcs.app;
 
 /**
- * The Player interface.
+ * The Connector Interface.
  * User should be implement this interface.
  * @author TinyZ
  */
-public interface Player {
+public interface Connector {
 
     /**
      * Is the player online
      * @return Return true if the session is connected and channel is active. otherwise false.
      */
-    boolean isOnline();
+    boolean isConnected();
 
     /**
      * Get the player's session
@@ -28,5 +28,5 @@ public interface Player {
     /**
      * When the player lost connection to server. System will call this function.
      */
-    void logout();
+    void disconnect();
 }

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

@@ -11,7 +11,7 @@
 public class DefaultSession implements Session {
 
     private ChannelHandlerContext ctx;
-    private Player player;
+    private Connector connector;
 
     public DefaultSession(ChannelHandlerContext ctx) {
         this.ctx = ctx;
@@ -27,14 +27,12 @@ public boolean isOnline() {
         return ctx != null && ctx.channel().isActive();
     }
 
-    @Override
-    public Player getPlayer() {
-        return player;
+    public Connector getConnector() {
+        return connector;
     }
 
-    @Override
-    public void setPlayer(Player player) {
-        this.player = player;
+    public void setConnector(Connector connector) {
+        this.connector = connector;
     }
 
     @Override
@@ -70,10 +68,10 @@ public void offline() {
     @Override
     public void release() {
         ctx = null;
-        if (null != player) {
-            player.logout();
-            player.setSession(null);
-            player = null;
+        if (null != connector) {
+            connector.disconnect();
+            connector.setSession(null);
+            connector = null;
         }
     }
 }

core/src/main/java/org/ogcs/app/Session.java

@@ -30,14 +30,14 @@ public interface Session extends Releasable {
      *
      * @return Return player
      */
-    Player getPlayer();
+    Connector getConnector();
 
     /**
      * Set player. After player login, should set the player.
      *
-     * @param player The player
+     * @param connector The player
      */
-    void setPlayer(Player player);
+    void setConnector(Connector connector);
 
     /**
      * Send message back without callback.

okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_CREATE.java

@@ -35,8 +35,8 @@ public void execute(Session session, Request request) throws Exception {
         // TODO: do some logic content
         Role player = new Role(session, memRole);
         // session set player.
-        // The player's function logout()  will be invoked, When the session is inactive.
-        session.setPlayer(player);
+        // The player's function disconnect()  will be invoked, When the session is inactive.
+        session.setConnector(player);
 
         session.writeAndFlush(Gpb.Response.newBuilder()
                 .setId(request.getId())

okra-demo/src/main/java/org/ogcs/okra/example/game/command/impl/GAME_LOGIN.java

@@ -28,8 +28,8 @@ public void execute(Session session, Request request) throws Exception {
 
         Role player = new Role(session, memRole);
         // session set player.
-        // The player's function logout()  will be invoked, When the session is inactive.
-        session.setPlayer(player);
+        // The player's function disconnect()  will be invoked, When the session is inactive.
+        session.setConnector(player);
 
         session.writeAndFlush(Gpb.Response.newBuilder()
                 .setId(request.getId())

okra-demo/src/main/java/org/ogcs/okra/example/game/handler/GpbExecutor.java

@@ -45,7 +45,7 @@ public void onExecute() {
     }
 
     private boolean isLogin(Session session) {
-        return session.getPlayer() != null;
+        return session.getConnector() != null;
     }
 
     @Override

okra-demo/src/main/java/org/ogcs/okra/example/game/server/Role.java

@@ -1,7 +1,7 @@
 package org.ogcs.okra.example.game.server;
 
 import org.ogcs.app.AppContext;
-import org.ogcs.app.Player;
+import org.ogcs.app.Connector;
 import org.ogcs.app.Session;
 import org.ogcs.okra.example.game.persistence.domain.MemRole;
 import org.ogcs.okra.example.game.persistence.mapper.RoleMapper;
@@ -11,7 +11,7 @@
  * @email : [email protected]
  * @date : 2016/3/31
  */
-public class Role implements Player {
+public class Role implements Connector {
 
     private RoleMapper roleMapper = (RoleMapper) AppContext.getBean(SpringContext.APP_CONTEXT);
 
@@ -39,7 +39,7 @@ public void update() {
     }
 
     @Override
-    public boolean isOnline() {
+    public boolean isConnected() {
         return session != null && session.isOnline();
     }
 
@@ -54,7 +54,7 @@ public void setSession(Session session) {
     }
 
     @Override
-    public void logout() {
+    public void disconnect() {
 
         System.out.println("离线:" + session.toString());
     }

okra-examples/pom.xml

@@ -5,16 +5,16 @@
     <parent>
         <artifactId>ogcs_okra</artifactId>
         <groupId>ogcs</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>okra_examples</artifactId>
     <dependencies>
         <dependency>
             <groupId>ogcs</groupId>
-            <artifactId>ogcs_core</artifactId>
-            <version>1.0.0</version>
+            <artifactId>okra_core</artifactId>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>
@@ -27,6 +27,13 @@
             <artifactId>log4j-api</artifactId>
             <version>2.4.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>2.6.1</version>
+            <!--<optional>true</optional>-->
+        </dependency>
     </dependencies>
 
 

okra-spring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ogcs_okra</artifactId>
         <groupId>ogcs</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>