You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/02/01 01:33:40 UTC
[shardingsphere] branch master updated: Unify usage of class.getCanonicalName() and class.getName() (#23880)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 991e96a08e3 Unify usage of class.getCanonicalName() and class.getName() (#23880)
991e96a08e3 is described below
commit 991e96a08e3898ca112cfcd0a222c791d82a2d1c
Author: Raigor <ra...@gmail.com>
AuthorDate: Wed Feb 1 09:33:32 2023 +0800
Unify usage of class.getCanonicalName() and class.getName() (#23880)
---
.../config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java | 4 ++--
.../agent/plugin/core/recorder/MethodTimeRecorder.java | 2 +-
.../sharding/distsql/handler/enums/ShardingStrategyType.java | 2 +-
.../handler/database/DatabaseOperateBackendHandlerFactory.java | 2 +-
.../backend/handler/distsql/DistSQLBackendHandlerFactory.java | 2 +-
.../backend/handler/distsql/ral/RALBackendHandlerFactory.java | 8 ++++----
.../handler/distsql/ral/hint/HintRALStatementExecutorFactory.java | 2 +-
.../ral/migration/update/UpdatableScalingRALBackendHandler.java | 2 +-
.../handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java | 4 ++--
.../backend/handler/distsql/rql/RQLBackendHandlerFactory.java | 4 ++--
.../backend/handler/distsql/rul/RULBackendHandlerFactory.java | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
index 05c1d3a3b3c..4a2a6a77f50 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
@@ -44,8 +44,8 @@ public final class YamlAdvisorsConfigurationLoaderTest {
}
private void assertYamlAdvisorConfiguration(final YamlAdvisorConfiguration actual) {
- assertThat(actual.getTarget(), is(YamlTargetObjectFixture.class.getCanonicalName()));
- assertThat(actual.getAdvice(), is(YamlAdviceFixture.class.getCanonicalName()));
+ assertThat(actual.getTarget(), is(YamlTargetObjectFixture.class.getName()));
+ assertThat(actual.getAdvice(), is(YamlAdviceFixture.class.getName()));
assertThat(actual.getPointcuts().size(), is(8));
List<YamlPointcutConfiguration> actualYamlPointcutConfigs = new ArrayList<>(actual.getPointcuts());
assertYamlPointcutConfiguration(actualYamlPointcutConfigs.get(0), null, "constructor", Collections.emptyList());
diff --git a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/recorder/MethodTimeRecorder.java b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/recorder/MethodTimeRecorder.java
index 2fc33dbfd67..c866649a500 100644
--- a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/recorder/MethodTimeRecorder.java
+++ b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/recorder/MethodTimeRecorder.java
@@ -59,7 +59,7 @@ public final class MethodTimeRecorder {
}
private String getKey(final Method method) {
- return String.format("%s@%s", adviceClass.getCanonicalName(), method.getName());
+ return String.format("%s@%s", adviceClass.getName(), method.getName());
}
private long getElapsedTime(final String key) {
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java
index 69fc683fea7..10889db0ae8 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/enums/ShardingStrategyType.java
@@ -176,7 +176,7 @@ public enum ShardingStrategyType {
*/
public static ShardingStrategyType getValueOf(final ShardingStrategyConfiguration shardingStrategyConfig) {
Optional<ShardingStrategyType> type = Arrays.stream(values())
- .filter(each -> shardingStrategyConfig.getClass().getCanonicalName().equals(each.getImplementedClass().getCanonicalName())).findFirst();
+ .filter(each -> shardingStrategyConfig.getClass().getName().equals(each.getImplementedClass().getName())).findFirst();
type.orElseThrow(() -> new UnsupportedOperationException(String.format("unsupported strategy type %s", shardingStrategyConfig.getClass().getName())));
return type.get();
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
index 06dd4f991d0..a7222da1404 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
@@ -50,6 +50,6 @@ public final class DatabaseOperateBackendHandlerFactory {
if (sqlStatement instanceof DropDatabaseStatement) {
return new DropDatabaseBackendHandler((DropDatabaseStatement) sqlStatement, connectionSession);
}
- throw new UnsupportedSQLOperationException(sqlStatement.getClass().getCanonicalName());
+ throw new UnsupportedSQLOperationException(sqlStatement.getClass().getName());
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
index 9f4bd7c3b47..b2db8eb1d94 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
@@ -58,6 +58,6 @@ public final class DistSQLBackendHandlerFactory {
if (sqlStatement instanceof RULStatement) {
return RULBackendHandlerFactory.newInstance((RULStatement) sqlStatement, connectionSession);
}
- throw new UnsupportedSQLOperationException(sqlStatement.getClass().getCanonicalName());
+ throw new UnsupportedSQLOperationException(sqlStatement.getClass().getName());
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
index 9278b401a1c..ac732b70cd3 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
@@ -117,17 +117,17 @@ public final class RALBackendHandlerFactory {
}
if (sqlStatement instanceof QueryableScalingRALStatement) {
return new QueryableScalingRALBackendHandler((QueryableScalingRALStatement) sqlStatement,
- (DatabaseDistSQLResultSet) TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getCanonicalName()));
+ (DatabaseDistSQLResultSet) TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getName()));
}
if (sqlStatement instanceof UpdatableScalingRALStatement) {
return new UpdatableScalingRALBackendHandler((UpdatableScalingRALStatement) sqlStatement, connectionSession);
}
if (sqlStatement instanceof QueryableGlobalRuleRALStatement) {
return new QueryableGlobalRuleRALBackendHandler(sqlStatement,
- (GlobalRuleDistSQLResultSet) TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getCanonicalName()));
+ (GlobalRuleDistSQLResultSet) TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getName()));
}
if (sqlStatement instanceof UpdatableGlobalRuleRALStatement) {
- return new UpdatableGlobalRuleRALBackendHandler(sqlStatement, TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass().getCanonicalName()));
+ return new UpdatableGlobalRuleRALBackendHandler(sqlStatement, TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass().getName()));
}
// TODO delete other if branches after replacing all query handlers with QueryableRALBackendHandler
if (TypedSPILoader.contains(QueryableRALExecutor.class, sqlStatement.getClass().getName())) {
@@ -146,7 +146,7 @@ public final class RALBackendHandlerFactory {
private static RALBackendHandler<?> createRALBackendHandler(final RALStatement sqlStatement, final ConnectionSession connectionSession) {
Class<? extends RALBackendHandler<?>> clazz = HANDLERS.get(sqlStatement.getClass());
- ShardingSpherePreconditions.checkState(null != clazz, () -> new UnsupportedSQLOperationException(String.format("Unsupported SQL statement : %s", sqlStatement.getClass().getCanonicalName())));
+ ShardingSpherePreconditions.checkState(null != clazz, () -> new UnsupportedSQLOperationException(String.format("Unsupported SQL statement : %s", sqlStatement.getClass().getName())));
RALBackendHandler<?> result = newInstance(clazz);
result.init(sqlStatement, connectionSession);
return result;
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALStatementExecutorFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALStatementExecutorFactory.java
index b3d9f0c2ca3..b4d3e48c367 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALStatementExecutorFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintRALStatementExecutorFactory.java
@@ -82,6 +82,6 @@ public final class HintRALStatementExecutorFactory {
if (sqlStatement instanceof ClearShardingHintStatement) {
return new ClearShardingHintExecutor((ClearShardingHintStatement) sqlStatement);
}
- throw new UnsupportedSQLOperationException(sqlStatement.getClass().getCanonicalName());
+ throw new UnsupportedSQLOperationException(sqlStatement.getClass().getName());
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/migration/update/UpdatableScalingRALBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/migration/update/UpdatableScalingRALBackendHandler.java
index 0c363cbf08b..285aba40818 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/migration/update/UpdatableScalingRALBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/migration/update/UpdatableScalingRALBackendHandler.java
@@ -44,7 +44,7 @@ public final class UpdatableScalingRALBackendHandler implements DistSQLBackendHa
@Override
public ResponseHeader execute() throws SQLException {
String databaseName = getDatabaseName(connectionSession);
- TypedSPILoader.getService(RALUpdater.class, sqlStatement.getClass().getCanonicalName()).executeUpdate(databaseName, sqlStatement);
+ TypedSPILoader.getService(RALUpdater.class, sqlStatement.getClass().getName()).executeUpdate(databaseName, sqlStatement);
return new UpdateResponseHeader(sqlStatement);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index 304df7c0706..df4b5b33f3e 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -51,7 +51,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
protected ResponseHeader execute(final String databaseName, final T sqlStatement) {
- RuleDefinitionUpdater ruleDefinitionUpdater = TypedSPILoader.getService(RuleDefinitionUpdater.class, sqlStatement.getClass().getCanonicalName());
+ RuleDefinitionUpdater ruleDefinitionUpdater = TypedSPILoader.getService(RuleDefinitionUpdater.class, sqlStatement.getClass().getName());
Class<? extends RuleConfiguration> ruleConfigClass = ruleDefinitionUpdater.getRuleConfigurationClass();
ShardingSphereDatabase database = ProxyContext.getInstance().getDatabase(databaseName);
RuleConfiguration currentRuleConfig = findCurrentRuleConfiguration(database, ruleConfigClass).orElse(null);
@@ -87,7 +87,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
} else if (updater instanceof RuleDefinitionDropUpdater) {
processDrop(result, sqlStatement, (RuleDefinitionDropUpdater) updater, currentRuleConfig);
} else {
- throw new UnsupportedSQLOperationException(String.format("Cannot support RDL updater type `%s`", updater.getClass().getCanonicalName()));
+ throw new UnsupportedSQLOperationException(String.format("Cannot support RDL updater type `%s`", updater.getClass().getName()));
}
return result;
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java
index be4a8e5aab2..5527bd0ca06 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java
@@ -41,14 +41,14 @@ public final class RQLBackendHandlerFactory {
*/
public static ProxyBackendHandler newInstance(final RQLStatement sqlStatement, final ConnectionSession connectionSession) {
// TODO remove this judgment after the refactoring of DistSQLResultSet is completed
- if (TypedSPILoader.contains(DistSQLResultSet.class, sqlStatement.getClass().getCanonicalName())) {
+ if (TypedSPILoader.contains(DistSQLResultSet.class, sqlStatement.getClass().getName())) {
return newInstanceByDistSQLResultSet(sqlStatement, connectionSession);
}
return new RQLBackendHandler<>(sqlStatement, connectionSession);
}
private static ProxyBackendHandler newInstanceByDistSQLResultSet(final RQLStatement sqlStatement, final ConnectionSession connectionSession) {
- DistSQLResultSet resultSet = TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getCanonicalName());
+ DistSQLResultSet resultSet = TypedSPILoader.getService(DistSQLResultSet.class, sqlStatement.getClass().getName());
return new RQLResultSetBackendHandler(sqlStatement, connectionSession, (DatabaseDistSQLResultSet) resultSet);
}
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
index 2152ff38589..cd6d292b2ce 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
@@ -69,7 +69,7 @@ public final class RULBackendHandlerFactory {
private static RULBackendHandler<?> createRULBackendHandler(final RULStatement sqlStatement, final ConnectionSession connectionSession) {
Class<? extends RULBackendHandler<?>> clazz = HANDLERS.get(sqlStatement.getClass());
- ShardingSpherePreconditions.checkState(null != clazz, () -> new UnsupportedSQLOperationException(String.format("Unsupported SQL statement : %s", sqlStatement.getClass().getCanonicalName())));
+ ShardingSpherePreconditions.checkState(null != clazz, () -> new UnsupportedSQLOperationException(String.format("Unsupported SQL statement : %s", sqlStatement.getClass().getName())));
RULBackendHandler<?> result = newInstance(clazz);
result.init(sqlStatement, connectionSession);
return result;