diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java index 9adb3d73dff38..90a2810dece5f 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLErrPacket; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; import org.apache.shardingsphere.db.protocol.packet.DatabasePacket; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnknownSQLException; +import org.apache.shardingsphere.infra.exception.generic.UnknownSQLException; import java.nio.charset.Charset; import java.util.Iterator; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlag.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlag.java index b7a18f57b6d12..598561f5ff02d 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlag.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlag.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnknownSQLException; +import org.apache.shardingsphere.infra.exception.generic.UnknownSQLException; import java.sql.SQLException; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValue.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValue.java index 3796c5f1c405e..5995c27a8e110 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValue.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValue.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.value.MySQLBinlogProtocolValue; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.io.Serializable; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValue.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValue.java index db2aa4e8e7c9c..6ff03873b0346 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValue.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValue.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.value.MySQLBinlogProtocolValue; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.io.Serializable; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonValueDecoder.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonValueDecoder.java index 77fe8014c054a..bf3f09ab080f3 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonValueDecoder.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonValueDecoder.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.io.Serializable; import java.math.BigInteger; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValue.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValue.java index 4dab2d308ca83..a4d712e2982a3 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValue.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValue.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.value.MySQLBinlogProtocolValue; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.io.Serializable; diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthMoreDataPacket.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthMoreDataPacket.java index e1f6ca39804a1..38e2b4a489774 100644 --- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthMoreDataPacket.java +++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthMoreDataPacket.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.db.protocol.mysql.packet.MySQLPacket; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * MySQL authentication more data packet. diff --git a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlagTest.java b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlagTest.java index 4effafb188551..de76a26c7c3a5 100644 --- a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlagTest.java +++ b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLStatusFlagTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.db.protocol.mysql.constant; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnknownSQLException; +import org.apache.shardingsphere.infra.exception.generic.UnknownSQLException; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValueTest.java b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValueTest.java index 100c86cd3f2e7..0c4b55c994a21 100644 --- a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValueTest.java +++ b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/blob/MySQLBlobBinlogProtocolValueTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLBinaryColumnType; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValueTest.java b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValueTest.java index 20ae2580f0cd8..d22544d54129d 100644 --- a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValueTest.java +++ b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLJsonBinlogProtocolValueTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.value.string.MySQLJsonValueDecoder.JsonValueTypes; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValueTest.java b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValueTest.java index 7f2683c740edd..ea723824a8e7e 100644 --- a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValueTest.java +++ b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/string/MySQLStringBinlogProtocolValueTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLBinaryColumnType; import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.MySQLBinlogColumnDef; import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/constant/PostgreSQLValueFormat.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/constant/PostgreSQLValueFormat.java index 0b6b960dee90d..09dcd84e788b1 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/constant/PostgreSQLValueFormat.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/constant/PostgreSQLValueFormat.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * PostgreSQL value format. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoder.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoder.java index c9c10a31c5807..c546c46c56784 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoder.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoder.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValue.java index a8876d6cb7468..9927c5adaef79 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for boolean array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValue.java index c5443b7a4842b..76e257c670e91 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for float4 array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValue.java index aeb6f53854111..346b028b35dbe 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for float8 array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValue.java index 85f32fa185119..01a811f34a26f 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for int2 array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValue.java index 10868f7218d1f..31c0bdbab3864 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for int4 array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValue.java index 42804eaffe877..f7ee9060b431a 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for int8 array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValue.java index 7538b88ac43e0..95794304fc525 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValue.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for string array for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValue.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValue.java index 4acdf258e3e3b..b08201048896c 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValue.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValue.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.PostgreSQLTypeUnspecifiedSQLParameter; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; /** * Binary protocol value for unspecified for PostgreSQL. diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/text/impl/PostgreSQLTimeValueParser.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/text/impl/PostgreSQLTimeValueParser.java index 2438391b3638d..3c1f248b447d6 100644 --- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/text/impl/PostgreSQLTimeValueParser.java +++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/text/impl/PostgreSQLTimeValueParser.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.text.impl; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.text.PostgreSQLTextValueParser; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java index 98830770f7bab..84a17e17730d2 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java index 2959ebb2f6e95..fc34429d55382 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat4ArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java index 00fde8bf3c3ff..17a03f1be4927 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLFloat8ArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java index 99c8355f75578..5a890aa015f4f 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt2ArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java index 0dd674fb86011..2d3b55033091f 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt4ArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java index 294424da7bfa0..8f62d9b2a5415 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLInt8ArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java index fc700343c2c16..5244339abd40c 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLStringArrayBinaryProtocolValueTest.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java index ffe38b7c221dd..703156ebff6b5 100644 --- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java +++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLUnspecifiedBinaryProtocolValueTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.ByteBufTestUtils; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.PostgreSQLTypeUnspecifiedSQLParameter; import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java index 2c8122bf85fcf..755bb3c1f8555 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java @@ -21,8 +21,8 @@ import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.EmptyStorageUnitException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java index 7482e2bbe44a8..c2fde17d87f33 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java index ea748e8632298..ec5fb829086cf 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java @@ -20,8 +20,8 @@ import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.EmptyStorageUnitException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit; import org.junit.jupiter.api.Test; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java index b1476c8a26396..18654d8f91780 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java index 9296a332bc7cf..976c771435294 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java @@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.SchemaMetaDataAware; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java index c797737c7f0eb..553c503151f05 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java @@ -34,7 +34,7 @@ import org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.PreviousSQLTokensAware; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java index 0b28529a8a1a7..648c2279c5e1e 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.SubstitutableColumnNameToken; diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java index c8e8e8e4ea447..48a8a7a1361db 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.OptionalSQLTokenGenerator; import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.PreviousSQLTokensAware; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java index 824bb94040f74..4b2732752bf88 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGeneratorTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder; import org.apache.shardingsphere.infra.database.core.DefaultDatabase; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.SubstitutableColumnNameToken; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGeneratorTest.java index 3271885d7ec4a..dc51060c6ba8f 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGeneratorTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGeneratorTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext; import org.apache.shardingsphere.infra.database.core.DefaultDatabase; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGeneratorTest.java index f3242b9b9ff5b..8e32652550dde 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGeneratorTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGeneratorTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder; import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java index 320fdeaf8bc0f..ce3c8ce207e74 100644 --- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java +++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.rewrite.token.generator.insert; import org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java index 94a77d61b50ef..506feef749616 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java @@ -30,8 +30,8 @@ import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java index f66b32d30162e..d6174110b873d 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java @@ -31,9 +31,9 @@ import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm; import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.EmptyStorageUnitException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java index f3e88af3e1866..af1e77bbdfe80 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java index ba3a6fc08a1d8..ced48cfdcd018 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; import org.apache.shardingsphere.encrypt.rule.EncryptRule; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.junit.jupiter.api.BeforeEach; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java index 9fc97e882cfbb..64ae09a71ed11 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.encrypt.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java index 29bd565b38636..67441be24216a 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java index 77a247101bb3c..1e382fc6c44f9 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleAlterExecutor; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java index f8a311d22b30d..bfd2f98248d37 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java index 851007265ac1e..8400f35b6d02f 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java index fc30afc5b9155..07f1dfe0082a0 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java index 12117d9177655..30cfa6de3f858 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java index 176b82da3e4a2..7c62e04a4a319 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java index 486983ac68649..9e6f9e2ccc76c 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java @@ -20,10 +20,10 @@ import com.google.common.base.Strings; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.infra.algorithm.loadbalancer.core.LoadBalanceAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java index 59f400e088972..69c3648b54db2 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java @@ -21,14 +21,14 @@ import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware; import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware; import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.state.datasource.DataSourceState; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.storage.service.StorageNodeStatusService; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.InvalidStorageUnitStatusException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.InvalidStorageUnitStatusException; import org.apache.shardingsphere.readwritesplitting.exception.checker.MissingRequiredReadStorageUnitException; import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceRule; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java index 4e5b8bdf1e86f..7b0184607fa1e 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java @@ -19,8 +19,8 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InUsedRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.datanode.DataNode; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java index 98b5e5eb306cd..2cd762bffd1a6 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java index c424ad7db0372..2c0413c2826a1 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java index 4c169c545a716..7d31dc632255a 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java @@ -19,9 +19,9 @@ import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.datanode.DataNode; -import org.apache.shardingsphere.infra.exception.metadata.rule.RuleDefinitionException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InUsedRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.RuleDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes; import org.apache.shardingsphere.infra.rule.attribute.datanode.DataNodeRuleAttribute; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java index 896a94950e8a2..511892a9179b9 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java @@ -21,8 +21,8 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.KernelSQLException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java index bc4183e70f63d..5ad8323263672 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java @@ -20,8 +20,8 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleAlterExecutor; import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java index df3c9a9c58104..e0066e7d95a08 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java @@ -20,7 +20,7 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java index ee43daf5e4a26..d6cb259b14662 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java index a7d16fb6f422d..b69a10027c177 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.shadow.distsql.update; import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleExecutorTest.java index 16a2fb6bbd20c..2432d5dbd4f5d 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleExecutorTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.shadow.distsql.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleExecutorTest.java index e1ebed9137df7..761be6a3ff4ba 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.distsql.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java index 03f3b7d5ba0c8..2d2c6e49806e9 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java @@ -22,7 +22,7 @@ import com.google.common.collect.Range; import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue; import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/ComplexInlineShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/ComplexInlineShardingAlgorithm.java index fac2537c667bd..c76449ccd4cf7 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/ComplexInlineShardingAlgorithm.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/ComplexInlineShardingAlgorithm.java @@ -20,7 +20,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory; import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm; import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java index a4aa860278eec..3f871dc16408f 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java @@ -21,7 +21,7 @@ import groovy.lang.MissingMethodException; import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory; import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java index 1f1b594869ee0..9519ea58e438e 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java @@ -19,7 +19,7 @@ import com.google.common.collect.Range; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.sharding.algorithm.sharding.ShardingAutoTableAlgorithmUtils; import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm; import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/aggregation/AggregationUnitFactory.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/aggregation/AggregationUnitFactory.java index 30d9c9d9eb281..717a166686d8c 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/aggregation/AggregationUnitFactory.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/aggregation/AggregationUnitFactory.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.sql.parser.sql.common.enums.AggregationType; /** diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java index df00a030b6775..eac2af4a67a08 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java @@ -27,10 +27,10 @@ import org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java index 288fc82fa2a3d..347cbdc55a83f 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.handler.enums; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ComplexShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.HintShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java index 8ce2e834abcde..b0f3ba10374ad 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java index 238fa24956de7..e3d31a49a381b 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java @@ -20,9 +20,9 @@ import com.cedarsoftware.util.CaseInsensitiveSet; import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleAlterExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java index e9409475e6af8..d5b4fab34141f 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java index a5264be03704a..628a9967b6398 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java @@ -20,9 +20,9 @@ import com.cedarsoftware.util.CaseInsensitiveSet; import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java index 9be94f999450d..b03766cdcf08e 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.handler.update; import lombok.Setter; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java index 9948eac0ae73a..ac5207391ccee 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java @@ -20,7 +20,7 @@ import com.cedarsoftware.util.CaseInsensitiveSet; import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java index ebdfa7f73331c..87e23b208305b 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java @@ -21,8 +21,8 @@ import com.google.common.base.Splitter; import lombok.Setter; import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InUsedRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException; import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java index af7f63b2a3deb..e4888bb0e4ebb 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java @@ -21,10 +21,10 @@ import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException; import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmConfigurationException; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleExecutorTest.java index 068f202294baa..4d325b0407074 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyExecutorTest.java index 2f40e47a20097..be20d49a0e5e7 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyExecutorTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.algorithm.core.exception.EmptyAlgorithmException; import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmConfigurationException; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java index a7fce206a0d7b..f242db604eb21 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleExecutorTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.sharding.distsql.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java index 07b01d47a591a..6df548ef087ca 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.update; import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java index dd7ccd296057d..33d38b985792e 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration; import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException; import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException; -import org.apache.shardingsphere.infra.exception.metadata.rule.RuleDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.RuleDefinitionException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceExecutorTest.java index 8492e214576a2..4dd9400c3ada3 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.update; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleExecutorTest.java index 55751fa356b9a..a87f83680b0ce 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleExecutorTest.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.sharding.distsql.update; import com.google.common.base.Splitter; -import org.apache.shardingsphere.infra.exception.metadata.rule.RuleDefinitionException; -import org.apache.shardingsphere.infra.exception.metadata.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.infra.exception.metadata.rule.InUsedRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.RuleDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/CommonSQLStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/CommonSQLStatementContext.java index 9b4016e6819e2..8e9fa75726b2a 100644 --- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/CommonSQLStatementContext.java +++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/CommonSQLStatementContext.java @@ -20,7 +20,7 @@ import lombok.Getter; import org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement; diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java index 22bf72d0906ab..0f44909c89cdc 100644 --- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java +++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java @@ -63,7 +63,7 @@ import org.apache.shardingsphere.infra.binder.context.statement.dcl.DenyUserStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; +import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.AnalyzeTableStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement; diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/expression/impl/ColumnSegmentBinder.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/expression/impl/ColumnSegmentBinder.java index a2419148fc3b7..cd53b7b85874e 100644 --- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/expression/impl/ColumnSegmentBinder.java +++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/expression/impl/ColumnSegmentBinder.java @@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.binder.segment.from.SimpleTableSegmentBinderContext; import org.apache.shardingsphere.infra.binder.segment.from.TableSegmentBinderContext; import org.apache.shardingsphere.infra.binder.statement.SQLStatementBinderContext; -import org.apache.shardingsphere.infra.exception.syntax.AmbiguousColumnException; -import org.apache.shardingsphere.infra.exception.metadata.ColumnNotFoundException; +import org.apache.shardingsphere.infra.exception.kernel.syntax.AmbiguousColumnException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.ColumnNotFoundException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment; import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnProjectionSegment; diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java index e79df7e0c102f..874bd29b83cf7 100644 --- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java +++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType; import org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType; -import org.apache.shardingsphere.infra.exception.metadata.TableNotFoundException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.metadata.database.schema.manager.SystemSchemaManager; diff --git a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinderTest.java b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinderTest.java index 4182b3a8adbf4..3073f87eef660 100644 --- a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinderTest.java +++ b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinderTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementBinderContext; import org.apache.shardingsphere.infra.database.core.DefaultDatabase; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; -import org.apache.shardingsphere.infra.exception.metadata.TableNotFoundException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationCheckEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationCheckEngine.java index 336bf92328d55..a7e11a424de70 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationCheckEngine.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationCheckEngine.java @@ -21,8 +21,8 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; -import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException; -import org.apache.shardingsphere.infra.exception.metadata.resource.storageunit.MissingRequiredStorageUnitsException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute; import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java index d4041abe14513..cf4a2be276df2 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; -import org.apache.shardingsphere.infra.exception.metadata.datanode.InvalidDataNodeFormatException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.datanode.InvalidDataNodeFormatException; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import java.util.List; diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLException.java index 9f0d3c0ed6cde..4736263c02e60 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; /** * Database protocol SQL exception. diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/FileIOException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/FileIOException.java index b36cbb1164e03..c390e033a91fe 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/FileIOException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; import java.io.File; diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/PluginNotFoundException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/PluginNotFoundException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/PluginNotFoundException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/PluginNotFoundException.java index 5c58703f1df85..593d9a8bf25be 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/PluginNotFoundException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/PluginNotFoundException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; /** * Plugin not found exception. diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/ServerSQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/ServerSQLException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/ServerSQLException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/ServerSQLException.java index 0b28c0bf795e2..f59875b7127ff 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/ServerSQLException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/ServerSQLException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; /** * Server SQL exception. diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLException.java index 944828fbd725a..cf601b43ca347 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; /** * Unknown SQL exception. diff --git a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationException.java similarity index 88% rename from infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationException.java index 7e5418d0029d9..f69c292d45050 100644 --- a/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationException.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; +import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.GenericSQLException; /** * Unsupported SQL operation exception. diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/CircuitBreakException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/CircuitBreakException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/CircuitBreakException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/CircuitBreakException.java index b95f5831909ef..e54c5389e1102 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/CircuitBreakException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/CircuitBreakException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.connection; +package org.apache.shardingsphere.infra.exception.kernel.connection; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ConnectionSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/OverallConnectionNotEnoughException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/OverallConnectionNotEnoughException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/OverallConnectionNotEnoughException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/OverallConnectionNotEnoughException.java index c5fa6af0d3498..9746d09f0225f 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/OverallConnectionNotEnoughException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/OverallConnectionNotEnoughException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.connection; +package org.apache.shardingsphere.infra.exception.kernel.connection; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ConnectionSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/SQLExecutionInterruptedException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/SQLExecutionInterruptedException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/SQLExecutionInterruptedException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/SQLExecutionInterruptedException.java index 9e1010ecc8760..76d167cf78a20 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/connection/SQLExecutionInterruptedException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/connection/SQLExecutionInterruptedException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.connection; +package org.apache.shardingsphere.infra.exception.kernel.connection; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ConnectionSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedDataTypeConversionException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedDataTypeConversionException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedDataTypeConversionException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedDataTypeConversionException.java index 2a0e278ef9655..831af1dc9e600 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedDataTypeConversionException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedDataTypeConversionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.data; +package org.apache.shardingsphere.infra.exception.kernel.data; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DataSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedStreamCharsetConversionException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedStreamCharsetConversionException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedStreamCharsetConversionException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedStreamCharsetConversionException.java index 9a4e86904baf7..a17a0ae0c9af4 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/data/UnsupportedStreamCharsetConversionException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/data/UnsupportedStreamCharsetConversionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.data; +package org.apache.shardingsphere.infra.exception.kernel.data; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DataSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/ColumnNotFoundException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/ColumnNotFoundException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/ColumnNotFoundException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/ColumnNotFoundException.java index 7c64d45f2cdd2..1ffc1317a6133 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/ColumnNotFoundException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/ColumnNotFoundException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata; +package org.apache.shardingsphere.infra.exception.kernel.metadata; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.MetaDataSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/MissingRequiredDatabaseException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/MissingRequiredDatabaseException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/MissingRequiredDatabaseException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/MissingRequiredDatabaseException.java index bccdeb3d42f19..0901e5738c5f0 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/MissingRequiredDatabaseException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/MissingRequiredDatabaseException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata; +package org.apache.shardingsphere.infra.exception.kernel.metadata; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.MetaDataSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/SchemaNotFoundException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/SchemaNotFoundException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/SchemaNotFoundException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/SchemaNotFoundException.java index f0a74c3777d39..c82509a8d7c0b 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/SchemaNotFoundException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/SchemaNotFoundException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata; +package org.apache.shardingsphere.infra.exception.kernel.metadata; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.MetaDataSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/TableNotFoundException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/TableNotFoundException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/TableNotFoundException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/TableNotFoundException.java index 86de960f02526..85a97ba79d663 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/TableNotFoundException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/TableNotFoundException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata; +package org.apache.shardingsphere.infra.exception.kernel.metadata; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.MetaDataSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/DataNodeDefinitionException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/DataNodeDefinitionException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/DataNodeDefinitionException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/DataNodeDefinitionException.java index 904d1941cfab2..39e7286c60251 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/DataNodeDefinitionException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/DataNodeDefinitionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.datanode; +package org.apache.shardingsphere.infra.exception.kernel.metadata.datanode; import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/InvalidDataNodeFormatException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/InvalidDataNodeFormatException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/InvalidDataNodeFormatException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/InvalidDataNodeFormatException.java index fe7c04c48c254..37f9686df5e02 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/InvalidDataNodeFormatException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/InvalidDataNodeFormatException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.datanode; +package org.apache.shardingsphere.infra.exception.kernel.metadata.datanode; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/UnsupportedActualDataNodeStructureException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/UnsupportedActualDataNodeStructureException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/UnsupportedActualDataNodeStructureException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/UnsupportedActualDataNodeStructureException.java index 7b828e3c8de4a..d2bb0835550db 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/datanode/UnsupportedActualDataNodeStructureException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/datanode/UnsupportedActualDataNodeStructureException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.datanode; +package org.apache.shardingsphere.infra.exception.kernel.metadata.datanode; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/ResourceDefinitionException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/ResourceDefinitionException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/ResourceDefinitionException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/ResourceDefinitionException.java index e4086bf57ae0c..b02e855a03afc 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/ResourceDefinitionException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/ResourceDefinitionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource; import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java similarity index 87% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java index bb0daee86f76c..57e2dd9b64dbe 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/AlterStorageUnitConnectionInfoException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import java.util.Collection; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/DuplicateStorageUnitException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/DuplicateStorageUnitException.java similarity index 87% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/DuplicateStorageUnitException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/DuplicateStorageUnitException.java index 380ff58241ae4..5d003d4a5afcc 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/DuplicateStorageUnitException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/DuplicateStorageUnitException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import java.util.Collection; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/EmptyStorageUnitException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/EmptyStorageUnitException.java similarity index 88% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/EmptyStorageUnitException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/EmptyStorageUnitException.java index bba286ac4c4e6..fc002531cf976 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/EmptyStorageUnitException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/EmptyStorageUnitException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; /** * Empty storage unit exception. diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InUsedStorageUnitException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InUsedStorageUnitException.java similarity index 89% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InUsedStorageUnitException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InUsedStorageUnitException.java index ae05ae4d9c89d..83c8a6184d364 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InUsedStorageUnitException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InUsedStorageUnitException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import org.apache.shardingsphere.infra.rule.ShardingSphereRule; import java.util.Collection; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InvalidStorageUnitStatusException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InvalidStorageUnitStatusException.java similarity index 87% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InvalidStorageUnitStatusException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InvalidStorageUnitStatusException.java index 308af1604e21a..5bed776dcd566 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/InvalidStorageUnitStatusException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/InvalidStorageUnitStatusException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; /** * Invalid storage unit status exception. diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java similarity index 88% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java index 144f186aa44dc..c65ab41aab641 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/MissingRequiredStorageUnitsException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import java.util.Collection; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsConnectException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsConnectException.java similarity index 89% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsConnectException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsConnectException.java index d52859716e298..95cdd19514e92 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsConnectException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsConnectException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import java.util.Map; import java.util.stream.Collectors; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsOperateException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsOperateException.java similarity index 88% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsOperateException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsOperateException.java index 8b79d999e259f..71cedf2faf438 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/resource/storageunit/StorageUnitsOperateException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/resource/storageunit/StorageUnitsOperateException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.resource.storageunit; +package org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; -import org.apache.shardingsphere.infra.exception.metadata.resource.ResourceDefinitionException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.ResourceDefinitionException; import java.util.Collection; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/DuplicateRuleException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/DuplicateRuleException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/DuplicateRuleException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/DuplicateRuleException.java index 0c213cb4ee593..f399b8bb96f88 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/DuplicateRuleException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/DuplicateRuleException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/EmptyRuleException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/EmptyRuleException.java similarity index 94% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/EmptyRuleException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/EmptyRuleException.java index 142f329953433..d337fbd24e2e6 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/EmptyRuleException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/EmptyRuleException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InUsedRuleException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InUsedRuleException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InUsedRuleException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InUsedRuleException.java index 8a7ceef26b8c2..5676a7abdf4a0 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InUsedRuleException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InUsedRuleException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InvalidRuleConfigurationException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InvalidRuleConfigurationException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InvalidRuleConfigurationException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InvalidRuleConfigurationException.java index 13471dd74003a..b68622d3e3703 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/InvalidRuleConfigurationException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/InvalidRuleConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/MissingRequiredRuleException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/MissingRequiredRuleException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/MissingRequiredRuleException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/MissingRequiredRuleException.java index e9e6ab1fe40ea..f71dcc193a817 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/MissingRequiredRuleException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/MissingRequiredRuleException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/RuleDefinitionException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/RuleDefinitionException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/RuleDefinitionException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/RuleDefinitionException.java index 124a9c13f28ca..3df265dc7af63 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/metadata/rule/RuleDefinitionException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/metadata/rule/RuleDefinitionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.metadata.rule; +package org.apache.shardingsphere.infra.exception.kernel.metadata.rule; import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/AmbiguousColumnException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/AmbiguousColumnException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/AmbiguousColumnException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/AmbiguousColumnException.java index 803c202369f14..f4657fcd794bd 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/AmbiguousColumnException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/AmbiguousColumnException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnIndexOutOfRangeException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnIndexOutOfRangeException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnIndexOutOfRangeException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnIndexOutOfRangeException.java index d2d71ec8e3620..5b2bdffeefa06 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnIndexOutOfRangeException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnIndexOutOfRangeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnLabelNotFoundException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnLabelNotFoundException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnLabelNotFoundException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnLabelNotFoundException.java index 95d8a6781872d..b6e237beed1aa 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/ColumnLabelNotFoundException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/ColumnLabelNotFoundException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/EmptySQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/EmptySQLException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/EmptySQLException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/EmptySQLException.java index 8afdf2d5cadb3..26dbe7b8ca02a 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/EmptySQLException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/EmptySQLException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/InvalidVariableValueException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/InvalidVariableValueException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/InvalidVariableValueException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/InvalidVariableValueException.java index a7bb5758b5bdc..90bb2da63d7c7 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/InvalidVariableValueException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/InvalidVariableValueException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedDropCascadeTableException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedDropCascadeTableException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedDropCascadeTableException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedDropCascadeTableException.java index f745a1c6b7c69..ed171448fb624 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedDropCascadeTableException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedDropCascadeTableException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedVariableException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedVariableException.java similarity index 95% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedVariableException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedVariableException.java index 91a63460a5441..858c2900cfeef 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/UnsupportedVariableException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/UnsupportedVariableException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax; +package org.apache.shardingsphere.infra.exception.kernel.syntax; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.SyntaxSQLException; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/DataSourceHintNotExistsException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/DataSourceHintNotExistsException.java similarity index 94% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/DataSourceHintNotExistsException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/DataSourceHintNotExistsException.java index d58546cbb8601..07a2dcf66714a 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/DataSourceHintNotExistsException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/DataSourceHintNotExistsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax.hint; +package org.apache.shardingsphere.infra.exception.kernel.syntax.hint; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/HintSQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/HintSQLException.java similarity index 96% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/HintSQLException.java rename to infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/HintSQLException.java index 05a403eeec264..840bdb6903aca 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/syntax/hint/HintSQLException.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/exception/kernel/syntax/hint/HintSQLException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.syntax.hint; +package org.apache.shardingsphere.infra.exception.kernel.syntax.hint; import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java index 593b9eef0aa1c..832d225161764 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.datanode.DataNodes; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial; -import org.apache.shardingsphere.infra.exception.metadata.datanode.UnsupportedActualDataNodeStructureException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.datanode.UnsupportedActualDataNodeStructureException; import javax.sql.DataSource; import java.util.Collection; diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java index 79d0d02bf6758..a3e03d4af953a 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java +++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.infra.datanode; -import org.apache.shardingsphere.infra.exception.metadata.datanode.InvalidDataNodeFormatException; +import org.apache.shardingsphere.infra.exception.kernel.metadata.datanode.InvalidDataNodeFormatException; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLExceptionTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLExceptionTest.java similarity index 94% rename from infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLExceptionTest.java rename to infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLExceptionTest.java index efec1879ce729..d010d4d8c0070 100644 --- a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/DatabaseProtocolSQLExceptionTest.java +++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/DatabaseProtocolSQLExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.junit.jupiter.api.Test; diff --git a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLExceptionTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLExceptionTest.java similarity index 94% rename from infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLExceptionTest.java rename to infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLExceptionTest.java index 538ec9b868df6..9c9d91361ef28 100644 --- a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnknownSQLExceptionTest.java +++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnknownSQLExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.junit.jupiter.api.Test; diff --git a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationExceptionTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationExceptionTest.java similarity index 94% rename from infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationExceptionTest.java rename to infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationExceptionTest.java index 4ce0094c156e2..b0818aea7523f 100644 --- a/infra/exception/core/src/test/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/UnsupportedSQLOperationExceptionTest.java +++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/exception/generic/UnsupportedSQLOperationExceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.exception.core.external.sql.type.generic; +package org.apache.shardingsphere.infra.exception.generic; import org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState; import org.junit.jupiter.api.Test; diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java index 13765ad4d5289..dd326098d6b15 100644 --- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java +++ b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java @@ -25,7 +25,6 @@ import org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData; import org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; -import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnknownSQLException; import java.sql.SQLException; import java.util.Collection; @@ -74,7 +73,7 @@ public static Map load(final Collection