From e66aea5a8ea934d0478f04509d635c8892a66b49 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Thu, 15 Mar 2018 22:08:20 +0800 Subject: [PATCH] adjust transport package --- .../proxy/transport/ShardingProxy.java | 4 ++-- .../{ => common}/codec/PacketCodec.java | 4 ++-- .../codec/PacketCodecFactory.java | 4 ++-- .../handler/DatabaseProxyHandler.java | 2 +- .../handler/DatabaseProxyHandlerFactory.java | 4 ++-- .../packet/DatabaseProtocolPacket.java | 2 +- .../{ => common}/packet/ReceivedPacket.java | 2 +- .../{ => common}/packet/SentPacket.java | 2 +- .../codec}/MySQLPacketCodec.java | 10 ++++----- .../handler}/MySQLProxyHandler.java | 22 +++++++++---------- .../mysql => mysql/packet}/MySQLPacket.java | 4 ++-- .../packet}/MySQLPacketPayload.java | 2 +- .../packet}/MySQLReceivedPacket.java | 4 ++-- .../packet}/MySQLSentPacket.java | 4 ++-- .../command/ColumnDefinition41Packet.java | 6 ++--- .../packet}/command/ComFieldListPacket.java | 10 ++++----- .../packet}/command/ComInitDbPacket.java | 10 ++++----- .../packet}/command/ComQueryPacket.java | 12 +++++----- .../packet}/command/ComQuitPacket.java | 8 +++---- .../packet}/command/CommandPacket.java | 6 ++--- .../packet}/command/CommandPacketFactory.java | 2 +- .../packet}/command/CommandPacketType.java | 2 +- .../packet}/command/FieldCountPacket.java | 6 ++--- .../command/TextResultSetRowPacket.java | 6 ++--- .../command/UnsupportedCommandPacket.java | 8 +++---- .../packet}/handshake/AuthPluginData.java | 2 +- .../handshake/ConnectionIdGenerator.java | 2 +- .../packet}/handshake/HandshakePacket.java | 6 ++--- .../handshake/HandshakeResponse41Packet.java | 6 ++--- .../packet}/handshake/RandomGenerator.java | 2 +- .../mysql => mysql/packet}/ok/EofPacket.java | 6 ++--- .../mysql => mysql/packet}/ok/ErrPacket.java | 6 ++--- .../mysql => mysql/packet}/ok/OKPacket.java | 6 ++--- .../proxy/util/RandomGeneratorTest.java | 2 +- 34 files changed, 92 insertions(+), 92 deletions(-) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/codec/PacketCodec.java (94%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/codec/PacketCodecFactory.java (92%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/handler/DatabaseProxyHandler.java (96%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/handler/DatabaseProxyHandlerFactory.java (92%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/packet/DatabaseProtocolPacket.java (92%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/packet/ReceivedPacket.java (93%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{ => common}/packet/SentPacket.java (93%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{codec/mysql => mysql/codec}/MySQLPacketCodec.java (87%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{handler/mysql => mysql/handler}/MySQLProxyHandler.java (77%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/MySQLPacket.java (87%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/MySQLPacketPayload.java (99%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/MySQLReceivedPacket.java (89%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/MySQLSentPacket.java (88%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/ColumnDefinition41Packet.java (93%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/ComFieldListPacket.java (92%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/ComInitDbPacket.java (85%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/ComQueryPacket.java (92%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/ComQuitPacket.java (83%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/CommandPacket.java (82%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/CommandPacketFactory.java (97%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/CommandPacketType.java (99%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/FieldCountPacket.java (86%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/TextResultSetRowPacket.java (88%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/command/UnsupportedCommandPacket.java (86%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/handshake/AuthPluginData.java (95%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/handshake/ConnectionIdGenerator.java (95%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/handshake/HandshakePacket.java (93%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/handshake/HandshakeResponse41Packet.java (93%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/handshake/RandomGenerator.java (96%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/ok/EofPacket.java (88%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/ok/ErrPacket.java (90%) rename sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/{packet/mysql => mysql/packet}/ok/OKPacket.java (91%) diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/ShardingProxy.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/ShardingProxy.java index 12f17c5b3a..15e56a38ea 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/ShardingProxy.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/ShardingProxy.java @@ -26,8 +26,8 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.shardingjdbc.core.constant.DatabaseType; -import io.shardingjdbc.proxy.transport.codec.PacketCodecFactory; -import io.shardingjdbc.proxy.transport.handler.DatabaseProxyHandlerFactory; +import io.shardingjdbc.proxy.transport.common.codec.PacketCodecFactory; +import io.shardingjdbc.proxy.transport.common.handler.DatabaseProxyHandlerFactory; /** * Sharding-Proxy. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodec.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodec.java similarity index 94% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodec.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodec.java index f5672db0c4..a917b9e833 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodec.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodec.java @@ -15,13 +15,13 @@ *

*/ -package io.shardingjdbc.proxy.transport.codec; +package io.shardingjdbc.proxy.transport.common.codec; 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.transport.packet.SentPacket; +import io.shardingjdbc.proxy.transport.common.packet.SentPacket; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodecFactory.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodecFactory.java similarity index 92% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodecFactory.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodecFactory.java index 8268ef56bd..581c16385f 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/PacketCodecFactory.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/codec/PacketCodecFactory.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.codec; +package io.shardingjdbc.proxy.transport.common.codec; import io.shardingjdbc.core.constant.DatabaseType; -import io.shardingjdbc.proxy.transport.codec.mysql.MySQLPacketCodec; +import io.shardingjdbc.proxy.transport.mysql.codec.MySQLPacketCodec; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandler.java similarity index 96% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandler.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandler.java index 4c9e1f188b..aed0e1e745 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandler.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.handler; +package io.shardingjdbc.proxy.transport.common.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandlerFactory.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandlerFactory.java similarity index 92% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandlerFactory.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandlerFactory.java index c695196273..44f1cacbb2 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/DatabaseProxyHandlerFactory.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/handler/DatabaseProxyHandlerFactory.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.handler; +package io.shardingjdbc.proxy.transport.common.handler; import io.shardingjdbc.core.constant.DatabaseType; -import io.shardingjdbc.proxy.transport.handler.mysql.MySQLProxyHandler; +import io.shardingjdbc.proxy.transport.mysql.handler.MySQLProxyHandler; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/DatabaseProtocolPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/DatabaseProtocolPacket.java similarity index 92% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/DatabaseProtocolPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/DatabaseProtocolPacket.java index 53154a8e0b..5292a79fbf 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/DatabaseProtocolPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/DatabaseProtocolPacket.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet; +package io.shardingjdbc.proxy.transport.common.packet; /** * Database protocol packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/ReceivedPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/ReceivedPacket.java similarity index 93% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/ReceivedPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/ReceivedPacket.java index 238445f021..a30bcef3e6 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/ReceivedPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/ReceivedPacket.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet; +package io.shardingjdbc.proxy.transport.common.packet; /** * Database received protocol packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/SentPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/SentPacket.java similarity index 93% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/SentPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/SentPacket.java index 8040579f1f..7450848e58 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/SentPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/common/packet/SentPacket.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet; +package io.shardingjdbc.proxy.transport.common.packet; /** * Database sent protocol packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/mysql/MySQLPacketCodec.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java similarity index 87% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/mysql/MySQLPacketCodec.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java index 1b5372b024..6d161dd12a 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/codec/mysql/MySQLPacketCodec.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java @@ -15,14 +15,14 @@ *

*/ -package io.shardingjdbc.proxy.transport.codec.mysql; +package io.shardingjdbc.proxy.transport.mysql.codec; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import io.shardingjdbc.proxy.transport.codec.PacketCodec; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.common.codec.PacketCodec; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import java.util.List; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/mysql/MySQLProxyHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/handler/MySQLProxyHandler.java similarity index 77% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/mysql/MySQLProxyHandler.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/handler/MySQLProxyHandler.java index 9b2387560f..0667e2ddb1 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/handler/mysql/MySQLProxyHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/handler/MySQLProxyHandler.java @@ -15,21 +15,21 @@ *

*/ -package io.shardingjdbc.proxy.transport.handler.mysql; +package io.shardingjdbc.proxy.transport.mysql.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.handler.DatabaseProxyHandler; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.command.CommandPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.command.CommandPacketFactory; -import io.shardingjdbc.proxy.transport.packet.mysql.handshake.AuthPluginData; -import io.shardingjdbc.proxy.transport.packet.mysql.handshake.ConnectionIdGenerator; -import io.shardingjdbc.proxy.transport.packet.mysql.handshake.HandshakePacket; -import io.shardingjdbc.proxy.transport.packet.mysql.handshake.HandshakeResponse41Packet; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.OKPacket; +import io.shardingjdbc.proxy.transport.common.handler.DatabaseProxyHandler; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.command.CommandPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.command.CommandPacketFactory; +import io.shardingjdbc.proxy.transport.mysql.packet.handshake.AuthPluginData; +import io.shardingjdbc.proxy.transport.mysql.packet.handshake.ConnectionIdGenerator; +import io.shardingjdbc.proxy.transport.mysql.packet.handshake.HandshakePacket; +import io.shardingjdbc.proxy.transport.mysql.packet.handshake.HandshakeResponse41Packet; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.OKPacket; /** * MySQL proxy handler. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacket.java similarity index 87% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacket.java index 6ebf1e776e..bbb8d297ad 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacket.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql; +package io.shardingjdbc.proxy.transport.mysql.packet; -import io.shardingjdbc.proxy.transport.packet.DatabaseProtocolPacket; +import io.shardingjdbc.proxy.transport.common.packet.DatabaseProtocolPacket; import lombok.Getter; import lombok.Setter; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacketPayload.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacketPayload.java similarity index 99% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacketPayload.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacketPayload.java index fe28585fa4..95318160cb 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLPacketPayload.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacketPayload.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql; +package io.shardingjdbc.proxy.transport.mysql.packet; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLReceivedPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLReceivedPacket.java similarity index 89% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLReceivedPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLReceivedPacket.java index 1d690c1cdb..387c4d2e96 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLReceivedPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLReceivedPacket.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql; +package io.shardingjdbc.proxy.transport.mysql.packet; -import io.shardingjdbc.proxy.transport.packet.ReceivedPacket; +import io.shardingjdbc.proxy.transport.common.packet.ReceivedPacket; /** * MySQL received packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLSentPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLSentPacket.java similarity index 88% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLSentPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLSentPacket.java index 9f3cb5ce2c..36c4d5d1e1 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/MySQLSentPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLSentPacket.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql; +package io.shardingjdbc.proxy.transport.mysql.packet; -import io.shardingjdbc.proxy.transport.packet.SentPacket; +import io.shardingjdbc.proxy.transport.common.packet.SentPacket; /** * MySQL send packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ColumnDefinition41Packet.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ColumnDefinition41Packet.java similarity index 93% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ColumnDefinition41Packet.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ColumnDefinition41Packet.java index a3b61d7166..4eb5daf16d 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ColumnDefinition41Packet.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ColumnDefinition41Packet.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import io.shardingjdbc.proxy.constant.ColumnType; import io.shardingjdbc.proxy.constant.ServerInfo; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; /** * Column definition above MySQL 4.1 packet protocol. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComFieldListPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComFieldListPacket.java similarity index 92% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComFieldListPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComFieldListPacket.java index c0486a6386..44c5220561 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComFieldListPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComFieldListPacket.java @@ -15,16 +15,16 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import io.shardingjdbc.core.constant.ShardingConstant; import io.shardingjdbc.proxy.backend.DataSourceManager; import io.shardingjdbc.proxy.constant.ColumnType; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.EofPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.ErrPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.EofPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.ErrPacket; import lombok.extern.slf4j.Slf4j; import java.sql.Connection; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComInitDbPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComInitDbPacket.java similarity index 85% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComInitDbPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComInitDbPacket.java index 5246b24c9c..c19ad0c122 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComInitDbPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComInitDbPacket.java @@ -15,14 +15,14 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import io.shardingjdbc.core.constant.ShardingConstant; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.ErrPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.OKPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.ErrPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.OKPacket; import lombok.extern.slf4j.Slf4j; import java.util.Collections; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQueryPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQueryPacket.java similarity index 92% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQueryPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQueryPacket.java index c45a9962d7..652617e902 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQueryPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQueryPacket.java @@ -15,18 +15,18 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import io.shardingjdbc.core.parsing.SQLJudgeEngine; import io.shardingjdbc.core.parsing.parser.sql.SQLStatement; import io.shardingjdbc.proxy.backend.DataSourceManager; import io.shardingjdbc.proxy.constant.ColumnType; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.EofPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.ErrPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.OKPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.EofPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.ErrPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.OKPacket; import lombok.extern.slf4j.Slf4j; import java.sql.Connection; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQuitPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQuitPacket.java similarity index 83% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQuitPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQuitPacket.java index 8192fc1336..62d5796def 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/ComQuitPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/ComQuitPacket.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.OKPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.OKPacket; import java.util.Collections; import java.util.List; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacket.java similarity index 82% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacket.java index e7cf185ac4..7a9541747c 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLReceivedPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLReceivedPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import java.util.List; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketFactory.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketFactory.java similarity index 97% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketFactory.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketFactory.java index 3eb024c599..77ac7759c8 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketFactory.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketFactory.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; /** * Command packet factory. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketType.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketType.java similarity index 99% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketType.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketType.java index 3b76bc5a2f..5d1ff949fe 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/CommandPacketType.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketType.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; import lombok.RequiredArgsConstructor; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/FieldCountPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/FieldCountPacket.java similarity index 86% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/FieldCountPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/FieldCountPacket.java index 59dc535381..4fdb42d26b 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/FieldCountPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/FieldCountPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; /** * COM_QUERY response field count packet. diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/TextResultSetRowPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/TextResultSetRowPacket.java similarity index 88% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/TextResultSetRowPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/TextResultSetRowPacket.java index b029043f2d..4d730bfb10 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/TextResultSetRowPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/TextResultSetRowPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import java.util.List; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/UnsupportedCommandPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/UnsupportedCommandPacket.java similarity index 86% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/UnsupportedCommandPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/UnsupportedCommandPacket.java index 5659b98f36..d43f9fd4f5 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/command/UnsupportedCommandPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/UnsupportedCommandPacket.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.command; +package io.shardingjdbc.proxy.transport.mysql.packet.command; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; -import io.shardingjdbc.proxy.transport.packet.mysql.ok.ErrPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.ok.ErrPacket; import lombok.RequiredArgsConstructor; import java.util.Collections; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/AuthPluginData.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/AuthPluginData.java similarity index 95% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/AuthPluginData.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/AuthPluginData.java index f1eba90b81..d5d9933e4e 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/AuthPluginData.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/AuthPluginData.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.handshake; +package io.shardingjdbc.proxy.transport.mysql.packet.handshake; import com.google.common.primitives.Bytes; import lombok.Getter; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/ConnectionIdGenerator.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/ConnectionIdGenerator.java similarity index 95% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/ConnectionIdGenerator.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/ConnectionIdGenerator.java index 87137bad2a..28bab50118 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/ConnectionIdGenerator.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/ConnectionIdGenerator.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.handshake; +package io.shardingjdbc.proxy.transport.mysql.packet.handshake; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakePacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakePacket.java similarity index 93% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakePacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakePacket.java index e9f5d7cccc..41ac619e67 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakePacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakePacket.java @@ -15,13 +15,13 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.handshake; +package io.shardingjdbc.proxy.transport.mysql.packet.handshake; import io.shardingjdbc.proxy.constant.CapabilityFlag; import io.shardingjdbc.proxy.constant.ServerInfo; import io.shardingjdbc.proxy.constant.StatusFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import lombok.Getter; /** diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakeResponse41Packet.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakeResponse41Packet.java similarity index 93% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakeResponse41Packet.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakeResponse41Packet.java index 8a4aad7f7b..1197e28304 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/HandshakeResponse41Packet.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakeResponse41Packet.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.handshake; +package io.shardingjdbc.proxy.transport.mysql.packet.handshake; import io.shardingjdbc.proxy.constant.CapabilityFlag; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLReceivedPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLReceivedPacket; import lombok.Getter; /** diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/RandomGenerator.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/RandomGenerator.java similarity index 96% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/RandomGenerator.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/RandomGenerator.java index b8da6b9826..222f3b45d3 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/handshake/RandomGenerator.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/RandomGenerator.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.handshake; +package io.shardingjdbc.proxy.transport.mysql.packet.handshake; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/EofPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/EofPacket.java similarity index 88% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/EofPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/EofPacket.java index 7be18d4ac9..fc09d393d6 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/EofPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/EofPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.ok; +package io.shardingjdbc.proxy.transport.mysql.packet.ok; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import lombok.Getter; /** diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/ErrPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/ErrPacket.java similarity index 90% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/ErrPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/ErrPacket.java index fdcd5b382c..a00684477a 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/ErrPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/ErrPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.ok; +package io.shardingjdbc.proxy.transport.mysql.packet.ok; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import lombok.Getter; /** diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/OKPacket.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/OKPacket.java similarity index 91% rename from sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/OKPacket.java rename to sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/OKPacket.java index feebe7d085..f35daf5b50 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/packet/mysql/ok/OKPacket.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/ok/OKPacket.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingjdbc.proxy.transport.packet.mysql.ok; +package io.shardingjdbc.proxy.transport.mysql.packet.ok; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLPacketPayload; -import io.shardingjdbc.proxy.transport.packet.mysql.MySQLSentPacket; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload; +import io.shardingjdbc.proxy.transport.mysql.packet.MySQLSentPacket; import lombok.Getter; /** diff --git a/sharding-proxy/src/test/java/io/shardingjdbc/proxy/util/RandomGeneratorTest.java b/sharding-proxy/src/test/java/io/shardingjdbc/proxy/util/RandomGeneratorTest.java index dbc05cb0f2..82aa237270 100644 --- a/sharding-proxy/src/test/java/io/shardingjdbc/proxy/util/RandomGeneratorTest.java +++ b/sharding-proxy/src/test/java/io/shardingjdbc/proxy/util/RandomGeneratorTest.java @@ -17,7 +17,7 @@ package io.shardingjdbc.proxy.util; -import io.shardingjdbc.proxy.transport.packet.mysql.handshake.RandomGenerator; +import io.shardingjdbc.proxy.transport.mysql.packet.handshake.RandomGenerator; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; -- GitLab