diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/clause/WhereClauseParser.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/clause/WhereClauseParser.java index 2b489d77f67d6f48f8d12bd73c5e8c478fd20441..5bdea1bd9e0cdcfb391eea7e6fe8e54eab5d2545 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/clause/WhereClauseParser.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/clause/WhereClauseParser.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.parser.clause; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.parsing.lexer.LexerEngine; import io.shardingsphere.core.parsing.lexer.token.DefaultKeyword; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/yaml/masterslave/YamlMasterSlaveRuleConfiguration.java b/sharding-core/src/main/java/io/shardingsphere/core/yaml/masterslave/YamlMasterSlaveRuleConfiguration.java index 0804c5533630716f45a054ff3c59ebd39e3cc815..5eb7236a126bd352b8254ed873b001c5e728f36b 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/yaml/masterslave/YamlMasterSlaveRuleConfiguration.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/yaml/masterslave/YamlMasterSlaveRuleConfiguration.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.yaml.masterslave; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm; import io.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType; import io.shardingsphere.api.config.MasterSlaveRuleConfiguration; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingStrategyConfiguration.java b/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingStrategyConfiguration.java index 252420e1a26ea9d7409f74a9513c749aa95d9f0e..57db1887de07bac9efc94fa564836cebecade462 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingStrategyConfiguration.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingStrategyConfiguration.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.yaml.sharding; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.shardingsphere.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm; import io.shardingsphere.api.algorithm.sharding.hint.HintShardingAlgorithm; import io.shardingsphere.api.algorithm.sharding.standard.PreciseShardingAlgorithm; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlTableRuleConfiguration.java b/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlTableRuleConfiguration.java index 324d03e9a24d9e824a7798c9553b1a86f5426fee..617e60ba22ca5854605ef6ab101d2296299a34a3 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlTableRuleConfiguration.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlTableRuleConfiguration.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.yaml.sharding; -import shardingsphere.shaded.common.base.Preconditions; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.api.config.TableRuleConfiguration; import io.shardingsphere.core.keygen.KeyGeneratorFactory; import lombok.Getter; diff --git a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java index 01d619425d2febb893574dfc35f8d9accfe303ff..a6e903df4d25be6096c9dede8acaa62065d81e34 100644 --- a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java +++ b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/masterslave/YamlOrchestrationMasterSlaveIntegrateTest.java @@ -17,9 +17,9 @@ package io.shardingsphere.shardingjdbc.orchestration.api.yaml.masterslave; -import shardingsphere.shaded.common.base.Function; -import shardingsphere.shaded.common.collect.Maps; -import shardingsphere.shaded.common.collect.Sets; +import io.shardingsphere.shaded.com.google.common.base.Function; +import io.shardingsphere.shaded.com.google.common.collect.Maps; +import io.shardingsphere.shaded.com.google.common.collect.Sets; import io.shardingsphere.shardingjdbc.orchestration.api.yaml.AbstractYamlDataSourceTest; import io.shardingsphere.shardingjdbc.orchestration.api.yaml.YamlOrchestrationMasterSlaveDataSourceFactory; import io.shardingsphere.shardingjdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; diff --git a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java index d2e8a04b9dbdad715ee8c4ab64e30379b19e2543..c0996a5dc99da8431fc170b8e405c35d0d9fa484 100644 --- a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java +++ b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingIntegrateTest.java @@ -17,9 +17,9 @@ package io.shardingsphere.shardingjdbc.orchestration.api.yaml.sharding; -import shardingsphere.shaded.common.base.Function; -import shardingsphere.shaded.common.collect.Maps; -import shardingsphere.shaded.common.collect.Sets; +import io.shardingsphere.shaded.com.google.common.base.Function; +import io.shardingsphere.shaded.com.google.common.collect.Maps; +import io.shardingsphere.shaded.com.google.common.collect.Sets; import io.shardingsphere.shardingjdbc.orchestration.api.yaml.AbstractYamlDataSourceTest; import io.shardingsphere.shardingjdbc.orchestration.api.yaml.YamlOrchestrationShardingDataSourceFactory; import io.shardingsphere.shardingjdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; diff --git a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java index a2aeda78c5999b5a360722ab569dbf344260abfd..56d69cf963343a50f29c9e6f4a72ee3ad15d122a 100644 --- a/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java +++ b/sharding-jdbc/sharding-jdbc-orchestration/src/test/java/io/shardingsphere/shardingjdbc/orchestration/api/yaml/sharding/YamlOrchestrationShardingWithMasterSlaveIntegrateTest.java @@ -24,9 +24,9 @@ import lombok.RequiredArgsConstructor; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import shardingsphere.shaded.common.base.Function; -import shardingsphere.shaded.common.collect.Maps; -import shardingsphere.shaded.common.collect.Sets; +import io.shardingsphere.shaded.com.google.common.base.Function; +import io.shardingsphere.shaded.com.google.common.collect.Maps; +import io.shardingsphere.shaded.com.google.common.collect.Sets; import javax.sql.DataSource; import java.io.File; diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java index 7f7d0089db3d590cc4af5b18985229405c9d3d6c..2a5cbcd6f0a5377086cc6b28c6adbbe43a0c304e 100644 --- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java +++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java @@ -17,7 +17,7 @@ package io.shardingsphere.orchestration.yaml; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.shardingsphere.orchestration.config.OrchestrationConfiguration; import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration; import lombok.Getter; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/common/executor/UserExecutorGroup.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/common/executor/UserExecutorGroup.java index f0be7fed6e7e71a1504e23c13f3370da5216919c..8e935a514748544a78f2dd78ec71ce35b45f5d22 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/common/executor/UserExecutorGroup.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/common/executor/UserExecutorGroup.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingproxy.frontend.common.executor; -import shardingsphere.shaded.common.util.concurrent.ListeningExecutorService; +import io.shardingsphere.shaded.com.google.common.util.concurrent.ListeningExecutorService; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import io.shardingsphere.core.util.ShardingExecutorService; import io.shardingsphere.shardingproxy.runtime.GlobalRegistry; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacket.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacket.java index 33c2d56d19a0dbcdb2c0e058f67cc9ff3040290c..4c926c75d9d8139070bf11b13e8fa96f56ed3af7 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacket.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacket.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingproxy.transport.mysql.packet.command.admin; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.shardingproxy.transport.mysql.constant.ServerErrorCode; import io.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload; import io.shardingsphere.shardingproxy.transport.mysql.packet.command.CommandPacket; diff --git a/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacketTest.java b/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacketTest.java index 0891c47819241c5597ecac6b40e116dd84bc27e7..617bc430aa5559edf544ad31ab7c6f1271459f00 100644 --- a/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacketTest.java +++ b/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/admin/UnsupportedCommandPacketTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingproxy.transport.mysql.packet.command.admin; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.shardingproxy.transport.mysql.constant.ServerErrorCode; import io.shardingsphere.shardingproxy.transport.mysql.packet.MySQLPacketPayload; import io.shardingsphere.shardingproxy.transport.mysql.packet.command.CommandPacketType;