From 68d583a26c34bfed0f531053d8561d885adb98b6 Mon Sep 17 00:00:00 2001 From: tristaZero Date: Wed, 12 Dec 2018 20:15:42 +0800 Subject: [PATCH] use shade --- .../core/constant/properties/ShardingProperties.java | 4 ++-- .../core/executor/ShardingExecuteEngine.java | 6 +++--- .../core/executor/ShardingThreadFactoryBuilder.java | 2 +- .../executor/sql/prepare/SQLExecutePrepareTemplate.java | 2 +- .../datasource/dialect/SQLServerDataSourceMetaData.java | 2 +- .../io/shardingsphere/core/parsing/SQLParsingEngine.java | 2 +- .../antlr/extractor/SQLSegmentsExtractorEngine.java | 2 +- .../impl/dialect/postgresql/ShowParamExtractor.java | 2 +- .../dialect/sqlserver/SQLServerAddIndexExtractor.java | 2 +- .../sqlserver/SQLServerAddPrimaryKeyExtractor.java | 2 +- .../dialect/sqlserver/SQLServerAutoCommitExtractor.java | 4 ++-- .../dialect/sqlserver/SQLServerDropIndexExtractor.java | 2 +- .../parsing/antlr/filler/SQLStatementFillerEngine.java | 2 +- .../antlr/optimizer/SQLStatementOptimizerEngine.java | 2 +- .../core/parsing/antlr/parser/SQLParserEngine.java | 2 +- .../statement/SQLStatementRuleDefinitionEntityLoader.java | 2 +- .../antlr/rule/registry/statement/SQLStatementRule.java | 2 +- .../registry/statement/SQLStatementRuleDefinition.java | 8 ++++---- .../sqlserver/clause/SQLServerWhereClauseParser.java | 2 +- .../java/io/shardingsphere/core/rewrite/SQLBuilder.java | 2 +- .../io/shardingsphere/core/rewrite/SQLRewriteEngine.java | 4 ++-- .../java/io/shardingsphere/core/rule/ShardingRule.java | 6 +++--- .../main/java/io/shardingsphere/core/util/SQLLogger.java | 2 +- .../main/java/io/shardingsphere/core/util/SQLUtil.java | 2 +- .../shardingsphere/core/util/ShardingExecutorService.java | 4 ++-- .../api/algorithm/common/ShardingStrategyTest.java | 4 ++-- .../merger/dal/show/ShowCreateTableMergedResultTest.java | 2 +- .../core/merger/dal/show/ShowTablesMergedResultTest.java | 2 +- .../datasource/ShardingDataSourceMetaDataTest.java | 2 +- .../shardingsphere/core/rewrite/SQLRewriteEngineTest.java | 4 ++-- .../core/rule/ShardingDataSourceNamesTest.java | 2 +- .../jdbc/core/statement/ShardingPreparedStatement.java | 6 +++--- .../jdbc/core/statement/ShardingStatement.java | 2 +- .../jdbc/core/datasource/ShardingDataSourceTest.java | 2 +- .../io/shardingsphere/opentracing/ShardingTracer.java | 2 +- .../internal/eventbus/ShardingOrchestrationEventBus.java | 2 +- .../shardingproxy/runtime/schema/ShardingSchema.java | 2 +- .../java/io/shardingsphere/test/sql/SQLCasesLoader.java | 4 ++-- .../xa/convert/dialect/SQLServerXAProperty.java | 2 +- 39 files changed, 55 insertions(+), 55 deletions(-) diff --git a/sharding-core/src/main/java/io/shardingsphere/core/constant/properties/ShardingProperties.java b/sharding-core/src/main/java/io/shardingsphere/core/constant/properties/ShardingProperties.java index 7eb80daae9..ce1cf72861 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/constant/properties/ShardingProperties.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/constant/properties/ShardingProperties.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.constant.properties; -import shardingsphere.shaded.common.base.Joiner; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Joiner; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.core.util.StringUtil; import lombok.Getter; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingExecuteEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingExecuteEngine.java index e780c06956..efb8e279ce 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingExecuteEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingExecuteEngine.java @@ -17,9 +17,9 @@ package io.shardingsphere.core.executor; -import shardingsphere.shaded.common.collect.Lists; -import shardingsphere.shaded.common.util.concurrent.ListenableFuture; -import shardingsphere.shaded.common.util.concurrent.ListeningExecutorService; +import io.shardingsphere.shaded.com.google.common.collect.Lists; +import io.shardingsphere.shaded.com.google.common.util.concurrent.ListenableFuture; +import io.shardingsphere.shaded.com.google.common.util.concurrent.ListeningExecutorService; import io.shardingsphere.core.exception.ShardingException; import io.shardingsphere.core.util.ShardingExecutorService; import java.sql.SQLException; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingThreadFactoryBuilder.java b/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingThreadFactoryBuilder.java index 5e8a5b7756..795ab2af66 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingThreadFactoryBuilder.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/executor/ShardingThreadFactoryBuilder.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.executor; -import shardingsphere.shaded.common.util.concurrent.ThreadFactoryBuilder; +import io.shardingsphere.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java b/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java index 213c90b442..6553c6f8bf 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.executor.sql.prepare; -import shardingsphere.shaded.common.collect.Lists; +import io.shardingsphere.shaded.com.google.common.collect.Lists; import io.shardingsphere.core.constant.ConnectionMode; import io.shardingsphere.core.executor.ShardingExecuteGroup; import io.shardingsphere.core.executor.StatementExecuteUnit; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java index 7c0ee413a1..d2346c22e8 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.metadata.datasource.dialect; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.core.exception.ShardingException; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import lombok.Getter; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/SQLParsingEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/SQLParsingEngine.java index cf24a4cc31..c469d59863 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/SQLParsingEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/SQLParsingEngine.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing; -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.metadata.table.ShardingTableMetaData; import io.shardingsphere.core.parsing.cache.ParsingResultCache; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/SQLSegmentsExtractorEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/SQLSegmentsExtractorEngine.java index 7dc664d7c2..d8ef09d697 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/SQLSegmentsExtractorEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/SQLSegmentsExtractorEngine.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.extractor; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.parser.SQLAST; import io.shardingsphere.core.parsing.antlr.sql.segment.SQLSegment; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/postgresql/ShowParamExtractor.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/postgresql/ShowParamExtractor.java index c93bd39def..5bc4890da5 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/postgresql/ShowParamExtractor.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/postgresql/ShowParamExtractor.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.extractor.impl.dialect.postgresql; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.extractor.util.ExtractorUtils; import io.shardingsphere.core.parsing.antlr.extractor.util.RuleName; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddIndexExtractor.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddIndexExtractor.java index 78fbbf3a75..b4b78736de 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddIndexExtractor.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddIndexExtractor.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.extractor.impl.dialect.sqlserver; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.extractor.impl.IndexNameExtractor; import io.shardingsphere.core.parsing.antlr.extractor.util.ExtractorUtils; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddPrimaryKeyExtractor.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddPrimaryKeyExtractor.java index 2934a772bf..4ed4e3bed4 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddPrimaryKeyExtractor.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAddPrimaryKeyExtractor.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.extractor.impl.dialect.sqlserver; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.extractor.util.ExtractorUtils; import io.shardingsphere.core.parsing.antlr.extractor.util.RuleName; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAutoCommitExtractor.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAutoCommitExtractor.java index ab6a3afaf2..a2c76e9fe9 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAutoCommitExtractor.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerAutoCommitExtractor.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.parsing.antlr.extractor.impl.dialect.sqlserver; -import shardingsphere.shaded.common.base.Optional; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.shardingsphere.core.constant.transaction.TransactionOperationType; import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.extractor.util.ExtractorUtils; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerDropIndexExtractor.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerDropIndexExtractor.java index e421ece27a..079c2b8a37 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerDropIndexExtractor.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/dialect/sqlserver/SQLServerDropIndexExtractor.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.extractor.impl.dialect.sqlserver; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.extractor.impl.IndexNameExtractor; import io.shardingsphere.core.parsing.antlr.extractor.util.ExtractorUtils; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/SQLStatementFillerEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/SQLStatementFillerEngine.java index 9aaaf12638..2d03d4d024 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/SQLStatementFillerEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/SQLStatementFillerEngine.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.filler; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.metadata.table.ShardingTableMetaData; import io.shardingsphere.core.parsing.antlr.rule.registry.ParsingRuleRegistry; import io.shardingsphere.core.parsing.antlr.rule.registry.statement.SQLStatementRule; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/optimizer/SQLStatementOptimizerEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/optimizer/SQLStatementOptimizerEngine.java index 8801df9ef2..73b02997cf 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/optimizer/SQLStatementOptimizerEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/optimizer/SQLStatementOptimizerEngine.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.optimizer; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.metadata.table.ShardingTableMetaData; import io.shardingsphere.core.parsing.antlr.rule.registry.statement.SQLStatementRule; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/parser/SQLParserEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/parser/SQLParserEngine.java index 9f877233e9..e2ff662827 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/parser/SQLParserEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/parser/SQLParserEngine.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.parser; -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.antlr.parser.impl.SQLParserFactory; import io.shardingsphere.core.parsing.antlr.rule.registry.ParsingRuleRegistry; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/jaxb/loader/statement/SQLStatementRuleDefinitionEntityLoader.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/jaxb/loader/statement/SQLStatementRuleDefinitionEntityLoader.java index 6ff3b63202..054f977111 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/jaxb/loader/statement/SQLStatementRuleDefinitionEntityLoader.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/jaxb/loader/statement/SQLStatementRuleDefinitionEntityLoader.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.rule.jaxb.loader.statement; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.shardingsphere.core.parsing.antlr.rule.jaxb.entity.statement.SQLStatementRuleDefinitionEntity; import io.shardingsphere.core.parsing.antlr.rule.jaxb.loader.RuleDefinitionEntityLoader; import lombok.SneakyThrows; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRule.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRule.java index d46db2be8c..e16a5cebec 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRule.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRule.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.antlr.rule.registry.statement; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.parsing.antlr.extractor.SQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.optimizer.SQLStatementOptimizer; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRuleDefinition.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRuleDefinition.java index 4dfbdc01ce..f798b9a4e2 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRuleDefinition.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/rule/registry/statement/SQLStatementRuleDefinition.java @@ -17,10 +17,10 @@ package io.shardingsphere.core.parsing.antlr.rule.registry.statement; -import shardingsphere.shaded.common.base.CaseFormat; -import shardingsphere.shaded.common.base.Joiner; -import shardingsphere.shaded.common.base.Splitter; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.CaseFormat; +import io.shardingsphere.shaded.com.google.common.base.Joiner; +import io.shardingsphere.shaded.com.google.common.base.Splitter; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.core.parsing.antlr.extractor.SQLSegmentExtractor; import io.shardingsphere.core.parsing.antlr.optimizer.SQLStatementOptimizer; import io.shardingsphere.core.parsing.antlr.rule.jaxb.entity.statement.SQLStatementRuleDefinitionEntity; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/sqlserver/clause/SQLServerWhereClauseParser.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/sqlserver/clause/SQLServerWhereClauseParser.java index 841983a854..dba9f3b292 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/sqlserver/clause/SQLServerWhereClauseParser.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/sqlserver/clause/SQLServerWhereClauseParser.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.parsing.parser.dialect.sqlserver.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.Keyword; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLBuilder.java b/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLBuilder.java index 509fa590db..83d5809fd6 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLBuilder.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLBuilder.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.rewrite; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData; import io.shardingsphere.core.optimizer.condition.ShardingCondition; import io.shardingsphere.core.optimizer.insert.InsertShardingCondition; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLRewriteEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLRewriteEngine.java index 6a90319462..3d843bf62f 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLRewriteEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/rewrite/SQLRewriteEngine.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.rewrite; -import shardingsphere.shaded.common.base.Optional; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData; import io.shardingsphere.core.optimizer.condition.ShardingConditions; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/rule/ShardingRule.java b/sharding-core/src/main/java/io/shardingsphere/core/rule/ShardingRule.java index be60bf5d16..db88b941af 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/rule/ShardingRule.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/rule/ShardingRule.java @@ -17,9 +17,9 @@ package io.shardingsphere.core.rule; -import shardingsphere.shaded.common.base.Optional; -import shardingsphere.shaded.common.base.Preconditions; -import shardingsphere.shaded.common.base.Strings; +import io.shardingsphere.shaded.com.google.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Strings; import io.shardingsphere.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.api.config.ShardingRuleConfiguration; import io.shardingsphere.api.config.TableRuleConfiguration; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/util/SQLLogger.java b/sharding-core/src/main/java/io/shardingsphere/core/util/SQLLogger.java index d814b34672..5b10bc5fd1 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/util/SQLLogger.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/util/SQLLogger.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.util; -import shardingsphere.shaded.common.base.Joiner; +import io.shardingsphere.shaded.com.google.common.base.Joiner; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; import io.shardingsphere.core.routing.RouteUnit; import lombok.AccessLevel; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/util/SQLUtil.java b/sharding-core/src/main/java/io/shardingsphere/core/util/SQLUtil.java index 747eaeb3fc..3b50ae1877 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/util/SQLUtil.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/util/SQLUtil.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.util; -import shardingsphere.shaded.common.base.CharMatcher; +import io.shardingsphere.shaded.com.google.common.base.CharMatcher; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.parsing.lexer.dialect.mysql.MySQLKeyword; import io.shardingsphere.core.parsing.lexer.token.DefaultKeyword; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/util/ShardingExecutorService.java b/sharding-core/src/main/java/io/shardingsphere/core/util/ShardingExecutorService.java index 2e4932d1f3..671b567c19 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/util/ShardingExecutorService.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/util/ShardingExecutorService.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.util; -import shardingsphere.shaded.common.util.concurrent.ListeningExecutorService; -import shardingsphere.shaded.common.util.concurrent.MoreExecutors; +import io.shardingsphere.shaded.com.google.common.util.concurrent.ListeningExecutorService; +import io.shardingsphere.shaded.com.google.common.util.concurrent.MoreExecutors; import io.shardingsphere.core.executor.ShardingThreadFactoryBuilder; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/sharding-core/src/test/java/io/shardingsphere/api/algorithm/common/ShardingStrategyTest.java b/sharding-core/src/test/java/io/shardingsphere/api/algorithm/common/ShardingStrategyTest.java index 0b98cf9a3b..b8a03cccfd 100644 --- a/sharding-core/src/test/java/io/shardingsphere/api/algorithm/common/ShardingStrategyTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/api/algorithm/common/ShardingStrategyTest.java @@ -17,8 +17,8 @@ package io.shardingsphere.api.algorithm.common; -import shardingsphere.shaded.common.collect.Range; -import shardingsphere.shaded.common.collect.Sets; +import io.shardingsphere.shaded.com.google.common.collect.Range; +import io.shardingsphere.shaded.com.google.common.collect.Sets; import io.shardingsphere.api.algorithm.fixture.TestComplexKeysShardingAlgorithm; import io.shardingsphere.api.algorithm.fixture.TestPreciseShardingAlgorithm; import io.shardingsphere.api.algorithm.fixture.TestRangeShardingAlgorithm; diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowCreateTableMergedResultTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowCreateTableMergedResultTest.java index a4d7a50416..ba92278f90 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowCreateTableMergedResultTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowCreateTableMergedResultTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.merger.dal.show; -import shardingsphere.shaded.common.collect.Lists; +import io.shardingsphere.shaded.com.google.common.collect.Lists; import io.shardingsphere.api.algorithm.fixture.TestComplexKeysShardingAlgorithm; import io.shardingsphere.api.config.ShardingRuleConfiguration; import io.shardingsphere.api.config.TableRuleConfiguration; diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java index 2c021d3d03..b487df31a6 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.merger.dal.show; -import shardingsphere.shaded.common.collect.Lists; +import io.shardingsphere.shaded.com.google.common.collect.Lists; import io.shardingsphere.api.algorithm.fixture.TestComplexKeysShardingAlgorithm; import io.shardingsphere.api.config.ShardingRuleConfiguration; import io.shardingsphere.api.config.TableRuleConfiguration; diff --git a/sharding-core/src/test/java/io/shardingsphere/core/metadata/datasource/ShardingDataSourceMetaDataTest.java b/sharding-core/src/test/java/io/shardingsphere/core/metadata/datasource/ShardingDataSourceMetaDataTest.java index 2da4151a6b..51035faf02 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/metadata/datasource/ShardingDataSourceMetaDataTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/metadata/datasource/ShardingDataSourceMetaDataTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.metadata.datasource; -import shardingsphere.shaded.common.collect.Lists; +import io.shardingsphere.shaded.com.google.common.collect.Lists; import io.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType; import io.shardingsphere.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.api.config.ShardingRuleConfiguration; diff --git a/sharding-core/src/test/java/io/shardingsphere/core/rewrite/SQLRewriteEngineTest.java b/sharding-core/src/test/java/io/shardingsphere/core/rewrite/SQLRewriteEngineTest.java index 79e369c272..0d4beb3f10 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/rewrite/SQLRewriteEngineTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/rewrite/SQLRewriteEngineTest.java @@ -17,8 +17,8 @@ package io.shardingsphere.core.rewrite; -import shardingsphere.shaded.common.base.Optional; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.constant.OrderDirection; import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData; diff --git a/sharding-core/src/test/java/io/shardingsphere/core/rule/ShardingDataSourceNamesTest.java b/sharding-core/src/test/java/io/shardingsphere/core/rule/ShardingDataSourceNamesTest.java index 6fedba5853..dee1728cb3 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/rule/ShardingDataSourceNamesTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/rule/ShardingDataSourceNamesTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.rule; -import shardingsphere.shaded.common.collect.Sets; +import io.shardingsphere.shaded.com.google.common.collect.Sets; import io.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType; import io.shardingsphere.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.api.config.ShardingRuleConfiguration; diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java index 98e2b0eed3..6b6f191ac0 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java @@ -17,9 +17,9 @@ package io.shardingsphere.shardingjdbc.jdbc.core.statement; -import shardingsphere.shaded.common.base.Function; -import shardingsphere.shaded.common.base.Optional; -import shardingsphere.shaded.common.collect.Collections2; +import io.shardingsphere.shaded.com.google.common.base.Function; +import io.shardingsphere.shaded.com.google.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.collect.Collections2; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java index a2879a78dc..b364868ae4 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingjdbc.jdbc.core.statement; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java index c47f76210c..928ba7992b 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingjdbc.jdbc.core.datasource; -import shardingsphere.shaded.common.base.Joiner; +import io.shardingsphere.shaded.com.google.common.base.Joiner; import io.shardingsphere.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType; import io.shardingsphere.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.api.config.ShardingRuleConfiguration; diff --git a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTracer.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTracer.java index eae043ef76..3020bfe6f4 100644 --- a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTracer.java +++ b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTracer.java @@ -17,7 +17,7 @@ package io.shardingsphere.opentracing; -import shardingsphere.shaded.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; import io.shardingsphere.core.exception.ShardingException; diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/eventbus/ShardingOrchestrationEventBus.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/eventbus/ShardingOrchestrationEventBus.java index e7b19d3608..703c02d4a2 100644 --- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/eventbus/ShardingOrchestrationEventBus.java +++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/eventbus/ShardingOrchestrationEventBus.java @@ -17,7 +17,7 @@ package io.shardingsphere.orchestration.internal.eventbus; -import shardingsphere.shaded.common.eventbus.EventBus; +import io.shardingsphere.shaded.com.google.common.eventbus.EventBus; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/schema/ShardingSchema.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/schema/ShardingSchema.java index 6167cd904f..1bf1b1baca 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/schema/ShardingSchema.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/schema/ShardingSchema.java @@ -17,7 +17,7 @@ package io.shardingsphere.shardingproxy.runtime.schema; -import shardingsphere.shaded.common.eventbus.Subscribe; +import io.shardingsphere.shaded.com.google.common.eventbus.Subscribe; import io.shardingsphere.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; diff --git a/sharding-sql-test/src/main/java/io/shardingsphere/test/sql/SQLCasesLoader.java b/sharding-sql-test/src/main/java/io/shardingsphere/test/sql/SQLCasesLoader.java index 0283e3d6bd..ea13616ccb 100644 --- a/sharding-sql-test/src/main/java/io/shardingsphere/test/sql/SQLCasesLoader.java +++ b/sharding-sql-test/src/main/java/io/shardingsphere/test/sql/SQLCasesLoader.java @@ -17,9 +17,9 @@ package io.shardingsphere.test.sql; +import io.shardingsphere.shaded.com.google.common.base.Preconditions; +import io.shardingsphere.shaded.com.google.common.base.Strings; import lombok.SneakyThrows; -import shardingsphere.shaded.common.base.Preconditions; -import shardingsphere.shaded.common.base.Strings; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/sharding-transaction/sharding-transaction-xa/src/main/java/io/shardingsphere/transaction/xa/convert/dialect/SQLServerXAProperty.java b/sharding-transaction/sharding-transaction-xa/src/main/java/io/shardingsphere/transaction/xa/convert/dialect/SQLServerXAProperty.java index dcd57ac648..8465cb71e6 100644 --- a/sharding-transaction/sharding-transaction-xa/src/main/java/io/shardingsphere/transaction/xa/convert/dialect/SQLServerXAProperty.java +++ b/sharding-transaction/sharding-transaction-xa/src/main/java/io/shardingsphere/transaction/xa/convert/dialect/SQLServerXAProperty.java @@ -17,7 +17,7 @@ package io.shardingsphere.transaction.xa.convert.dialect; -import shardingsphere.shaded.common.base.Optional; +import io.shardingsphere.shaded.com.google.common.base.Optional; import io.shardingsphere.core.metadata.datasource.dialect.SQLServerDataSourceMetaData; import io.shardingsphere.core.rule.DataSourceParameter; import lombok.RequiredArgsConstructor; -- GitLab