rename abstract xxx on proxy model

sharding-proxy/src/main/java/io/shardingjdbc/proxy/codec/MySQLPacketCodec.java

@@ -21,9 +21,9 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageCodec;
-import io.shardingjdbc.proxy.packet.AbstractMySQLPacket;
+import io.shardingjdbc.proxy.packet.MySQLPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
@@ -34,32 +34,32 @@ import java.util.List;
  * @author zhangliang 
  */
 @Slf4j
-public final class MySQLPacketCodec extends ByteToMessageCodec<AbstractMySQLSentPacket> {
+public final class MySQLPacketCodec extends ByteToMessageCodec<MySQLSentPacket> {
     
     @Override
     protected void decode(final ChannelHandlerContext context, final ByteBuf in, final List<Object> out) throws Exception {
         int readableBytes = in.readableBytes();
-        if (readableBytes < AbstractMySQLPacket.PAYLOAD_LENGTH + AbstractMySQLPacket.SEQUENCE_LENGTH) {
+        if (readableBytes < MySQLPacket.PAYLOAD_LENGTH + MySQLPacket.SEQUENCE_LENGTH) {
             return;
         }
         if (log.isDebugEnabled()) {
             log.debug("Read from client: \n {}", ByteBufUtil.prettyHexDump(in));
         }
         int payloadLength = in.markReaderIndex().readMediumLE();
-        int realPacketLength = payloadLength + AbstractMySQLPacket.PAYLOAD_LENGTH + AbstractMySQLPacket.SEQUENCE_LENGTH;
+        int realPacketLength = payloadLength + MySQLPacket.PAYLOAD_LENGTH + MySQLPacket.SEQUENCE_LENGTH;
         if (readableBytes < realPacketLength) {
             in.resetReaderIndex();
             return;
         }
         if (readableBytes > realPacketLength) {
-            out.add(in.readRetainedSlice(payloadLength + AbstractMySQLPacket.SEQUENCE_LENGTH));
+            out.add(in.readRetainedSlice(payloadLength + MySQLPacket.SEQUENCE_LENGTH));
             return;
         }
         out.add(in);
     }
     
     @Override
-    protected void encode(final ChannelHandlerContext context, final AbstractMySQLSentPacket message, final ByteBuf out) throws Exception {
+    protected void encode(final ChannelHandlerContext context, final MySQLSentPacket message, final ByteBuf out) throws Exception {
         MySQLPacketPayload mysqlPacketPayload = new MySQLPacketPayload(context.alloc().buffer());
         message.write(mysqlPacketPayload);
         out.writeMediumLE(mysqlPacketPayload.getByteBuf().readableBytes());

sharding-proxy/src/main/java/io/shardingjdbc/proxy/constant/ColumnType.java

@@ -31,6 +31,7 @@ import java.sql.Types;
 @RequiredArgsConstructor
 @Getter
 public enum ColumnType {
+    
     MYSQL_TYPE_DECIMAL(0x00), 
     MYSQL_TYPE_TINY(0x01), 
     MYSQL_TYPE_SHORT(0x02), 

sharding-proxy/src/main/java/io/shardingjdbc/proxy/handler/ServerHandler.java

@@ -21,9 +21,9 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.shardingjdbc.proxy.constant.StatusFlag;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.command.AbstractCommandPacket;
+import io.shardingjdbc.proxy.packet.command.CommandPacket;
 import io.shardingjdbc.proxy.packet.command.CommandPacketFactory;
 import io.shardingjdbc.proxy.packet.handshake.AuthPluginData;
 import io.shardingjdbc.proxy.packet.handshake.ConnectionIdGenerator;
@@ -43,13 +43,13 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
     private boolean authorized;
     
     @Override
-    public void channelActive(final ChannelHandlerContext context) throws Exception {
+    public void channelActive(final ChannelHandlerContext context) {
         authPluginData = new AuthPluginData();
         context.writeAndFlush(new HandshakePacket(ConnectionIdGenerator.getInstance().nextId(), authPluginData));
     }
     
     @Override
-    public void channelRead(final ChannelHandlerContext context, final Object message) throws Exception {
+    public void channelRead(final ChannelHandlerContext context, final Object message) {
         MySQLPacketPayload mysqlPacketPayload = new MySQLPacketPayload((ByteBuf) message);
         if (!authorized) {
             auth(context, mysqlPacketPayload);
@@ -67,10 +67,10 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
     
     private void executeCommand(final ChannelHandlerContext context, final MySQLPacketPayload mysqlPacketPayload) {
         int sequenceId = mysqlPacketPayload.readInt1();
-        AbstractCommandPacket commandPacket = CommandPacketFactory.getCommandPacket(mysqlPacketPayload.readInt1());
+        CommandPacket commandPacket = CommandPacketFactory.getCommandPacket(mysqlPacketPayload.readInt1());
         commandPacket.setSequenceId(sequenceId);
         commandPacket.read(mysqlPacketPayload);
-        for (AbstractMySQLSentPacket each : commandPacket.execute()) {
+        for (MySQLSentPacket each : commandPacket.execute()) {
             context.write(each);
         }
         context.flush();

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/AbstractMySQLPacket.java → sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/MySQLPacket.java

@@ -27,7 +27,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public abstract class AbstractMySQLPacket {
+public abstract class MySQLPacket {
     
     public static final int PAYLOAD_LENGTH = 3;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/AbstractMySQLReceivedPacket.java → sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/MySQLReceivedPacket.java

@@ -22,7 +22,7 @@ package io.shardingjdbc.proxy.packet;
  * 
  * @author zhangliang 
  */
-public abstract class AbstractMySQLReceivedPacket extends AbstractMySQLPacket {
+public abstract class MySQLReceivedPacket extends MySQLPacket {
     
     /**
      * Read packet from byte buffer.
@@ -31,5 +31,5 @@ public abstract class AbstractMySQLReceivedPacket extends AbstractMySQLPacket {
      * 
      * @return instance of received packet
      */
-    public abstract AbstractMySQLReceivedPacket read(MySQLPacketPayload mysqlPacketPayload);
+    public abstract MySQLReceivedPacket read(MySQLPacketPayload mysqlPacketPayload);
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/AbstractMySQLSentPacket.java → sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/MySQLSentPacket.java

@@ -22,7 +22,7 @@ package io.shardingjdbc.proxy.packet;
  * 
  * @author zhangliang 
  */
-public abstract class AbstractMySQLSentPacket extends AbstractMySQLPacket {
+public abstract class MySQLSentPacket extends MySQLPacket {
     
     /**
      * Write packet to byte buffer.

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/ColumnDefinition41Packet.java

@@ -20,7 +20,7 @@ package io.shardingjdbc.proxy.packet.command;
 import io.shardingjdbc.proxy.constant.ColumnType;
 import io.shardingjdbc.proxy.constant.ServerInfo;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 
 /**
  * Column definition above MySQL 4.1 packet protocol.
@@ -28,7 +28,7 @@ import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
  *
  * @author zhangliang
  */
-public final class ColumnDefinition41Packet extends AbstractMySQLSentPacket {
+public final class ColumnDefinition41Packet extends MySQLSentPacket {
     
     private final String catalog = "def";
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/ComFieldListPacket.java

@@ -21,7 +21,7 @@ import io.shardingjdbc.core.constant.ShardingConstant;
 import io.shardingjdbc.proxy.DataSourceManager;
 import io.shardingjdbc.proxy.constant.ColumnType;
 import io.shardingjdbc.proxy.constant.StatusFlag;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
 import io.shardingjdbc.proxy.packet.ok.EofPacket;
 import io.shardingjdbc.proxy.packet.ok.ErrPacket;
@@ -41,7 +41,7 @@ import java.util.List;
  * @author zhangliang
  */
 @Slf4j
-public final class ComFieldListPacket extends AbstractCommandPacket {
+public final class ComFieldListPacket extends CommandPacket {
     
     private String table;
     
@@ -57,9 +57,9 @@ public final class ComFieldListPacket extends AbstractCommandPacket {
     }
     
     @Override
-    public List<AbstractMySQLSentPacket> execute() {
+    public List<MySQLSentPacket> execute() {
         String sql = String.format("SHOW COLUMNS FROM %s FROM %s", table, ShardingConstant.LOGIC_SCHEMA_NAME);
-        List<AbstractMySQLSentPacket> result = new LinkedList<>();
+        List<MySQLSentPacket> result = new LinkedList<>();
         int currentSequenceId = getSequenceId();
         try (
                 Connection conn = DataSourceManager.getInstance().getDataSource().getConnection();

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/ComInitDbPacket.java

@@ -19,7 +19,7 @@ package io.shardingjdbc.proxy.packet.command;
 
 import io.shardingjdbc.core.constant.ShardingConstant;
 import io.shardingjdbc.proxy.constant.StatusFlag;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
 import io.shardingjdbc.proxy.packet.ok.ErrPacket;
 import io.shardingjdbc.proxy.packet.ok.OKPacket;
@@ -35,7 +35,7 @@ import java.util.List;
  * @author zhangliang
  */
 @Slf4j
-public final class ComInitDbPacket extends AbstractCommandPacket {
+public final class ComInitDbPacket extends CommandPacket {
     
     private String schemaName;
     
@@ -47,10 +47,10 @@ public final class ComInitDbPacket extends AbstractCommandPacket {
     }
     
     @Override
-    public List<AbstractMySQLSentPacket> execute() {
+    public List<MySQLSentPacket> execute() {
         if (ShardingConstant.LOGIC_SCHEMA_NAME.equalsIgnoreCase(schemaName)) {
-            return Collections.<AbstractMySQLSentPacket>singletonList(new OKPacket(getSequenceId() + 1, 0, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
+            return Collections.<MySQLSentPacket>singletonList(new OKPacket(getSequenceId() + 1, 0, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
         }
-        return Collections.<AbstractMySQLSentPacket>singletonList(new ErrPacket(getSequenceId() + 1, 1049, "", "", String.format("Unknown database '%s'", schemaName)));
+        return Collections.<MySQLSentPacket>singletonList(new ErrPacket(getSequenceId() + 1, 1049, "", "", String.format("Unknown database '%s'", schemaName)));
     }
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/ComQueryPacket.java

@@ -22,7 +22,7 @@ import io.shardingjdbc.core.parsing.parser.sql.SQLStatement;
 import io.shardingjdbc.proxy.DataSourceManager;
 import io.shardingjdbc.proxy.constant.ColumnType;
 import io.shardingjdbc.proxy.constant.StatusFlag;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
 import io.shardingjdbc.proxy.packet.ok.EofPacket;
 import io.shardingjdbc.proxy.packet.ok.ErrPacket;
@@ -44,7 +44,7 @@ import java.util.List;
  * @author zhangliang
  */
 @Slf4j
-public final class ComQueryPacket extends AbstractCommandPacket {
+public final class ComQueryPacket extends CommandPacket {
     
     private String sql;
     
@@ -56,8 +56,8 @@ public final class ComQueryPacket extends AbstractCommandPacket {
     }
     
     @Override
-    public List<AbstractMySQLSentPacket> execute() {
-        List<AbstractMySQLSentPacket> result = new LinkedList<>();
+    public List<MySQLSentPacket> execute() {
+        List<MySQLSentPacket> result = new LinkedList<>();
         int currentSequenceId = getSequenceId();
         try (
                 Connection conn = DataSourceManager.getInstance().getDataSource().getConnection();

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/ComQuitPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.command;
 
 import io.shardingjdbc.proxy.constant.StatusFlag;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
 import io.shardingjdbc.proxy.packet.ok.OKPacket;
 
@@ -31,7 +31,7 @@ import java.util.List;
  *
  * @author zhangliang
  */
-public final class ComQuitPacket extends AbstractCommandPacket {
+public final class ComQuitPacket extends CommandPacket {
     
     @Override
     public ComQuitPacket read(final MySQLPacketPayload mysqlPacketPayload) {
@@ -39,7 +39,7 @@ public final class ComQuitPacket extends AbstractCommandPacket {
     }
     
     @Override
-    public List<AbstractMySQLSentPacket> execute() {
-        return Collections.<AbstractMySQLSentPacket>singletonList(new OKPacket(getSequenceId() + 1, 0, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
+    public List<MySQLSentPacket> execute() {
+        return Collections.<MySQLSentPacket>singletonList(new OKPacket(getSequenceId() + 1, 0, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
     }
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/AbstractCommandPacket.java → sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/CommandPacket.java

@@ -17,8 +17,8 @@
 
 package io.shardingjdbc.proxy.packet.command;
 
-import io.shardingjdbc.proxy.packet.AbstractMySQLReceivedPacket;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLReceivedPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 
 import java.util.List;
 
@@ -27,12 +27,12 @@ import java.util.List;
  *
  * @author zhangliang
  */
-public abstract class AbstractCommandPacket extends AbstractMySQLReceivedPacket {
+public abstract class CommandPacket extends MySQLReceivedPacket {
     
     /**
      * Execute command.
      * 
      * @return result packets to be sent
      */
-    public abstract List<AbstractMySQLSentPacket> execute();
+    public abstract List<MySQLSentPacket> execute();
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/CommandPacketFactory.java

@@ -30,7 +30,7 @@ public final class CommandPacketFactory {
      * @param commandPacketTypeValue command packet type value
      * @return Command packet
      */
-    public static AbstractCommandPacket getCommandPacket(final int commandPacketTypeValue) {
+    public static CommandPacket getCommandPacket(final int commandPacketTypeValue) {
         CommandPacketType type = CommandPacketType.valueOf(commandPacketTypeValue);
         switch (type) {
             case COM_QUIT:

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/FieldCountPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.command;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 
 /**
  * COM_QUERY response field count packet.
@@ -26,7 +26,7 @@ import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
  *
  * @author zhangliang
  */
-public final class FieldCountPacket extends AbstractMySQLSentPacket {
+public final class FieldCountPacket extends MySQLSentPacket {
     
     private final long columnCount;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/TextResultSetRowPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.command;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author zhangliang
  */
-public final class TextResultSetRowPacket extends AbstractMySQLSentPacket {
+public final class TextResultSetRowPacket extends MySQLSentPacket {
     
     private static final int NULL = 0xfb;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/command/UnsupportedCommandPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.command;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import io.shardingjdbc.proxy.packet.ok.ErrPacket;
 import lombok.RequiredArgsConstructor;
 
@@ -31,7 +31,7 @@ import java.util.List;
  * @author zhangliang
  */
 @RequiredArgsConstructor
-public final class UnsupportedCommandPacket extends AbstractCommandPacket {
+public final class UnsupportedCommandPacket extends CommandPacket {
     
     private static final int ERROR_CODE = 0xcc;
     
@@ -49,7 +49,7 @@ public final class UnsupportedCommandPacket extends AbstractCommandPacket {
     }
     
     @Override
-    public List<AbstractMySQLSentPacket> execute() {
-        return Collections.<AbstractMySQLSentPacket>singletonList(new ErrPacket(getSequenceId() + 1, ERROR_CODE, SQL_STATE_MARKER, SQL_STATE, String.format(ERROR_MESSAGE, type)));
+    public List<MySQLSentPacket> execute() {
+        return Collections.<MySQLSentPacket>singletonList(new ErrPacket(getSequenceId() + 1, ERROR_CODE, SQL_STATE_MARKER, SQL_STATE, String.format(ERROR_MESSAGE, type)));
     }
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/handshake/HandshakePacket.java

@@ -21,7 +21,7 @@ import io.shardingjdbc.proxy.constant.CapabilityFlag;
 import io.shardingjdbc.proxy.constant.ServerInfo;
 import io.shardingjdbc.proxy.constant.StatusFlag;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import lombok.Getter;
 
 /**
@@ -32,7 +32,7 @@ import lombok.Getter;
  * @author zhangliang
  */
 @Getter
-public class HandshakePacket extends AbstractMySQLSentPacket {
+public class HandshakePacket extends MySQLSentPacket {
     
     private final int protocolVersion = ServerInfo.PROTOCOL_VERSION;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/handshake/HandshakeResponse41Packet.java

@@ -19,7 +19,7 @@ package io.shardingjdbc.proxy.packet.handshake;
 
 import io.shardingjdbc.proxy.constant.CapabilityFlag;
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLReceivedPacket;
+import io.shardingjdbc.proxy.packet.MySQLReceivedPacket;
 import lombok.Getter;
 
 /**
@@ -29,7 +29,7 @@ import lombok.Getter;
  * @author zhangliang
  */
 @Getter
-public final class HandshakeResponse41Packet extends AbstractMySQLReceivedPacket {
+public final class HandshakeResponse41Packet extends MySQLReceivedPacket {
     
     private int capabilityFlags;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/ok/EofPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.ok;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import lombok.Getter;
 
 /**
@@ -28,7 +28,7 @@ import lombok.Getter;
  * @author zhangliang 
  */
 @Getter
-public class EofPacket extends AbstractMySQLSentPacket {
+public class EofPacket extends MySQLSentPacket {
     
     private static final int HEADER = 0xfe;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/ok/ErrPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.ok;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import lombok.Getter;
 
 /**
@@ -28,7 +28,7 @@ import lombok.Getter;
  * @author zhangliang 
  */
 @Getter
-public class ErrPacket extends AbstractMySQLSentPacket {
+public class ErrPacket extends MySQLSentPacket {
     
     private static final int HEADER = 0xff;
     

sharding-proxy/src/main/java/io/shardingjdbc/proxy/packet/ok/OKPacket.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.proxy.packet.ok;
 
 import io.shardingjdbc.proxy.packet.MySQLPacketPayload;
-import io.shardingjdbc.proxy.packet.AbstractMySQLSentPacket;
+import io.shardingjdbc.proxy.packet.MySQLSentPacket;
 import lombok.Getter;
 
 /**
@@ -28,7 +28,7 @@ import lombok.Getter;
  * @author zhangliang 
  */
 @Getter
-public class OKPacket extends AbstractMySQLSentPacket {
+public class OKPacket extends MySQLSentPacket {
     
     private static final int HEADER = 0x00;