You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/04/24 12:34:52 UTC
[shardingsphere] branch master updated: Add generic type of EncryptPredicateColumnTokenGenerator (#17064)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 b27a668097b Add generic type of EncryptPredicateColumnTokenGenerator (#17064)
b27a668097b is described below
commit b27a668097bc6e65d8a87ef340de0024a2962628
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Apr 24 20:34:45 2022 +0800
Add generic type of EncryptPredicateColumnTokenGenerator (#17064)
---
.../token/generator/EncryptPredicateColumnTokenGenerator.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
index 07857279aba..5137a84b960 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
@@ -40,7 +40,7 @@ import java.util.Optional;
* Predicate column token generator for encrypt.
*/
@Setter
-public final class EncryptPredicateColumnTokenGenerator implements CollectionSQLTokenGenerator, SchemaMetaDataAware, EncryptRuleAware {
+public final class EncryptPredicateColumnTokenGenerator implements CollectionSQLTokenGenerator<SQLStatementContext<?>>, SchemaMetaDataAware, EncryptRuleAware {
private Map<String, ShardingSphereSchema> schemas;
@@ -48,15 +48,13 @@ public final class EncryptPredicateColumnTokenGenerator implements CollectionSQL
private EncryptRule encryptRule;
- @SuppressWarnings("rawtypes")
@Override
- public boolean isGenerateSQLToken(final SQLStatementContext sqlStatementContext) {
+ public boolean isGenerateSQLToken(final SQLStatementContext<?> sqlStatementContext) {
return sqlStatementContext instanceof WhereAvailable && !((WhereAvailable) sqlStatementContext).getWhereSegments().isEmpty();
}
- @SuppressWarnings("rawtypes")
@Override
- public Collection<SubstitutableColumnNameToken> generateSQLTokens(final SQLStatementContext sqlStatementContext) {
+ public Collection<SubstitutableColumnNameToken> generateSQLTokens(final SQLStatementContext<?> sqlStatementContext) {
Collection<ColumnSegment> columnSegments = sqlStatementContext instanceof WhereAvailable ? ((WhereAvailable) sqlStatementContext).getColumnSegments() : Collections.emptyList();
String defaultSchema = sqlStatementContext.getDatabaseType().getDefaultSchema(databaseName);
ShardingSphereSchema schema = sqlStatementContext.getTablesContext().getSchemaName().map(schemas::get).orElse(schemas.get(defaultSchema));