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 459dd4ba7ed Remove generic type of ParameterRewriter (#25720)
459dd4ba7ed is described below
commit 459dd4ba7ed8a02e5f8d629c6f2b51791f5f74c6
Author: Liang Zhang <[email protected]>
AuthorDate: Wed May 17 12:50:07 2023 +0800
Remove generic type of ParameterRewriter (#25720)
---
.../rewrite/context/EncryptSQLRewriteContextDecorator.java | 2 --
.../rewrite/parameter/EncryptParameterRewriterBuilder.java | 4 +---
.../parameter/rewriter/EncryptAssignmentParameterRewriter.java | 2 +-
.../EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java | 7 ++++---
.../parameter/rewriter/EncryptInsertValueParameterRewriter.java | 5 +++--
.../parameter/rewriter/EncryptPredicateParameterRewriter.java | 2 +-
.../rewrite/parameter/EncryptParameterRewriterBuilderTest.java | 1 -
.../rewrite/context/ShardingSQLRewriteContextDecorator.java | 2 --
.../rewrite/parameter/ShardingParameterRewriterBuilder.java | 2 --
.../impl/ShardingGeneratedKeyInsertValueParameterRewriter.java | 5 +++--
.../parameter/impl/ShardingPaginationParameterRewriter.java | 9 ++++-----
.../rewrite/parameter/ShardingParameterRewriterBuilderTest.java | 1 -
.../infra/rewrite/parameter/rewriter/ParameterRewriter.java | 6 ++----
13 files changed, 19 insertions(+), 29 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 f511dcccdb5..fea40fadd4c 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
@@ -42,7 +42,6 @@ import java.util.Collections;
*/
public final class EncryptSQLRewriteContextDecorator implements
SQLRewriteContextDecorator<EncryptRule> {
- @SuppressWarnings("rawtypes")
@Override
public void decorate(final EncryptRule encryptRule, final
ConfigurationProperties props, final SQLRewriteContext sqlRewriteContext, final
RouteContext routeContext) {
SQLStatementContext sqlStatementContext =
sqlRewriteContext.getSqlStatementContext();
@@ -80,7 +79,6 @@ public final class EncryptSQLRewriteContextDecorator
implements SQLRewriteContex
return false;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
private void rewriteParameters(final SQLRewriteContext sqlRewriteContext,
final Collection<ParameterRewriter> parameterRewriters) {
for (ParameterRewriter each : parameterRewriters) {
each.rewrite(sqlRewriteContext.getParameterBuilder(),
sqlRewriteContext.getSqlStatementContext(), sqlRewriteContext.getParameters());
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/EncryptParameterRewriterBuilder.java
index 33a87e502c9..ecac5d467a5 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/EncryptParameterRewriterBuilder.java
@@ -53,7 +53,6 @@ public final class EncryptParameterRewriterBuilder implements
ParameterRewriterB
private final Collection<EncryptCondition> encryptConditions;
- @SuppressWarnings("rawtypes")
@Override
public Collection<ParameterRewriter> getParameterRewriters() {
Collection<ParameterRewriter> result = new LinkedList<>();
@@ -64,14 +63,13 @@ public final class EncryptParameterRewriterBuilder
implements ParameterRewriterB
return result;
}
- private void addParameterRewriter(final Collection<ParameterRewriter>
paramRewriters, final ParameterRewriter<?> toBeAddedParamRewriter) {
+ private void addParameterRewriter(final Collection<ParameterRewriter>
paramRewriters, final ParameterRewriter toBeAddedParamRewriter) {
if (toBeAddedParamRewriter.isNeedRewrite(sqlStatementContext)) {
setUpParameterRewriter(toBeAddedParamRewriter);
paramRewriters.add(toBeAddedParamRewriter);
}
}
- @SuppressWarnings("rawtypes")
private void setUpParameterRewriter(final ParameterRewriter
toBeAddedParamRewriter) {
if (toBeAddedParamRewriter instanceof SchemaMetaDataAware) {
((SchemaMetaDataAware) toBeAddedParamRewriter).setSchemas(schemas);
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
index b07c908b268..400418a569b 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
@@ -49,7 +49,7 @@ import java.util.Optional;
* Assignment parameter rewriter for encrypt.
*/
@Setter
-public final class EncryptAssignmentParameterRewriter implements
ParameterRewriter<SQLStatementContext>, EncryptRuleAware, DatabaseNameAware {
+public final class EncryptAssignmentParameterRewriter implements
ParameterRewriter, EncryptRuleAware, DatabaseNameAware {
private EncryptRule encryptRule;
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
index 942533b2f81..d63fdc63148 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
@@ -46,7 +46,7 @@ import java.util.Optional;
* Insert on duplicate key update parameter rewriter for encrypt.
*/
@Setter
-public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter
implements ParameterRewriter<InsertStatementContext>, EncryptRuleAware,
DatabaseNameAware {
+public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter
implements ParameterRewriter, EncryptRuleAware, DatabaseNameAware {
private EncryptRule encryptRule;
@@ -60,11 +60,12 @@ public final class
EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
- public void rewrite(final ParameterBuilder paramBuilder, final
InsertStatementContext insertStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, final
SQLStatementContext sqlStatementContext, final List<Object> params) {
+ InsertStatementContext insertStatementContext =
(InsertStatementContext) sqlStatementContext;
String tableName =
insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
GroupedParameterBuilder groupedParamBuilder =
(GroupedParameterBuilder) paramBuilder;
OnDuplicateUpdateContext onDuplicateKeyUpdateValueContext =
insertStatementContext.getOnDuplicateKeyUpdateValueContext();
- String schemaName =
insertStatementContext.getTablesContext().getSchemaName().orElseGet(() ->
DatabaseTypeEngine.getDefaultSchemaName(insertStatementContext.getDatabaseType(),
databaseName));
+ String schemaName =
sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() ->
DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(),
databaseName));
for (int index = 0; index <
onDuplicateKeyUpdateValueContext.getValueExpressions().size(); index++) {
String encryptLogicColumnName =
onDuplicateKeyUpdateValueContext.getColumn(index).getIdentifier().getValue();
Optional<StandardEncryptAlgorithm> encryptor =
encryptRule.findStandardEncryptor(tableName, encryptLogicColumnName);
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
index a7a897333f9..4a7c85da499 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
@@ -51,7 +51,7 @@ import java.util.Optional;
* Insert value parameter rewriter for encrypt.
*/
@Setter
-public final class EncryptInsertValueParameterRewriter implements
ParameterRewriter<InsertStatementContext>, EncryptRuleAware, DatabaseNameAware {
+public final class EncryptInsertValueParameterRewriter implements
ParameterRewriter, EncryptRuleAware, DatabaseNameAware {
private EncryptRule encryptRule;
@@ -64,7 +64,8 @@ public final class EncryptInsertValueParameterRewriter
implements ParameterRewri
}
@Override
- public void rewrite(final ParameterBuilder paramBuilder, final
InsertStatementContext insertStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, final
SQLStatementContext sqlStatementContext, final List<Object> params) {
+ InsertStatementContext insertStatementContext =
(InsertStatementContext) sqlStatementContext;
String tableName =
insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
Iterator<String> descendingColumnNames =
insertStatementContext.getDescendingColumnNames();
String schemaName =
insertStatementContext.getTablesContext().getSchemaName().orElseGet(() ->
DatabaseTypeEngine.getDefaultSchemaName(insertStatementContext.getDatabaseType(),
databaseName));
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
index ef63b7f0810..e54febae1b5 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
@@ -40,7 +40,7 @@ import java.util.Map.Entry;
* Predicate parameter rewriter for encrypt.
*/
@Setter
-public final class EncryptPredicateParameterRewriter implements
ParameterRewriter<SQLStatementContext>, EncryptRuleAware,
EncryptConditionsAware, DatabaseNameAware {
+public final class EncryptPredicateParameterRewriter implements
ParameterRewriter, EncryptRuleAware, EncryptConditionsAware, DatabaseNameAware {
private EncryptRule encryptRule;
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/EncryptParameterRewriterBuilderTest.java
index 9c9a15b32aa..0a45a36bbb8 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/EncryptParameterRewriterBuilderTest.java
@@ -45,7 +45,6 @@ class EncryptParameterRewriterBuilderTest {
when(encryptRule.findEncryptTable("t_order").isPresent()).thenReturn(true);
SQLStatementContext sqlStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singletonList("t_order"));
- @SuppressWarnings("rawtypes")
Collection<ParameterRewriter> actual = new
EncryptParameterRewriterBuilder(
encryptRule, DefaultDatabase.LOGIC_NAME,
Collections.singletonMap("test", mock(ShardingSphereSchema.class)),
sqlStatementContext, Collections.emptyList()).getParameterRewriters();
assertThat(actual.size(), is(1));
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 69a9a3f936f..bf006f191f4 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
@@ -36,7 +36,6 @@ import java.util.Collection;
@Setter
public final class ShardingSQLRewriteContextDecorator implements
SQLRewriteContextDecorator<ShardingRule> {
- @SuppressWarnings("rawtypes")
@Override
public void decorate(final ShardingRule shardingRule, final
ConfigurationProperties props, final SQLRewriteContext sqlRewriteContext, final
RouteContext routeContext) {
if (!sqlRewriteContext.getParameters().isEmpty()) {
@@ -47,7 +46,6 @@ public final class ShardingSQLRewriteContextDecorator
implements SQLRewriteConte
sqlRewriteContext.addSQLTokenGenerators(new
ShardingTokenGenerateBuilder(shardingRule, routeContext,
sqlRewriteContext.getSqlStatementContext()).getSQLTokenGenerators());
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private void rewriteParameters(final SQLRewriteContext sqlRewriteContext,
final Collection<ParameterRewriter> parameterRewriters) {
for (ParameterRewriter each : parameterRewriters) {
each.rewrite(sqlRewriteContext.getParameterBuilder(),
sqlRewriteContext.getSqlStatementContext(), sqlRewriteContext.getParameters());
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/ShardingParameterRewriterBuilder.java
index 0a4e397f7e5..446ab924d14 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/ShardingParameterRewriterBuilder.java
@@ -48,7 +48,6 @@ public final class ShardingParameterRewriterBuilder
implements ParameterRewriter
private final SQLStatementContext sqlStatementContext;
- @SuppressWarnings("rawtypes")
@Override
public Collection<ParameterRewriter> getParameterRewriters() {
Collection<ParameterRewriter> result = new LinkedList<>();
@@ -57,7 +56,6 @@ public final class ShardingParameterRewriterBuilder
implements ParameterRewriter
return result;
}
- @SuppressWarnings("rawtypes")
private void addParameterRewriter(final Collection<ParameterRewriter>
paramRewriters, final ParameterRewriter toBeAddedParamRewriter) {
if (toBeAddedParamRewriter instanceof SchemaMetaDataAware) {
((SchemaMetaDataAware) toBeAddedParamRewriter).setSchemas(schemas);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
index 83d954d105a..f4a073db06b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
@@ -33,7 +33,7 @@ import java.util.List;
* Sharding generated key insert value parameter rewriter.
*/
@Setter
-public final class ShardingGeneratedKeyInsertValueParameterRewriter implements
ParameterRewriter<InsertStatementContext> {
+public final class ShardingGeneratedKeyInsertValueParameterRewriter implements
ParameterRewriter {
@Override
public boolean isNeedRewrite(final SQLStatementContext
sqlStatementContext) {
@@ -44,7 +44,8 @@ public final class
ShardingGeneratedKeyInsertValueParameterRewriter implements P
}
@Override
- public void rewrite(final ParameterBuilder paramBuilder, final
InsertStatementContext insertStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, final
SQLStatementContext sqlStatementContext, final List<Object> params) {
+ InsertStatementContext insertStatementContext =
(InsertStatementContext) sqlStatementContext;
if (!insertStatementContext.getGeneratedKeyContext().isPresent()) {
return;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
index 81e1da0d55b..ab942eafff5 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
@@ -33,7 +33,7 @@ import java.util.List;
* Sharding pagination parameter rewriter.
*/
@Setter
-public final class ShardingPaginationParameterRewriter implements
ParameterRewriter<SelectStatementContext>, RouteContextAware {
+public final class ShardingPaginationParameterRewriter implements
ParameterRewriter, RouteContextAware {
private RouteContext routeContext;
@@ -43,11 +43,10 @@ public final class ShardingPaginationParameterRewriter
implements ParameterRewri
}
@Override
- public void rewrite(final ParameterBuilder paramBuilder, final
SelectStatementContext selectStatementContext, final List<Object> params) {
- PaginationContext pagination =
selectStatementContext.getPaginationContext();
+ public void rewrite(final ParameterBuilder paramBuilder, final
SQLStatementContext sqlStatementContext, final List<Object> params) {
+ PaginationContext pagination = ((SelectStatementContext)
sqlStatementContext).getPaginationContext();
pagination.getOffsetParameterIndex().ifPresent(optional ->
rewriteOffset(pagination, optional, (StandardParameterBuilder) paramBuilder));
- pagination.getRowCountParameterIndex()
- .ifPresent(optional -> rewriteRowCount(pagination, optional,
(StandardParameterBuilder) paramBuilder, selectStatementContext));
+ pagination.getRowCountParameterIndex().ifPresent(optional ->
rewriteRowCount(pagination, optional, (StandardParameterBuilder) paramBuilder,
sqlStatementContext));
}
private void rewriteOffset(final PaginationContext pagination, final int
offsetParamIndex, final StandardParameterBuilder paramBuilder) {
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/ShardingParameterRewriterBuilderTest.java
index 77f0fca7992..c77f6749bff 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/ShardingParameterRewriterBuilderTest.java
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.when;
class ShardingParameterRewriterBuilderTest {
- @SuppressWarnings("rawtypes")
@Test
void assertGetParameterRewritersWhenPaginationIsNeedRewrite() {
SelectStatementContext statementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
index bd9c61ad40e..6254b503831 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
@@ -24,10 +24,8 @@ import java.util.List;
/**
* Parameter rewriter.
- *
- * @param <T> type of SQL statement context
*/
-public interface ParameterRewriter<T extends SQLStatementContext> {
+public interface ParameterRewriter {
/**
* Judge whether need rewrite.
@@ -44,5 +42,5 @@ public interface ParameterRewriter<T extends
SQLStatementContext> {
* @param sqlStatementContext SQL statement context
* @param params SQL parameters
*/
- void rewrite(ParameterBuilder paramBuilder, T sqlStatementContext,
List<Object> params);
+ void rewrite(ParameterBuilder paramBuilder, SQLStatementContext
sqlStatementContext, List<Object> params);
}
