This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 69d49aa Unify usage of class.getCanonicalName() and class.getName()
(#15125)
69d49aa is described below
commit 69d49aaa77a3e9b8a1f0655d09779e8de4a93e5e
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 27 19:25:07 2022 +0800
Unify usage of class.getCanonicalName() and class.getName() (#15125)
---
.../query/DatabaseDiscoveryHeartbeatQueryResultSet.java | 2 +-
.../handler/query/DatabaseDiscoveryRuleQueryResultSet.java | 2 +-
.../handler/query/DatabaseDiscoveryTypeQueryResultSet.java | 2 +-
.../AlterDatabaseDiscoveryHeartbeatStatementUpdater.java | 2 +-
.../update/AlterDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
.../update/AlterDatabaseDiscoveryTypeStatementUpdater.java | 2 +-
.../CreateDatabaseDiscoveryHeartbeatStatementUpdater.java | 2 +-
.../update/CreateDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
.../update/CreateDatabaseDiscoveryTypeStatementUpdater.java | 2 +-
.../DropDatabaseDiscoveryHeartbeatStatementUpdater.java | 2 +-
.../update/DropDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
.../update/DropDatabaseDiscoveryTypeStatementUpdater.java | 2 +-
.../org/apache/shardingsphere/encrypt/rule/EncryptRule.java | 6 +++---
.../distsql/handler/query/EncryptRuleQueryResultSet.java | 2 +-
.../handler/update/AlterEncryptRuleStatementUpdater.java | 2 +-
.../handler/update/CreateEncryptRuleStatementUpdater.java | 2 +-
.../handler/update/DropEncryptRuleStatementUpdater.java | 4 ++--
.../handler/query/ReadwriteSplittingRuleQueryResultSet.java | 2 +-
.../update/AlterReadwriteSplittingRuleStatementUpdater.java | 2 +-
.../update/CreateReadwriteSplittingRuleStatementUpdater.java | 6 +++---
.../update/DropReadwriteSplittingRuleStatementUpdater.java | 2 +-
.../distsql/handler/query/ShadowAlgorithmQueryResultSet.java | 2 +-
.../distsql/handler/query/ShadowRuleQueryResultSet.java | 2 +-
.../distsql/handler/query/ShadowTableRuleQueryResultSet.java | 2 +-
.../handler/update/AlterShadowAlgorithmStatementUpdater.java | 2 +-
.../handler/update/AlterShadowRuleStatementUpdater.java | 2 +-
.../update/CreateDefaultShadowAlgorithmStatementUpdater.java | 2 +-
.../update/CreateShadowAlgorithmStatementUpdater.java | 2 +-
.../handler/update/CreateShadowRuleStatementUpdater.java | 2 +-
.../handler/update/DropShadowAlgorithmStatementUpdater.java | 2 +-
.../handler/update/DropShadowRuleStatementUpdater.java | 2 +-
.../scaling/distsql/handler/ApplyScalingUpdater.java | 2 +-
.../scaling/distsql/handler/CheckScalingQueryResultSet.java | 2 +-
.../handler/CreateShardingScalingRuleStatementUpdater.java | 6 +++---
.../handler/DisableShardingScalingRuleStatementUpdater.java | 2 +-
.../scaling/distsql/handler/DropScalingUpdater.java | 2 +-
.../handler/DropShardingScalingRuleStatementUpdater.java | 2 +-
.../handler/EnableShardingScalingRuleStatementUpdater.java | 2 +-
.../scaling/distsql/handler/ResetScalingUpdater.java | 2 +-
.../handler/ShowScalingCheckAlgorithmsQueryResultSet.java | 2 +-
.../distsql/handler/ShowScalingJobStatusQueryResultSet.java | 2 +-
.../distsql/handler/ShowScalingListQueryResultSet.java | 2 +-
.../scaling/distsql/handler/StartScalingUpdater.java | 2 +-
.../distsql/handler/StopScalingSourceWritingUpdater.java | 2 +-
.../scaling/distsql/handler/StopScalingUpdater.java | 2 +-
.../handler/query/ShardingScalingRulesQueryResultSet.java | 2 +-
.../AlterShardingTableRuleStatementPreprocessor.java | 2 +-
.../handler/query/DefaultShardingStrategyQueryResultSet.java | 2 +-
.../handler/query/ShardingAlgorithmQueryResultSet.java | 2 +-
.../query/ShardingBindingTableRuleQueryResultSet.java | 2 +-
.../query/ShardingBroadcastTableRuleQueryResultSet.java | 2 +-
.../handler/query/ShardingKeyGeneratorsQueryResultSet.java | 2 +-
.../handler/query/ShardingTableNodesQueryResultSet.java | 9 +++------
.../handler/query/ShardingTableRuleQueryResultSet.java | 2 +-
.../query/UnusedShardingAlgorithmsQueryResultSet.java | 4 ++--
.../query/UnusedShardingKeyGeneratorsQueryResultSet.java | 4 ++--
.../update/AlterDefaultShardingStrategyStatementUpdater.java | 2 +-
.../update/AlterShardingAlgorithmStatementUpdater.java | 2 +-
.../AlterShardingBindingTableRuleStatementUpdater.java | 2 +-
.../AlterShardingBroadcastTableRuleStatementUpdater.java | 2 +-
.../update/AlterShardingKeyGeneratorStatementUpdater.java | 2 +-
.../update/AlterShardingTableRuleStatementUpdater.java | 2 +-
.../CreateDefaultShardingStrategyStatementUpdater.java | 2 +-
.../update/CreateShardingAlgorithmStatementUpdater.java | 2 +-
.../CreateShardingBindingTableRuleStatementUpdater.java | 2 +-
.../CreateShardingBroadcastTableRuleStatementUpdater.java | 2 +-
.../update/CreateShardingKeyGeneratorStatementUpdater.java | 2 +-
.../update/CreateShardingTableRuleStatementUpdater.java | 2 +-
.../handler/update/DropDefaultStrategyStatementUpdater.java | 2 +-
.../update/DropShardingAlgorithmStatementUpdater.java | 2 +-
.../update/DropShardingBindingTableRuleStatementUpdater.java | 2 +-
.../DropShardingBroadcastTableRuleStatementUpdater.java | 2 +-
.../update/DropShardingKeyGeneratorStatementUpdater.java | 6 +++---
.../update/DropShardingTableRuleStatementUpdater.java | 2 +-
.../pool/destroyer/impl/HikariDataSourcePoolDestroyer.java | 2 +-
.../pool/metadata/impl/HikariDataSourcePoolMetaData.java | 2 +-
.../pool/metadata/DataSourcePoolMetaDataFactoryTest.java | 2 +-
.../infra/datasource/props/DataSourcePropertiesTest.java | 6 +++---
.../config/swapper/YamlDataSourcePropertiesSwapperTest.java | 12 ++++++------
.../namespace/SpringNamespaceWithShardingForClusterTest.java | 2 +-
.../data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java | 2 +-
.../shardingsphere/mode/manager/ContextManagerTest.java | 4 ++--
.../text/distsql/rdl/resource/ResourceSegmentsConverter.java | 2 +-
.../rule/AlterDefaultSingleTableRuleStatementUpdater.java | 2 +-
.../rule/CreateDefaultSingleTableRuleStatementUpdater.java | 2 +-
.../rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java | 2 +-
.../text/distsql/rql/resource/DataSourceQueryResultSet.java | 2 +-
.../text/distsql/rql/rule/SchemaRulesQueryResultSet.java | 4 ++--
.../text/distsql/rql/rule/SingleTableQueryResultSet.java | 2 +-
.../distsql/rql/rule/SingleTableRulesQueryResultSet.java | 2 +-
.../distsql/fixture/FixtureRuleDefinitionCreateUpdater.java | 2 +-
91 files changed, 113 insertions(+), 116 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryHeartbeatQueryResultSet.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryHea
[...]
index 54923ee..91c08d0 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryHeartbeatQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryHeartbeatQueryResultSet.java
@@ -63,6 +63,6 @@ public final class DatabaseDiscoveryHeartbeatQueryResultSet
implements DistSQLRe
@Override
public String getType() {
- return
ShowDatabaseDiscoveryHeartbeatsStatement.class.getCanonicalName();
+ return ShowDatabaseDiscoveryHeartbeatsStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQuer
[...]
index 094b72c..6810c43 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java
@@ -110,6 +110,6 @@ public final class DatabaseDiscoveryRuleQueryResultSet
implements DistSQLResultS
@Override
public String getType() {
- return ShowDatabaseDiscoveryRulesStatement.class.getCanonicalName();
+ return ShowDatabaseDiscoveryRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSet.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQuer
[...]
index e189b59..2c51994 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSet.java
@@ -63,6 +63,6 @@ public final class DatabaseDiscoveryTypeQueryResultSet
implements DistSQLResultS
@Override
public String getType() {
- return ShowDatabaseDiscoveryTypesStatement.class.getCanonicalName();
+ return ShowDatabaseDiscoveryTypesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryHeartbeatStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDataba
[...]
index d59527c..249e21f 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryHeartbeatStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryHeartbeatStatementUpdater.java
@@ -85,6 +85,6 @@ public final class
AlterDatabaseDiscoveryHeartbeatStatementUpdater implements Ru
@Override
public String getType() {
- return
AlterDatabaseDiscoveryHeartbeatStatement.class.getCanonicalName();
+ return AlterDatabaseDiscoveryHeartbeatStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDis
[...]
index 794e59e..cb9a721 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
@@ -149,6 +149,6 @@ public final class
AlterDatabaseDiscoveryRuleStatementUpdater implements RuleDef
@Override
public String getType() {
- return AlterDatabaseDiscoveryRuleStatement.class.getCanonicalName();
+ return AlterDatabaseDiscoveryRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryTypeStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDis
[...]
index 4767ccc..f015889 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryTypeStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryTypeStatementUpdater.java
@@ -107,6 +107,6 @@ public final class
AlterDatabaseDiscoveryTypeStatementUpdater implements RuleDef
@Override
public String getType() {
- return AlterDatabaseDiscoveryTypeStatement.class.getCanonicalName();
+ return AlterDatabaseDiscoveryTypeStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryHeartbeatStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateData
[...]
index 0635da6..5e3d9f5 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryHeartbeatStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryHeartbeatStatementUpdater.java
@@ -77,6 +77,6 @@ public final class
CreateDatabaseDiscoveryHeartbeatStatementUpdater implements R
@Override
public String getType() {
- return
CreateDatabaseDiscoveryHeartbeatStatement.class.getCanonicalName();
+ return CreateDatabaseDiscoveryHeartbeatStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseD
[...]
index cc3dc26..fc14784 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
@@ -131,6 +131,6 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
@Override
public String getType() {
- return CreateDatabaseDiscoveryRuleStatement.class.getCanonicalName();
+ return CreateDatabaseDiscoveryRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryTypeStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseD
[...]
index dbcfbaf..7d57b69 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryTypeStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryTypeStatementUpdater.java
@@ -97,6 +97,6 @@ public final class
CreateDatabaseDiscoveryTypeStatementUpdater implements RuleDe
@Override
public String getType() {
- return CreateDatabaseDiscoveryTypeStatement.class.getCanonicalName();
+ return CreateDatabaseDiscoveryTypeStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabase
[...]
index d250d63..f6b7cab 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java
@@ -82,6 +82,6 @@ public final class
DropDatabaseDiscoveryHeartbeatStatementUpdater implements Rul
@Override
public String getType() {
- return
DropDatabaseDiscoveryHeartbeatStatement.class.getCanonicalName();
+ return DropDatabaseDiscoveryHeartbeatStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDisco
[...]
index 84dd787..74ce19a 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java
@@ -92,6 +92,6 @@ public final class DropDatabaseDiscoveryRuleStatementUpdater
implements RuleDefi
@Override
public String getType() {
- return DropDatabaseDiscoveryRuleStatement.class.getCanonicalName();
+ return DropDatabaseDiscoveryRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDisco
[...]
index bfec5bc..23b42c9 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java
@@ -88,6 +88,6 @@ public final class DropDatabaseDiscoveryTypeStatementUpdater
implements RuleDefi
@Override
public String getType() {
- return DropDatabaseDiscoveryTypeStatement.class.getCanonicalName();
+ return DropDatabaseDiscoveryTypeStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
index 0b450af..1dc2fa4 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
@@ -167,9 +167,9 @@ public final class EncryptRule implements SchemaRule,
TableContainedRule {
if (!tables.containsKey(logicTable)) {
return Optional.empty();
}
- Optional<EncryptAlgorithm> encryptAlgorithm =
tables.get(logicTable).findEncryptorName(logicColumn).map(encryptors::get);
- encryptAlgorithm.ifPresent(optional -> mergeProps(optional,
EncryptPropertiesBuilder.getProperties(schemaName, "", logicTable,
logicColumn)));
- return encryptAlgorithm;
+ Optional<EncryptAlgorithm> result =
tables.get(logicTable).findEncryptorName(logicColumn).map(encryptors::get);
+ result.ifPresent(optional -> mergeProps(optional,
EncryptPropertiesBuilder.getProperties(schemaName, "", logicTable,
logicColumn)));
+ return result;
}
@SuppressWarnings("rawtypes")
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
index 7c27304..c3dd595 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
@@ -89,6 +89,6 @@ public final class EncryptRuleQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowEncryptRulesStatement.class.getCanonicalName();
+ return ShowEncryptRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java
index 4e23839..d3db6cc 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java
@@ -120,6 +120,6 @@ public final class AlterEncryptRuleStatementUpdater
implements RuleDefinitionAlt
@Override
public String getType() {
- return AlterEncryptRuleStatement.class.getCanonicalName();
+ return AlterEncryptRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
index 39c0784..cc04e28 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
@@ -94,6 +94,6 @@ public final class CreateEncryptRuleStatementUpdater
implements RuleDefinitionCr
@Override
public String getType() {
- return CreateEncryptRuleStatement.class.getCanonicalName();
+ return CreateEncryptRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
index f7c7976..92b6346 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
@@ -76,7 +76,7 @@ public final class DropEncryptRuleStatementUpdater implements
RuleDefinitionDrop
private boolean isEncryptorInUse(final EncryptRuleConfiguration
currentRuleConfig, final String toBeDroppedEncryptorName) {
for (EncryptTableRuleConfiguration each :
currentRuleConfig.getTables()) {
- if (each.getColumns().stream().filter(column ->
column.getEncryptorName().equals(toBeDroppedEncryptorName)).findAny().isPresent())
{
+ if (each.getColumns().stream().anyMatch(column ->
column.getEncryptorName().equals(toBeDroppedEncryptorName))) {
return true;
}
}
@@ -90,6 +90,6 @@ public final class DropEncryptRuleStatementUpdater implements
RuleDefinitionDrop
@Override
public String getType() {
- return DropEncryptRuleStatement.class.getCanonicalName();
+ return DropEncryptRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwrite
[...]
index c745944..0a1ad89 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSet.java
@@ -128,6 +128,6 @@ public final class ReadwriteSplittingRuleQueryResultSet
implements DistSQLResult
@Override
public String getType() {
- return ShowReadwriteSplittingRulesStatement.class.getCanonicalName();
+ return ShowReadwriteSplittingRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/r
[...]
index ec2ec04..c477754 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
@@ -158,6 +158,6 @@ public final class
AlterReadwriteSplittingRuleStatementUpdater implements RuleDe
@Override
public String getType() {
- return AlterReadwriteSplittingRuleStatement.class.getCanonicalName();
+ return AlterReadwriteSplittingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/
[...]
index 59ad340..19d94fa 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
@@ -98,8 +98,8 @@ public final class
CreateReadwriteSplittingRuleStatementUpdater implements RuleD
Collection<String> result = new LinkedHashSet<>();
Optional<ExportableRule> exportableRule =
shardingSphereMetaData.getRuleMetaData().findRules(ExportableRule.class).stream()
.filter(each ->
each.containExportableKey(Collections.singletonList(ExportableConstants.EXPORTABLE_KEY_PRIMARY_DATA_SOURCE))).findAny();
- exportableRule.ifPresent(op -> {
- Map<String, Object> exportData =
op.export(Collections.singletonList(ExportableConstants.EXPORTABLE_KEY_PRIMARY_DATA_SOURCE));
+ exportableRule.ifPresent(optional -> {
+ Map<String, Object> exportData =
optional.export(Collections.singletonList(ExportableConstants.EXPORTABLE_KEY_PRIMARY_DATA_SOURCE));
Set<String> logicResources = ((Map<String, String>)
exportData.getOrDefault(ExportableConstants.EXPORTABLE_KEY_PRIMARY_DATA_SOURCE,
Collections.emptyMap())).keySet();
result.addAll(logicResources);
});
@@ -134,6 +134,6 @@ public final class
CreateReadwriteSplittingRuleStatementUpdater implements RuleD
@Override
public String getType() {
- return CreateReadwriteSplittingRuleStatement.class.getCanonicalName();
+ return CreateReadwriteSplittingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/re
[...]
index cbcd30f..f786792 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
@@ -89,6 +89,6 @@ public final class DropReadwriteSplittingRuleStatementUpdater
implements RuleDef
@Override
public String getType() {
- return DropReadwriteSplittingRuleStatement.class.getCanonicalName();
+ return DropReadwriteSplittingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmQueryResultSet.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmQueryResultSet.java
index 39aa08e..2a225f0 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmQueryResultSet.java
@@ -86,6 +86,6 @@ public final class ShadowAlgorithmQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowShadowAlgorithmsStatement.class.getCanonicalName();
+ return ShowShadowAlgorithmsStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowRuleQueryResultSet.java
index 6bb1576..2445675 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowRuleQueryResultSet.java
@@ -119,6 +119,6 @@ public final class ShadowRuleQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowShadowRulesStatement.class.getCanonicalName();
+ return ShowShadowRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
index 05e7455..301b289 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
@@ -90,6 +90,6 @@ public final class ShadowTableRuleQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowShadowTableRulesStatement.class.getCanonicalName();
+ return ShowShadowTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowAlgorithmStatementUpdater.java
index fc22ceb..70b3be7 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowAlgorithmStatementUpdater.java
@@ -83,6 +83,6 @@ public final class AlterShadowAlgorithmStatementUpdater
implements RuleDefinitio
@Override
public String getType() {
- return AlterShadowAlgorithmStatement.class.getCanonicalName();
+ return AlterShadowAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java
index 7c9f218..73b2364 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java
@@ -106,6 +106,6 @@ public final class AlterShadowRuleStatementUpdater
implements RuleDefinitionAlte
@Override
public String getType() {
- return AlterShadowRuleStatement.class.getCanonicalName();
+ return AlterShadowRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java
index a5b07cc..9cd3fee 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java
@@ -63,6 +63,6 @@ public final class
CreateDefaultShadowAlgorithmStatementUpdater implements RuleD
@Override
public String getType() {
- return CreateDefaultShadowAlgorithmStatement.class.getCanonicalName();
+ return CreateDefaultShadowAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowAlgorithmStatementUpdater.java
index 635c8cc..df65d91 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowAlgorithmStatementUpdater.java
@@ -94,6 +94,6 @@ public final class CreateShadowAlgorithmStatementUpdater
implements RuleDefiniti
@Override
public String getType() {
- return CreateShadowAlgorithmStatement.class.getCanonicalName();
+ return CreateShadowAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java
index 7fb3b61..b707091 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java
@@ -96,6 +96,6 @@ public final class CreateShadowRuleStatementUpdater
implements RuleDefinitionCre
@Override
public String getType() {
- return CreateShadowRuleStatement.class.getCanonicalName();
+ return CreateShadowRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
index 2fe1642..6c29b4c 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
@@ -94,6 +94,6 @@ public final class DropShadowAlgorithmStatementUpdater
implements RuleDefinition
@Override
public String getType() {
- return DropShadowAlgorithmStatement.class.getCanonicalName();
+ return DropShadowAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
index 7c4e259..9e09fe6 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
@@ -65,6 +65,6 @@ public final class DropShadowRuleStatementUpdater implements
RuleDefinitionDropU
@Override
public String getType() {
- return DropShadowRuleStatement.class.getCanonicalName();
+ return DropShadowRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ApplyScalingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ApplyScalingUpdater.java
index 4259dc0..735f987 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ApplyScalingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ApplyScalingUpdater.java
@@ -36,6 +36,6 @@ public final class ApplyScalingUpdater implements
RALUpdater<ApplyScalingStateme
@Override
public String getType() {
- return ApplyScalingStatement.class.getCanonicalName();
+ return ApplyScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CheckScalingQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CheckScalingQueryResultSet.java
index 4bc284d..4dd7f5e 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CheckScalingQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CheckScalingQueryResultSet.java
@@ -79,6 +79,6 @@ public final class CheckScalingQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return CheckScalingStatement.class.getCanonicalName();
+ return CheckScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CreateShardingScalingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CreateShardingScalingRuleStatementUpdater.java
index 243a065..20dc278 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CreateShardingScalingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/CreateShardingScalingRuleStatementUpdater.java
@@ -37,7 +37,7 @@ import org.apache.shardingsphere.spi.singleton.SingletonSPI;
import org.apache.shardingsphere.spi.singleton.TypedSingletonSPIHolder;
import org.apache.shardingsphere.spi.typed.TypedSPI;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
@@ -72,7 +72,7 @@ public final class CreateShardingScalingRuleStatementUpdater
implements RuleDefi
private void checkDuplicate(final String schemaName, final
CreateShardingScalingRuleStatement sqlStatement, final
ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
if
(currentRuleConfig.getScaling().containsKey(sqlStatement.getScalingName())) {
- throw new DuplicateRuleException("Scaling", schemaName,
Arrays.asList(sqlStatement.getScalingName()));
+ throw new DuplicateRuleException("Scaling", schemaName,
Collections.singletonList(sqlStatement.getScalingName()));
}
}
@@ -160,6 +160,6 @@ public final class
CreateShardingScalingRuleStatementUpdater implements RuleDefi
@Override
public String getType() {
- return CreateShardingScalingRuleStatement.class.getCanonicalName();
+ return CreateShardingScalingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DisableShardingScalingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DisableShardingScalingRuleStatementUpdater.java
index c6fad91..c66170d 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DisableShardingScalingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DisableShardingScalingRuleStatementUpdater.java
@@ -74,6 +74,6 @@ public final class DisableShardingScalingRuleStatementUpdater
implements RuleDef
@Override
public String getType() {
- return DisableShardingScalingRuleStatement.class.getCanonicalName();
+ return DisableShardingScalingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropScalingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropScalingUpdater.java
index 2523dc9..19cd469 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropScalingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropScalingUpdater.java
@@ -36,6 +36,6 @@ public final class DropScalingUpdater implements
RALUpdater<DropScalingStatement
@Override
public String getType() {
- return DropScalingStatement.class.getCanonicalName();
+ return DropScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropShardingScalingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropShardingScalingRuleStatementUpdater.java
index 93a8c55..b921353 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropShardingScalingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/DropShardingScalingRuleStatementUpdater.java
@@ -70,6 +70,6 @@ public final class DropShardingScalingRuleStatementUpdater
implements RuleDefini
@Override
public String getType() {
- return DropShardingScalingRuleStatement.class.getCanonicalName();
+ return DropShardingScalingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/EnableShardingScalingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/EnableShardingScalingRuleStatementUpdater.java
index 02f47d6..2e4cb19 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/EnableShardingScalingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/EnableShardingScalingRuleStatementUpdater.java
@@ -76,6 +76,6 @@ public final class EnableShardingScalingRuleStatementUpdater
implements RuleDefi
@Override
public String getType() {
- return EnableShardingScalingRuleStatement.class.getCanonicalName();
+ return EnableShardingScalingRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ResetScalingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ResetScalingUpdater.java
index 56605c7..0248115 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ResetScalingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ResetScalingUpdater.java
@@ -36,6 +36,6 @@ public final class ResetScalingUpdater implements
RALUpdater<ResetScalingStateme
@Override
public String getType() {
- return ResetScalingStatement.class.getCanonicalName();
+ return ResetScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingCheckAlgorithmsQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingCheckAlgorithmsQueryResultSet.java
index de0b96d..e58cfff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingCheckAlgorithmsQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingCheckAlgorithmsQueryResultSet.java
@@ -70,6 +70,6 @@ public final class ShowScalingCheckAlgorithmsQueryResultSet
implements DistSQLRe
@Override
public String getType() {
- return ShowScalingCheckAlgorithmsStatement.class.getCanonicalName();
+ return ShowScalingCheckAlgorithmsStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingJobStatusQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingJobStatusQueryResultSet.java
index 7e18b26..254e954 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingJobStatusQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingJobStatusQueryResultSet.java
@@ -82,6 +82,6 @@ public final class ShowScalingJobStatusQueryResultSet
implements DistSQLResultSe
@Override
public String getType() {
- return ShowScalingStatusStatement.class.getCanonicalName();
+ return ShowScalingStatusStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingListQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingListQueryResultSet.java
index 9ffc8e2..b6f74b8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingListQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/ShowScalingListQueryResultSet.java
@@ -71,6 +71,6 @@ public final class ShowScalingListQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowScalingListStatement.class.getCanonicalName();
+ return ShowScalingListStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StartScalingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StartScalingUpdater.java
index 8b705ff..0cecb0f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StartScalingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StartScalingUpdater.java
@@ -36,6 +36,6 @@ public final class StartScalingUpdater implements
RALUpdater<StartScalingStateme
@Override
public String getType() {
- return StartScalingStatement.class.getCanonicalName();
+ return StartScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingSourceWritingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingSourceWritingUpdater.java
index aa1cee9..0a29107 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingSourceWritingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingSourceWritingUpdater.java
@@ -36,6 +36,6 @@ public final class StopScalingSourceWritingUpdater implements
RALUpdater<StopSca
@Override
public String getType() {
- return StopScalingSourceWritingStatement.class.getCanonicalName();
+ return StopScalingSourceWritingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingUpdater.java
index 3dd833b..761d39f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/StopScalingUpdater.java
@@ -36,6 +36,6 @@ public final class StopScalingUpdater implements
RALUpdater<StopScalingStatement
@Override
public String getType() {
- return StopScalingStatement.class.getCanonicalName();
+ return StopScalingStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
index 74a8541..fdf65ae 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
@@ -80,6 +80,6 @@ public final class ShardingScalingRulesQueryResultSet
implements DistSQLResultSe
@Override
public String getType() {
- return ShowShardingScalingRulesStatement.class.getCanonicalName();
+ return ShowShardingScalingRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/preprocess/AlterShardingTableRuleStatementPreprocessor.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/preprocess/AlterShardingTableRuleStatementPrepro
[...]
index 284532c..326dd33 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/preprocess/AlterShardingTableRuleStatementPreprocessor.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/preprocess/AlterShardingTableRuleStatementPreprocessor.java
@@ -28,7 +28,7 @@ public final class
AlterShardingTableRuleStatementPreprocessor implements RuleDe
@Override
public String getType() {
- return AlterShardingTableRuleStatement.class.getCanonicalName();
+ return AlterShardingTableRuleStatement.class.getName();
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/DefaultShardingStrategyQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/DefaultShardingStrategyQueryResultSet.java
index 4e46d12..2eabd5f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/DefaultShardingStrategyQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/DefaultShardingStrategyQueryResultSet.java
@@ -91,6 +91,6 @@ public final class DefaultShardingStrategyQueryResultSet
implements DistSQLResul
@Override
public String getType() {
- return ShowDefaultShardingStrategyStatement.class.getCanonicalName();
+ return ShowDefaultShardingStrategyStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmQueryResultSet.java
index 0bba598..1ec2946 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmQueryResultSet.java
@@ -78,6 +78,6 @@ public final class ShardingAlgorithmQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowShardingAlgorithmsStatement.class.getCanonicalName();
+ return ShowShardingAlgorithmsStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBindingTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBindingTableRuleQueryResultSet.java
index f17f1a5..fcbfeff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBindingTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBindingTableRuleQueryResultSet.java
@@ -59,6 +59,6 @@ public final class ShardingBindingTableRuleQueryResultSet
implements DistSQLResu
@Override
public String getType() {
- return ShowShardingBindingTableRulesStatement.class.getCanonicalName();
+ return ShowShardingBindingTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBroadcastTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBroadcastTableRuleQueryResultSet.java
index 2674fed..d6d777d 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBroadcastTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingBroadcastTableRuleQueryResultSet.java
@@ -59,6 +59,6 @@ public final class ShardingBroadcastTableRuleQueryResultSet
implements DistSQLRe
@Override
public String getType() {
- return
ShowShardingBroadcastTableRulesStatement.class.getCanonicalName();
+ return ShowShardingBroadcastTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingKeyGeneratorsQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingKeyGeneratorsQueryResultSet.java
index f1b78e9..8c95952 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingKeyGeneratorsQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingKeyGeneratorsQueryResultSet.java
@@ -62,6 +62,6 @@ public final class ShardingKeyGeneratorsQueryResultSet
implements DistSQLResultS
@Override
public String getType() {
- return ShowShardingKeyGeneratorsStatement.class.getCanonicalName();
+ return ShowShardingKeyGeneratorsStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableNodesQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableNodesQueryResultSet.java
index e7e54a0..15687c3 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableNodesQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableNodesQueryResultSet.java
@@ -76,17 +76,14 @@ public final class ShardingTableNodesQueryResultSet
implements DistSQLResultSet
}
private int getTotalShardingCount(final ShardingRuleConfiguration
ruleConfiguration, final ShardingAutoTableRuleConfiguration
shardingAutoTableRuleConfig) {
- int result = 0;
Map<String, ShardingSphereAlgorithmConfiguration> shardingAlgorithms =
ruleConfiguration.getShardingAlgorithms();
ShardingStrategyConfiguration shardingStrategy =
shardingAutoTableRuleConfig.getShardingStrategy();
if (useDefaultStrategy(shardingStrategy, ruleConfiguration)) {
int tableCount =
getShardingCount(shardingAlgorithms.get(ruleConfiguration.getDefaultTableShardingStrategy().getShardingAlgorithmName()));
int databaseCount =
getShardingCount(shardingAlgorithms.get(ruleConfiguration.getDefaultDatabaseShardingStrategy().getShardingAlgorithmName()));
- result = tableCount * databaseCount;
- } else {
- result =
getShardingCount(shardingAlgorithms.get(shardingStrategy.getShardingAlgorithmName()));
+ return tableCount * databaseCount;
}
- return result;
+ return
getShardingCount(shardingAlgorithms.get(shardingStrategy.getShardingAlgorithmName()));
}
private boolean useDefaultStrategy(final ShardingStrategyConfiguration
currentShardingStrategy, final ShardingRuleConfiguration ruleConfiguration) {
@@ -147,6 +144,6 @@ public final class ShardingTableNodesQueryResultSet
implements DistSQLResultSet
@Override
public String getType() {
- return ShowShardingTableNodesStatement.class.getCanonicalName();
+ return ShowShardingTableNodesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
index ffd4fad..409f877 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
@@ -204,6 +204,6 @@ public final class ShardingTableRuleQueryResultSet
implements DistSQLResultSet {
@Override
public String getType() {
- return ShowShardingTableRulesStatement.class.getCanonicalName();
+ return ShowShardingTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
index a65e81c..9e042cd 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
@@ -45,7 +45,7 @@ import java.util.Properties;
*/
public final class UnusedShardingAlgorithmsQueryResultSet implements
DistSQLResultSet {
- private static final String TYPE =
ShowUnusedShardingAlgorithmsStatement.class.getCanonicalName();
+ private static final String TYPE =
ShowUnusedShardingAlgorithmsStatement.class.getName();
private static final String NAME = "name";
@@ -59,7 +59,7 @@ public final class UnusedShardingAlgorithmsQueryResultSet
implements DistSQLResu
public void init(final ShardingSphereMetaData metaData, final SQLStatement
sqlStatement) {
Optional<ShardingRuleConfiguration> ruleConfig =
metaData.getRuleMetaData().getConfigurations()
.stream().filter(each -> each instanceof
ShardingRuleConfiguration).map(each -> (ShardingRuleConfiguration)
each).findAny();
- ruleConfig.ifPresent(rule -> getUnusedShardingAlgorithms(rule));
+ ruleConfig.ifPresent(this::getUnusedShardingAlgorithms);
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
index b131c17..faf9515 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
@@ -45,7 +45,7 @@ import java.util.Properties;
*/
public final class UnusedShardingKeyGeneratorsQueryResultSet implements
DistSQLResultSet {
- private static final String TYPE =
ShowUnusedShardingKeyGeneratorsStatement.class.getCanonicalName();
+ private static final String TYPE =
ShowUnusedShardingKeyGeneratorsStatement.class.getName();
private static final String NAME = "name";
@@ -59,7 +59,7 @@ public final class UnusedShardingKeyGeneratorsQueryResultSet
implements DistSQLR
public void init(final ShardingSphereMetaData metaData, final SQLStatement
sqlStatement) {
Optional<ShardingRuleConfiguration> ruleConfig =
metaData.getRuleMetaData().getConfigurations()
.stream().filter(each -> each instanceof
ShardingRuleConfiguration).map(each -> (ShardingRuleConfiguration)
each).findAny();
- ruleConfig.ifPresent(rule -> getUnusedKeyGenerators(rule));
+ ruleConfig.ifPresent(this::getUnusedKeyGenerators);
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
index 0b98a64..a2852f8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
@@ -40,7 +40,7 @@ import java.util.Optional;
*/
public final class AlterDefaultShardingStrategyStatementUpdater implements
RuleDefinitionAlterUpdater<AlterDefaultShardingStrategyStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
AlterDefaultShardingStrategyStatement.class.getCanonicalName();
+ private static final String TYPE =
AlterDefaultShardingStrategyStatement.class.getName();
@Override
public void checkSQLStatement(final ShardingSphereMetaData
shardingSphereMetaData, final AlterDefaultShardingStrategyStatement
sqlStatement,
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAlgorithmStatementUpdater.java
index f221ba1..e34b9cb 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAlgorithmStatementUpdater.java
@@ -93,6 +93,6 @@ public final class AlterShardingAlgorithmStatementUpdater
implements RuleDefinit
@Override
public String getType() {
- return AlterShardingAlgorithmStatement.class.getCanonicalName();
+ return AlterShardingAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBindingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBindingTableRuleStatementUpdater.java
index ba870ae..02cd57f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBindingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBindingTableRuleStatementUpdater.java
@@ -107,6 +107,6 @@ public final class
AlterShardingBindingTableRuleStatementUpdater implements Rule
@Override
public String getType() {
- return
AlterShardingBindingTableRulesStatement.class.getCanonicalName();
+ return AlterShardingBindingTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBroadcastTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBroadcastTableRuleStatementU
[...]
index 58af5a2..3a4d339 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBroadcastTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingBroadcastTableRuleStatementUpdater.java
@@ -69,6 +69,6 @@ public final class
AlterShardingBroadcastTableRuleStatementUpdater implements Ru
@Override
public String getType() {
- return
AlterShardingBroadcastTableRulesStatement.class.getCanonicalName();
+ return AlterShardingBroadcastTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorStatementUpdater.java
index 97f6212..545aed9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorStatementUpdater.java
@@ -93,6 +93,6 @@ public final class AlterShardingKeyGeneratorStatementUpdater
implements RuleDefi
@Override
public String getType() {
- return AlterShardingKeyGeneratorStatement.class.getCanonicalName();
+ return AlterShardingKeyGeneratorStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
index 2d9b528..8816ee6 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java
@@ -92,6 +92,6 @@ public final class AlterShardingTableRuleStatementUpdater
implements RuleDefinit
@Override
public String getType() {
- return AlterShardingTableRuleStatement.class.getCanonicalName();
+ return AlterShardingTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
index 09820cf..f6109b7 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
@@ -41,7 +41,7 @@ import java.util.Optional;
*/
public final class CreateDefaultShardingStrategyStatementUpdater implements
RuleDefinitionCreateUpdater<CreateDefaultShardingStrategyStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
CreateDefaultShardingStrategyStatement.class.getCanonicalName();
+ private static final String TYPE =
CreateDefaultShardingStrategyStatement.class.getName();
@Override
public void checkSQLStatement(final ShardingSphereMetaData
shardingSphereMetaData, final CreateDefaultShardingStrategyStatement
sqlStatement,
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingAlgorithmStatementUpdater.java
index c33e8cb..4bcca7b 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingAlgorithmStatementUpdater.java
@@ -100,6 +100,6 @@ public final class CreateShardingAlgorithmStatementUpdater
implements RuleDefini
@Override
public String getType() {
- return CreateShardingAlgorithmStatement.class.getCanonicalName();
+ return CreateShardingAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpd
[...]
index c72cf56..2b0a47d 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
@@ -104,6 +104,6 @@ public final class
CreateShardingBindingTableRuleStatementUpdater implements Rul
@Override
public String getType() {
- return
CreateShardingBindingTableRulesStatement.class.getCanonicalName();
+ return CreateShardingBindingTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatemen
[...]
index 99263f1..88e0970 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
@@ -62,6 +62,6 @@ public final class
CreateShardingBroadcastTableRuleStatementUpdater implements R
@Override
public String getType() {
- return
CreateShardingBroadcastTableRulesStatement.class.getCanonicalName();
+ return CreateShardingBroadcastTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorStatementUpdater.java
index 91533d8..71db7b6 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorStatementUpdater.java
@@ -99,6 +99,6 @@ public final class CreateShardingKeyGeneratorStatementUpdater
implements RuleDef
@Override
public String getType() {
- return CreateShardingKeyGeneratorStatement.class.getCanonicalName();
+ return CreateShardingKeyGeneratorStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
index bd567bb..b773e38 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
@@ -65,6 +65,6 @@ public final class CreateShardingTableRuleStatementUpdater
implements RuleDefini
@Override
public String getType() {
- return CreateShardingTableRuleStatement.class.getCanonicalName();
+ return CreateShardingTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
index 93ebcc5..a51000a 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
@@ -74,6 +74,6 @@ public final class DropDefaultStrategyStatementUpdater
implements RuleDefinition
@Override
public String getType() {
- return DropDefaultShardingStrategyStatement.class.getCanonicalName();
+ return DropDefaultShardingStrategyStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
index 2651fd1..ad862f8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
@@ -114,6 +114,6 @@ public final class DropShardingAlgorithmStatementUpdater
implements RuleDefiniti
@Override
public String getType() {
- return DropShardingAlgorithmStatement.class.getCanonicalName();
+ return DropShardingAlgorithmStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
index d21e938..dd69122 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
@@ -69,6 +69,6 @@ public final class
DropShardingBindingTableRuleStatementUpdater implements RuleD
@Override
public String getType() {
- return DropShardingBindingTableRulesStatement.class.getCanonicalName();
+ return DropShardingBindingTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpd
[...]
index 9639202..72dc4b2 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java
@@ -71,6 +71,6 @@ public final class
DropShardingBroadcastTableRuleStatementUpdater implements Rul
@Override
public String getType() {
- return
DropShardingBroadcastTableRulesStatement.class.getCanonicalName();
+ return DropShardingBroadcastTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
index 9c412b4..8d7d369 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
@@ -40,13 +40,13 @@ import java.util.stream.Collectors;
*/
public final class DropShardingKeyGeneratorStatementUpdater implements
RuleDefinitionDropUpdater<DropShardingKeyGeneratorStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
DropShardingKeyGeneratorStatement.class.getCanonicalName();
+ private static final String TYPE =
DropShardingKeyGeneratorStatement.class.getName();
@Override
public void checkSQLStatement(final ShardingSphereMetaData
shardingSphereMetaData, final DropShardingKeyGeneratorStatement sqlStatement,
final ShardingRuleConfiguration
currentRuleConfig) throws DistSQLException {
String schemaName = shardingSphereMetaData.getName();
- Collection<String> keyGeneratorNames =
sqlStatement.getKeyGeneratorNames().stream().collect(Collectors.toCollection(LinkedList::new));
+ Collection<String> keyGeneratorNames = new
LinkedList<>(sqlStatement.getKeyGeneratorNames());
checkDuplicate(schemaName, keyGeneratorNames);
checkExist(schemaName, keyGeneratorNames, currentRuleConfig);
checkInUsed(schemaName, keyGeneratorNames, currentRuleConfig);
@@ -65,7 +65,7 @@ public final class DropShardingKeyGeneratorStatementUpdater
implements RuleDefin
private void checkInUsed(final String schemaName, final Collection<String>
keyGeneratorNames, final ShardingRuleConfiguration currentRuleConfig) throws
DistSQLException {
Collection<String> usedKeyGenerators =
getUsedKeyGenerators(currentRuleConfig);
- Collection<String> inUsedNames =
keyGeneratorNames.stream().filter(each ->
usedKeyGenerators.contains(each)).collect(Collectors.toCollection(LinkedList::new));
+ Collection<String> inUsedNames =
keyGeneratorNames.stream().filter(usedKeyGenerators::contains).collect(Collectors.toCollection(LinkedList::new));
DistSQLException.predictionThrow(inUsedNames.isEmpty(), new
KeyGeneratorInUsedException("Sharding", schemaName, inUsedNames));
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
index 8af7615..eb2c6d6 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
@@ -107,6 +107,6 @@ public final class DropShardingTableRuleStatementUpdater
implements RuleDefiniti
@Override
public String getType() {
- return DropShardingTableRuleStatement.class.getCanonicalName();
+ return DropShardingTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/impl/HikariDataSourcePoolDestroyer.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/impl/HikariDataSourcePoolDestroyer.java
index 706ac7f..bacc43a 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/impl/HikariDataSourcePoolDestroyer.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/destroyer/impl/HikariDataSourcePoolDestroyer.java
@@ -50,6 +50,6 @@ public final class HikariDataSourcePoolDestroyer implements
DataSourcePoolDestro
@Override
public String getType() {
- return HikariDataSource.class.getCanonicalName();
+ return HikariDataSource.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/impl/HikariDataSourcePoolMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/impl/HikariDataSourcePoolMetaData.java
index 8732713..4d8cb6c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/impl/HikariDataSourcePoolMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/impl/HikariDataSourcePoolMetaData.java
@@ -89,6 +89,6 @@ public final class HikariDataSourcePoolMetaData implements
DataSourcePoolMetaDat
@Override
public String getType() {
- return HikariDataSource.class.getCanonicalName();
+ return HikariDataSource.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
index 7125806..1cb4b38 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataFactoryTest.java
@@ -34,6 +34,6 @@ public final class DataSourcePoolMetaDataFactoryTest {
@Test
public void assertNewInstanceForHikari() {
-
assertThat(DataSourcePoolMetaDataFactory.newInstance(HikariDataSource.class.getCanonicalName()),
instanceOf(HikariDataSourcePoolMetaData.class));
+
assertThat(DataSourcePoolMetaDataFactory.newInstance(HikariDataSource.class.getName()),
instanceOf(HikariDataSourcePoolMetaData.class));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
index 0962951..434599b 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
@@ -48,14 +48,14 @@ public final class DataSourcePropertiesTest {
@Test
public void assertGetDataSourceConfigurationWithConnectionInitSqls() {
BasicDataSource actualDataSource = new BasicDataSource();
-
actualDataSource.setDriverClassName(MockedDataSource.class.getCanonicalName());
+ actualDataSource.setDriverClassName(MockedDataSource.class.getName());
actualDataSource.setUrl("jdbc:mock://127.0.0.1/foo_ds");
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
DataSourceProperties actual =
DataSourcePropertiesCreator.create(actualDataSource);
assertThat(actual.getDataSourceClassName(),
is(BasicDataSource.class.getName()));
-
assertThat(actual.getAllLocalProperties().get("driverClassName").toString(),
is(MockedDataSource.class.getCanonicalName()));
+
assertThat(actual.getAllLocalProperties().get("driverClassName").toString(),
is(MockedDataSource.class.getName()));
assertThat(actual.getAllLocalProperties().get("url").toString(),
is("jdbc:mock://127.0.0.1/foo_ds"));
assertThat(actual.getAllLocalProperties().get("username").toString(),
is("root"));
assertThat(actual.getAllLocalProperties().get("password").toString(),
is("root"));
@@ -90,7 +90,7 @@ public final class DataSourcePropertiesTest {
private Map<String, Object> getProperties() {
Map<String, Object> result = new HashMap<>(7, 1);
- result.put("driverClassName",
MockedDataSource.class.getCanonicalName());
+ result.put("driverClassName", MockedDataSource.class.getName());
result.put("jdbcUrl", "jdbc:mock://127.0.0.1/foo_ds");
result.put("username", "root");
result.put("password", "root");
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourcePropertiesSwapperTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourcePropertiesSwapperTest.java
index abf35be..5f7c62c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourcePropertiesSwapperTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourcePropertiesSwapperTest.java
@@ -39,12 +39,12 @@ public final class YamlDataSourcePropertiesSwapperTest {
Map<String, Map<String, Object>> yamlConfig = createYamlConfig();
Map<String, DataSource> dataSources =
swapper.swapToDataSources(yamlConfig);
HikariDataSource actual0 = (HikariDataSource) dataSources.get("ds_0");
- assertThat(actual0.getDriverClassName(),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actual0.getDriverClassName(),
is(MockedDataSource.class.getName()));
assertThat(actual0.getJdbcUrl(), is("jdbc:mock://127.0.0.1/ds_0"));
assertThat(actual0.getUsername(), is("root"));
assertThat(actual0.getPassword(), is("root"));
HikariDataSource actual1 = (HikariDataSource) dataSources.get("ds_1");
- assertThat(actual1.getDriverClassName(),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actual1.getDriverClassName(),
is(MockedDataSource.class.getName()));
assertThat(actual1.getJdbcUrl(), is("jdbc:mock://127.0.0.1/ds_1"));
assertThat(actual1.getUsername(), is("root"));
assertThat(actual1.getPassword(), is("root"));
@@ -53,11 +53,11 @@ public final class YamlDataSourcePropertiesSwapperTest {
@Test
public void assertSwapToDataSourceProperties() {
Map<String, Object> yamlConfig = new HashMap<>(3, 1);
- yamlConfig.put("dataSourceClassName",
MockedDataSource.class.getCanonicalName());
+ yamlConfig.put("dataSourceClassName",
MockedDataSource.class.getName());
yamlConfig.put("url", "xx:xxx");
yamlConfig.put("username", "root");
DataSourceProperties actual =
swapper.swapToDataSourceProperties(yamlConfig);
- assertThat(actual.getDataSourceClassName(),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actual.getDataSourceClassName(),
is(MockedDataSource.class.getName()));
assertThat(actual.getAllLocalProperties().size(), is(2));
assertThat(actual.getAllLocalProperties().get("url").toString(),
is("xx:xxx"));
assertThat(actual.getAllLocalProperties().get("username").toString(),
is("root"));
@@ -66,7 +66,7 @@ public final class YamlDataSourcePropertiesSwapperTest {
@Test
public void assertSwapToMap() {
Map<String, Object> actual = swapper.swapToMap(new
DataSourceProperties(MockedDataSource.class.getName(), createProperties()));
- assertThat(actual.get("dataSourceClassName"),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actual.get("dataSourceClassName"),
is(MockedDataSource.class.getName()));
assertThat(actual.get("url").toString(), is("xx:xxx"));
assertThat(actual.get("username").toString(), is("root"));
}
@@ -88,7 +88,7 @@ public final class YamlDataSourcePropertiesSwapperTest {
private Map<String, Object> createPropertyMap(final String name) {
Map<String, Object> result = new LinkedHashMap<>(5, 1);
result.put("dataSourceClassName",
"com.zaxxer.hikari.HikariDataSource");
- result.put("driverClassName",
MockedDataSource.class.getCanonicalName());
+ result.put("driverClassName", MockedDataSource.class.getName());
result.put("jdbcUrl", String.format("jdbc:mock://127.0.0.1/%s", name));
result.put("username", "root");
result.put("password", "root");
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithShardingForClusterTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithShardingForClusterTest.java
index 38b633e..3a8ec31 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithShardingForClusterTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/SpringNamespaceWithShardingForClusterTest.java
@@ -67,7 +67,7 @@ public final class SpringNamespaceWithShardingForClusterTest
extends AbstractJUn
ShardingRule shardingRule =
getShardingRule("shardingRuleWithAttributesDataSourceGovernance");
assertNotNull(dataSourceMap.get("dbtbl_0"));
assertNotNull(dataSourceMap.get("dbtbl_1"));
-
assertThat(shardingRule.getDefaultKeyGenerateAlgorithm().getClass().getName(),
is(IncrementKeyGenerateAlgorithm.class.getCanonicalName()));
+
assertThat(shardingRule.getDefaultKeyGenerateAlgorithm().getClass().getName(),
is(IncrementKeyGenerateAlgorithm.class.getName()));
}
@Test
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
index 0687305..4655a4f 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
@@ -152,7 +152,7 @@ public final class RuleAlteredJobAPIImpl extends
AbstractPipelineJobAPIImpl impl
}
log.info("Start scaling job by {}", jobConfig.getHandleConfig());
PipelineAPIFactory.getGovernanceRepositoryAPI().persist(String.format("%s/%s",
- DataPipelineConstants.DATA_PIPELINE_ROOT,
jobConfig.getHandleConfig().getJobId()),
RuleAlteredJob.class.getCanonicalName());
+ DataPipelineConstants.DATA_PIPELINE_ROOT,
jobConfig.getHandleConfig().getJobId()), RuleAlteredJob.class.getName());
PipelineAPIFactory.getGovernanceRepositoryAPI().persist(String.format("%s/%s/config",
DataPipelineConstants.DATA_PIPELINE_ROOT,
jobConfig.getHandleConfig().getJobId()), createJobConfig(jobConfig));
return Optional.of(jobConfig.getHandleConfig().getJobId());
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 2588679..818ae3b 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -293,7 +293,7 @@ public final class ContextManagerTest {
assertThat(actual.getUrl(), is("jdbc:mock://127.0.0.1/foo_ds"));
assertThat(actual.getPassword(), is("test"));
assertThat(actual.getUsername(), is("test"));
- assertThat(actual.getDriverClassName(),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actual.getDriverClassName(),
is(MockedDataSource.class.getName()));
}
@Test
@@ -365,7 +365,7 @@ public final class ContextManagerTest {
assertTrue(contextManager.getMetaDataContexts().getMetaDataMap().containsKey("test_schema"));
assertThat(contextManager.getMetaDataContexts().getMetaDataMap().get("test_schema").getResource().getDataSources().size(),
is(1));
MockedDataSource actualDs = (MockedDataSource)
contextManager.getMetaDataContexts().getMetaData("test_schema").getResource().getDataSources().get("ds_1");
- assertThat(actualDs.getDriverClassName(),
is(MockedDataSource.class.getCanonicalName()));
+ assertThat(actualDs.getDriverClassName(),
is(MockedDataSource.class.getName()));
assertThat(actualDs.getUrl(), is("jdbc:mock://127.0.0.1/foo_ds"));
assertThat(actualDs.getPassword(), is("test"));
assertThat(actualDs.getUsername(), is("test"));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/ResourceSegmentsConverter.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/ResourceSegmentsConverter.java
index acef452..a3aec6f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/ResourceSegmentsConverter.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/ResourceSegmentsConverter.java
@@ -44,7 +44,7 @@ public final class ResourceSegmentsConverter {
public static Map<String, DataSourceProperties> convert(final DatabaseType
databaseType, final Collection<DataSourceSegment> resources) {
Map<String, DataSourceProperties> result = new
LinkedHashMap<>(resources.size(), 1);
for (DataSourceSegment each : resources) {
- result.put(each.getName(), new
DataSourceProperties(HikariDataSource.class.getCanonicalName(),
createProperties(databaseType, each)));
+ result.put(each.getName(), new
DataSourceProperties(HikariDataSource.class.getName(),
createProperties(databaseType, each)));
}
return result;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/AlterDefaultSingleTableRuleStatementUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/AlterDefaultSingleTableRuleStatementUpdater.java
index b20253d..cf06547 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/AlterDefaultSingleTableRuleStatementUpdater.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/AlterDefaultSingleTableRuleStatementUpdater.java
@@ -75,6 +75,6 @@ public final class
AlterDefaultSingleTableRuleStatementUpdater implements RuleDe
@Override
public String getType() {
- return AlterDefaultSingleTableRuleStatement.class.getCanonicalName();
+ return AlterDefaultSingleTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/CreateDefaultSingleTableRuleStatementUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/CreateDefaultSingleTableRuleStatementUpdater.java
index c0ce135..3bf2d8e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/CreateDefaultSingleTableRuleStatementUpdater.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/CreateDefaultSingleTableRuleStatementUpdater.java
@@ -72,6 +72,6 @@ public final class
CreateDefaultSingleTableRuleStatementUpdater implements RuleD
@Override
public String getType() {
- return CreateDefaultSingleTableRuleStatement.class.getCanonicalName();
+ return CreateDefaultSingleTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
index 6648ad2..fd0a140 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
@@ -53,6 +53,6 @@ public final class DropDefaultSingleTableRuleStatementUpdater
implements RuleDef
@Override
public String getType() {
- return DropDefaultSingleTableRuleStatement.class.getCanonicalName();
+ return DropDefaultSingleTableRuleStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
index b77ee05..3e34e71 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
@@ -112,6 +112,6 @@ public final class DataSourceQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowResourcesStatement.class.getCanonicalName();
+ return ShowResourcesStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SchemaRulesQueryResultSet.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SchemaRulesQueryResultSet.java
index 7f29758..b47f1e0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SchemaRulesQueryResultSet.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SchemaRulesQueryResultSet.java
@@ -154,7 +154,7 @@ public final class SchemaRulesQueryResultSet implements
DistSQLResultSet {
final RuleConfiguration ruleConfiguration, final
Function<RuleConfiguration, Integer> apply) {
if (null == ruleConfiguration) {
dataMap.putIfAbsent(dataKey, buildRow(feature, type,
DEFAULT_COUNT));
- return;
+ return;
}
Class<? extends RuleConfiguration> clz = FEATURE_MAP.get(feature);
if
(!(ruleConfiguration.getClass().getCanonicalName().equals(clz.getCanonicalName())))
{
@@ -185,6 +185,6 @@ public final class SchemaRulesQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return CountSchemaRulesStatement.class.getCanonicalName();
+ return CountSchemaRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableQueryResultSet.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableQueryResultSet.java
index f57bbba..f465e70 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableQueryResultSet.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableQueryResultSet.java
@@ -69,6 +69,6 @@ public final class SingleTableQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowSingleTableStatement.class.getCanonicalName();
+ return ShowSingleTableStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableRulesQueryResultSet.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableRulesQueryResultSet.java
index 3f6cad7..ecb4b21 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableRulesQueryResultSet.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/SingleTableRulesQueryResultSet.java
@@ -60,6 +60,6 @@ public final class SingleTableRulesQueryResultSet implements
DistSQLResultSet {
@Override
public String getType() {
- return ShowSingleTableRulesStatement.class.getCanonicalName();
+ return ShowSingleTableRulesStatement.class.getName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
index 404855e..35714be 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
@@ -43,6 +43,6 @@ public final class FixtureRuleDefinitionCreateUpdater
implements RuleDefinitionC
@Override
public String getType() {
- return CreateFixtureRuleStatement.class.getCanonicalName();
+ return CreateFixtureRuleStatement.class.getName();
}
}
