From b898deda242a6fb85f5802d7c17a4f6dc63885b6 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Sun, 11 Feb 2024 23:30:06 +0800 Subject: [PATCH] Rename ShowPluginsResultRowBuilder to PluginTypeAndClassMapper (#30094) --- ...=> EncryptAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ...va => MaskAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ...oadBalanceAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ... => ShadowAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ...> ShardingAlgorithmTypeAndClassMapper.java} | 6 +++--- ...xecutor.ral.plugin.PluginTypeAndClassMapper | 18 ++++++++++++++++++ ...utor.ral.plugin.ShowPluginsResultRowBuilder | 18 ------------------ ...lder.java => PluginTypeAndClassMapper.java} | 4 ++-- .../ral/plugin/ShowPluginsExecutor.java | 2 +- ...ava => CommonPluginTypeAndClassMapper.java} | 6 +++--- ...eyGenerateAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ...ationCheckAlgorithmTypeAndClassMapper.java} | 6 +++--- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- ...ecutor.ral.plugin.PluginTypeAndClassMapper} | 2 +- 19 files changed, 52 insertions(+), 52 deletions(-) rename features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/{ShowEncryptAlgorithmPluginsResultRowBuilder.java => EncryptAlgorithmTypeAndClassMapper.java} (86%) rename features/{mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (89%) rename features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/{ShowMaskAlgorithmPluginsResultRowBuilder.java => MaskAlgorithmTypeAndClassMapper.java} (86%) rename features/{shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (88%) rename features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/{ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder.java => ReadQueryLoadBalanceAlgorithmTypeAndClassMapper.java} (85%) rename features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/{org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (93%) rename features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/{ShowShadowAlgorithmPluginsResultRowBuilder.java => ShadowAlgorithmTypeAndClassMapper.java} (86%) rename features/{encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (88%) rename features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/{ShowShardingAlgorithmPluginsResultRowBuilder.java => ShardingAlgorithmTypeAndClassMapper.java} (86%) create mode 100644 features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper delete mode 100644 features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/{ShowPluginsResultRowBuilder.java => PluginTypeAndClassMapper.java} (92%) rename infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/{ShowCommonPluginsResultRowBuilder.java => CommonPluginTypeAndClassMapper.java} (87%) rename infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/{ShowKeyGenerateAlgorithmPluginsResultRowBuilder.java => KeyGenerateAlgorithmTypeAndClassMapper.java} (86%) rename infra/distsql-handler/src/main/resources/META-INF/services/{org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (94%) rename kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/{ShowMigrationCheckAlgorithmPluginsResultRowBuilder.java => MigrationCheckAlgorithmTypeAndClassMapper.java} (86%) rename kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/{org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (93%) rename proxy/backend/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder => org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper} (95%) diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptAlgorithmPluginsResultRowBuilder.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptAlgorithmTypeAndClassMapper.java similarity index 86% rename from features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptAlgorithmPluginsResultRowBuilder.java rename to features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptAlgorithmTypeAndClassMapper.java index abef9c093547b..5b30da2e123a2 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptAlgorithmPluginsResultRowBuilder.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.encrypt.distsql.handler.query; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm; /** - * Show encrypt algorithm plugins result row builder. + * Encrypt algorithm type and class mapper. */ -public final class ShowEncryptAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class EncryptAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 89% rename from features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index 8335918e02afb..f0fae2eec4e1c 100644 --- a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.mask.distsql.handler.query.ShowMaskAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.encrypt.distsql.handler.query.EncryptAlgorithmTypeAndClassMapper diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskAlgorithmPluginsResultRowBuilder.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskAlgorithmTypeAndClassMapper.java similarity index 86% rename from features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskAlgorithmPluginsResultRowBuilder.java rename to features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskAlgorithmTypeAndClassMapper.java index b19c6b828f4b2..b553ec80cc0cc 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskAlgorithmPluginsResultRowBuilder.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.mask.distsql.handler.query; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.mask.spi.MaskAlgorithm; /** - * Show mask algorithm plugins result row builder. + * Mask algorithm type and class mapper. */ -public final class ShowMaskAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class MaskAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @SuppressWarnings("rawtypes") @Override diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 88% rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index 69f00f141143c..64486f2588302 100644 --- a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.mask.distsql.handler.query.MaskAlgorithmTypeAndClassMapper diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadQueryLoadBalanceAlgorithmTypeAndClassMapper.java similarity index 85% rename from features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder.java rename to features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadQueryLoadBalanceAlgorithmTypeAndClassMapper.java index 0927866e59388..227de047a0212 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadQueryLoadBalanceAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.query; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm; /** - * Show read query load balance algorithm plugins result row builder. + * Read query load balance algorithm type and class mapper. */ -public final class ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class ReadQueryLoadBalanceAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 93% rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index 06c80b797140a..42af5a35524de 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.readwritesplitting.distsql.handler.query.ShowReadQueryLoadBalanceAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.readwritesplitting.distsql.handler.query.ReadQueryLoadBalanceAlgorithmTypeAndClassMapper diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmPluginsResultRowBuilder.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmTypeAndClassMapper.java similarity index 86% rename from features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmPluginsResultRowBuilder.java rename to features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmTypeAndClassMapper.java index 6e9a14293c7c7..bfcf22a3164e1 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmPluginsResultRowBuilder.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.shadow.distsql.handler.query; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm; /** - * Show shadow algorithm plugins result row builder. + * Show shadow algorithm type and class mapper. */ -public final class ShowShadowAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class ShadowAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 88% rename from features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index 01a13aaf1e6f8..8948a7ed923c1 100644 --- a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.encrypt.distsql.handler.query.ShowEncryptAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.shadow.distsql.handler.query.ShadowAlgorithmTypeAndClassMapper diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmPluginsResultRowBuilder.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmTypeAndClassMapper.java similarity index 86% rename from features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmPluginsResultRowBuilder.java rename to features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmTypeAndClassMapper.java index 131059cf7fdc5..1c406943466d2 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmPluginsResultRowBuilder.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.sharding.distsql.handler.query; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.sharding.spi.ShardingAlgorithm; /** - * Show sharding algorithm plugins result row builder. + * Show sharding algorithm type and class mapper. */ -public final class ShowShardingAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class ShardingAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper new file mode 100644 index 0000000000000..a479777d6b003 --- /dev/null +++ b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +org.apache.shardingsphere.sharding.distsql.handler.query.ShardingAlgorithmTypeAndClassMapper diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder deleted file mode 100644 index c79855e5f8bfe..0000000000000 --- a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingAlgorithmPluginsResultRowBuilder diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsResultRowBuilder.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginTypeAndClassMapper.java similarity index 92% rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsResultRowBuilder.java rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginTypeAndClassMapper.java index de161de119226..710380dab3d3b 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsResultRowBuilder.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginTypeAndClassMapper.java @@ -21,10 +21,10 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; /** - * Show plugins result row builder. + * Plugin type and class mapper. */ @SingletonSPI -public interface ShowPluginsResultRowBuilder extends TypedSPI { +public interface PluginTypeAndClassMapper extends TypedSPI { /** * Get plugin class. diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java index 29fbabe30393e..88c1abc60e595 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java @@ -52,7 +52,7 @@ private List getColumnNames(final Class pluginClass) private Class getPluginClass(final ShowPluginsStatement sqlStatement) { return sqlStatement.getPluginClass().isPresent() ? getPluginClass(sqlStatement.getPluginClass().get()) - : TypedSPILoader.getService(ShowPluginsResultRowBuilder.class, sqlStatement.getType()).getPluginClass(); + : TypedSPILoader.getService(PluginTypeAndClassMapper.class, sqlStatement.getType()).getPluginClass(); } @SuppressWarnings("unchecked") diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowCommonPluginsResultRowBuilder.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/CommonPluginTypeAndClassMapper.java similarity index 87% rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowCommonPluginsResultRowBuilder.java rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/CommonPluginTypeAndClassMapper.java index 9433efac44416..5e57fe11b6c93 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowCommonPluginsResultRowBuilder.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/CommonPluginTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; /** - * Show common plugins result row builder. + * Common plugin type and class mapper. */ -public final class ShowCommonPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class CommonPluginTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowKeyGenerateAlgorithmPluginsResultRowBuilder.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java similarity index 86% rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowKeyGenerateAlgorithmPluginsResultRowBuilder.java rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java index f1521c6efa8ff..b2cf9e2945a8d 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/ShowKeyGenerateAlgorithmPluginsResultRowBuilder.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; import org.apache.shardingsphere.keygen.core.algorithm.KeyGenerateAlgorithm; /** - * Show key generate algorithm plugins result row builder. + * Key generate algorithm type and class mapper. */ -public final class ShowKeyGenerateAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class KeyGenerateAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 94% rename from infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index abbf0ef07d686..c24bb65bc1847 100644 --- a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type.ShowKeyGenerateAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type.KeyGenerateAlgorithmTypeAndClassMapper diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmPluginsResultRowBuilder.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/MigrationCheckAlgorithmTypeAndClassMapper.java similarity index 86% rename from kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmPluginsResultRowBuilder.java rename to kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/MigrationCheckAlgorithmTypeAndClassMapper.java index 7618f4ee8cd2b..0b3994980fd48 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmPluginsResultRowBuilder.java +++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/MigrationCheckAlgorithmTypeAndClassMapper.java @@ -18,12 +18,12 @@ package org.apache.shardingsphere.data.pipeline.migration.distsql.handler.query; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.TableDataConsistencyChecker; -import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder; +import org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper; /** - * Show migration check algorithm plugins result row builder. + * Migration check algorithm type and class mapper. */ -public final class ShowMigrationCheckAlgorithmPluginsResultRowBuilder implements ShowPluginsResultRowBuilder { +public final class MigrationCheckAlgorithmTypeAndClassMapper implements PluginTypeAndClassMapper { @Override public Class getPluginClass() { diff --git a/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 93% rename from kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index bae705f39389a..f9348ec0b21fa 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.data.pipeline.migration.distsql.handler.query.ShowMigrationCheckAlgorithmPluginsResultRowBuilder +org.apache.shardingsphere.data.pipeline.migration.distsql.handler.query.MigrationCheckAlgorithmTypeAndClassMapper diff --git a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper similarity index 95% rename from proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder rename to proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper index 31d43e657d6da..be18e8d077b64 100644 --- a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsResultRowBuilder +++ b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type.ShowCommonPluginsResultRowBuilder +org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type.CommonPluginTypeAndClassMapper