This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 adb7f793346 Rename ParameterRewritersProvider (#33616)
adb7f793346 is described below
commit adb7f79334638352406cedfe8892224d7bd43580
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Nov 12 00:38:19 2024 +0800
Rename ParameterRewritersProvider (#33616)
* Rename ParameterRewritersProvider
* Rename ParameterRewritersProvider
---
.../context/EncryptSQLRewriteContextDecorator.java | 4 ++--
...ilder.java => EncryptParameterRewritersRegistry.java} | 6 +++---
...t.java => EncryptParameterRewritersRegistryTest.java} | 4 ++--
.../context/ShardingSQLRewriteContextDecorator.java | 4 ++--
...lder.java => ShardingParameterRewritersRegistry.java} | 6 +++---
....java => ShardingParameterRewritersRegistryTest.java} | 16 +++-------------
...riterBuilder.java => ParameterRewritersRegistry.java} | 4 ++--
7 files changed, 17 insertions(+), 27 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
index b0e37f6a9ff..b9dd3c68cbb 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.encrypt.rewrite.context;
import org.apache.shardingsphere.encrypt.constant.EncryptOrder;
import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
import
org.apache.shardingsphere.encrypt.rewrite.condition.EncryptConditionEngine;
-import
org.apache.shardingsphere.encrypt.rewrite.parameter.EncryptParameterRewriterBuilder;
+import
org.apache.shardingsphere.encrypt.rewrite.parameter.EncryptParameterRewritersRegistry;
import
org.apache.shardingsphere.encrypt.rewrite.token.EncryptTokenGenerateBuilder;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
@@ -55,7 +55,7 @@ public final class EncryptSQLRewriteContextDecorator
implements SQLRewriteContex
Collection<EncryptCondition> encryptConditions =
createEncryptConditions(rule, sqlRewriteContext);
String databaseName = sqlRewriteContext.getDatabase().getName();
if (!sqlRewriteContext.getParameters().isEmpty()) {
- Collection<ParameterRewriter> parameterRewriters = new
EncryptParameterRewriterBuilder(rule, databaseName, sqlStatementContext,
encryptConditions).getParameterRewriters();
+ Collection<ParameterRewriter> parameterRewriters = new
EncryptParameterRewritersRegistry(rule, databaseName, sqlStatementContext,
encryptConditions).getParameterRewriters();
rewriteParameters(sqlRewriteContext, parameterRewriters);
}
SQLTokenGeneratorBuilder sqlTokenGeneratorBuilder = new
EncryptTokenGenerateBuilder(rule, sqlStatementContext, encryptConditions,
databaseName);
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
similarity index 94%
rename from
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
rename to
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
index 6a523d2b880..fc38272baa1 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
@@ -27,16 +27,16 @@ import
org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter.EncryptPredi
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
-import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriterBuilder;
+import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersRegistry;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersBuilder;
import java.util.Collection;
/**
- * Parameter rewriter builder for encrypt.
+ * Parameter rewriter registry for encrypt.
*/
@RequiredArgsConstructor
-public final class EncryptParameterRewriterBuilder implements
ParameterRewriterBuilder {
+public final class EncryptParameterRewritersRegistry implements
ParameterRewritersRegistry {
private final EncryptRule rule;
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
similarity index 93%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
index b6bdf92d8e4..3fa4a122c7d 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistryTest.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class EncryptParameterRewriterBuilderTest {
+class EncryptParameterRewritersRegistryTest {
@Test
void assertGetParameterRewriters() {
@@ -42,7 +42,7 @@ class EncryptParameterRewriterBuilderTest {
when(rule.findEncryptTable("foo_tbl").isPresent()).thenReturn(true);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singleton("foo_tbl"));
- Collection<ParameterRewriter> actual = new
EncryptParameterRewriterBuilder(rule, DefaultDatabase.LOGIC_NAME,
sqlStatementContext, Collections.emptyList()).getParameterRewriters();
+ Collection<ParameterRewriter> actual = new
EncryptParameterRewritersRegistry(rule, DefaultDatabase.LOGIC_NAME,
sqlStatementContext, Collections.emptyList()).getParameterRewriters();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(),
instanceOf(EncryptPredicateParameterRewriter.class));
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
index 99446c80dc2..16d26575fb9 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContextDecorato
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.constant.ShardingOrder;
-import
org.apache.shardingsphere.sharding.rewrite.parameter.ShardingParameterRewriterBuilder;
+import
org.apache.shardingsphere.sharding.rewrite.parameter.ShardingParameterRewritersRegistry;
import
org.apache.shardingsphere.sharding.rewrite.token.ShardingTokenGenerateBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
@@ -51,7 +51,7 @@ public final class ShardingSQLRewriteContextDecorator
implements SQLRewriteConte
return;
}
if (!sqlRewriteContext.getParameters().isEmpty()) {
- Collection<ParameterRewriter> parameterRewriters = new
ShardingParameterRewriterBuilder(routeContext,
sqlStatementContext).getParameterRewriters();
+ Collection<ParameterRewriter> parameterRewriters = new
ShardingParameterRewritersRegistry(routeContext,
sqlStatementContext).getParameterRewriters();
rewriteParameters(sqlRewriteContext, parameterRewriters);
}
sqlRewriteContext.addSQLTokenGenerators(new
ShardingTokenGenerateBuilder(rule, routeContext,
sqlStatementContext).getSQLTokenGenerators());
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistry.java
similarity index 92%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistry.java
index 3f28b69801b..0bd9bc5da37 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistry.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.rewrite.parameter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
-import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriterBuilder;
+import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersRegistry;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersBuilder;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen.GeneratedKeyInsertValueParameterRewriter;
import org.apache.shardingsphere.infra.route.context.RouteContext;
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.sharding.rewrite.parameter.impl.ShardingPaginat
import java.util.Collection;
/**
- * Parameter rewriter builder for sharding.
+ * Parameter rewriter registry for sharding.
*/
@RequiredArgsConstructor
-public final class ShardingParameterRewriterBuilder implements
ParameterRewriterBuilder {
+public final class ShardingParameterRewritersRegistry implements
ParameterRewritersRegistry {
private final RouteContext routeContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
similarity index 71%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilderTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
index c6b8673c255..b923ba36bdf 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewritersRegistryTest.java
@@ -28,28 +28,18 @@ import java.util.Collection;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShardingParameterRewriterBuilderTest {
+class ShardingParameterRewritersRegistryTest {
@Test
- void assertGetParameterRewritersWhenPaginationIsNeedRewrite() {
+ void assertGetParameterRewriters() {
SelectStatementContext statementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(statementContext.getPaginationContext().isHasPagination()).thenReturn(true);
- Collection<ParameterRewriter> actual = new
ShardingParameterRewriterBuilder(mock(RouteContext.class),
statementContext).getParameterRewriters();
+ Collection<ParameterRewriter> actual = new
ShardingParameterRewritersRegistry(mock(RouteContext.class),
statementContext).getParameterRewriters();
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(),
instanceOf(ShardingPaginationParameterRewriter.class));
}
-
- @Test
- void assertGetParameterRewritersWhenPaginationIsNotNeedRewrite() {
- RouteContext routeContext = mock(RouteContext.class);
- when(routeContext.isSingleRouting()).thenReturn(true);
- SelectStatementContext statementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
-
when(statementContext.getPaginationContext().isHasPagination()).thenReturn(true);
- assertTrue(new ShardingParameterRewriterBuilder(routeContext,
statementContext).getParameterRewriters().isEmpty());
- }
}
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriterBuilder.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java
similarity index 93%
rename from
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriterBuilder.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java
index 6556c4f3918..378099d3d61 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriterBuilder.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.infra.rewrite.parameter.rewriter;
import java.util.Collection;
/**
- * Parameter rewriter builder.
+ * Parameter rewriters registry.
*/
-public interface ParameterRewriterBuilder {
+public interface ParameterRewritersRegistry {
/**
* Get parameter rewriters.
