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 2022/05/06 11:22:22 UTC
[shardingsphere] branch master updated: Rename EncryptRule.setSchemaMetaData (#17387)
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 936f65f3e56 Rename EncryptRule.setSchemaMetaData (#17387)
936f65f3e56 is described below
commit 936f65f3e561b9834eab0a7ad76b599d1f1dd2db
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 6 19:22:15 2022 +0800
Rename EncryptRule.setSchemaMetaData (#17387)
---
.../rewrite/context/EncryptSQLRewriteContextDecorator.java | 2 +-
.../token/generator/EncryptOrderByItemTokenGenerator.java | 4 ++--
.../generator/EncryptPredicateColumnTokenGenerator.java | 4 ++--
.../token/generator/EncryptProjectionTokenGenerator.java | 4 ++--
.../apache/shardingsphere/encrypt/rule/EncryptRule.java | 8 ++++----
.../encrypt/fixture/CustomizedEncryptAlgorithm.java | 4 ++--
.../shardingsphere/encrypt/rule/EncryptRuleTest.java | 5 ++---
.../rewrite/token/generator/impl/IndexTokenGenerator.java | 4 ++--
.../sql/token/generator/aware/SchemaMetaDataAware.java | 14 +++++++-------
.../encrypt/SchemaBasedEncryptAlgorithmFixture.java | 4 ++--
10 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
index ddabb8420b4..3e0995d9cca 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java
@@ -51,7 +51,7 @@ public final class EncryptSQLRewriteContextDecorator implements SQLRewriteContex
return;
}
Collection<EncryptCondition> encryptConditions = createEncryptConditions(encryptRule, sqlRewriteContext);
- encryptRule.setUpEncryptorSchema(sqlRewriteContext.getSchemas(), sqlRewriteContext.getDatabaseName());
+ encryptRule.setSchemaMetaData(sqlRewriteContext.getDatabaseName(), sqlRewriteContext.getSchemas());
if (!sqlRewriteContext.getParameters().isEmpty()) {
Collection<ParameterRewriter> parameterRewriters = new EncryptParameterRewriterBuilder(encryptRule,
sqlRewriteContext.getDatabaseName(), sqlRewriteContext.getSchemas(), sqlStatementContext, encryptConditions).getParameterRewriters();
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
index dd7dba61abf..eb9f83c0bbb 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptOrderByItemTokenGenerator.java
@@ -45,10 +45,10 @@ import java.util.Optional;
@Setter
public final class EncryptOrderByItemTokenGenerator implements CollectionSQLTokenGenerator, SchemaMetaDataAware, EncryptRuleAware {
- private Map<String, ShardingSphereSchema> schemas;
-
private String databaseName;
+ private Map<String, ShardingSphereSchema> schemas;
+
private EncryptRule encryptRule;
@SuppressWarnings("rawtypes")
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 5137a84b960..7f15ea49886 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
@@ -42,10 +42,10 @@ import java.util.Optional;
@Setter
public final class EncryptPredicateColumnTokenGenerator implements CollectionSQLTokenGenerator<SQLStatementContext<?>>, SchemaMetaDataAware, EncryptRuleAware {
- private Map<String, ShardingSphereSchema> schemas;
-
private String databaseName;
+ private Map<String, ShardingSphereSchema> schemas;
+
private EncryptRule encryptRule;
@Override
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
index 8e3cfe32f9e..7139043b26c 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
@@ -54,11 +54,11 @@ public final class EncryptProjectionTokenGenerator implements CollectionSQLToken
private List<SQLToken> previousSQLTokens;
- private Map<String, ShardingSphereSchema> schemas;
+ private EncryptRule encryptRule;
private String databaseName;
- private EncryptRule encryptRule;
+ private Map<String, ShardingSphereSchema> schemas;
@Override
public boolean isGenerateSQLToken(final SQLStatementContext<?> sqlStatementContext) {
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
index f63117c08b8..5b8270b5e62 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
@@ -314,16 +314,16 @@ public final class EncryptRule implements SchemaRule, TableContainedRule {
}
/**
- * Set up encryptor schema.
+ * Set schema meta data.
*
- * @param schemas schema map
* @param databaseName database name
+ * @param schemas schema map
*/
- public void setUpEncryptorSchema(final Map<String, ShardingSphereSchema> schemas, final String databaseName) {
+ public void setSchemaMetaData(final String databaseName, final Map<String, ShardingSphereSchema> schemas) {
for (EncryptAlgorithm<?, ?> each : encryptors.values()) {
if (each instanceof SchemaMetaDataAware) {
- ((SchemaMetaDataAware) each).setSchemas(schemas);
((SchemaMetaDataAware) each).setDatabaseName(databaseName);
+ ((SchemaMetaDataAware) each).setSchemas(schemas);
}
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CustomizedEncryptAlgorithm.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CustomizedEncryptAlgorithm.java
index ce431f87983..bdeb4dde6b8 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CustomizedEncryptAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CustomizedEncryptAlgorithm.java
@@ -41,10 +41,10 @@ public final class CustomizedEncryptAlgorithm implements EncryptAlgorithm<Intege
private byte[] key = DigestUtils.sha256(TEST_KEY);
- private Map<String, ShardingSphereSchema> schemas;
-
private String databaseName;
+ private Map<String, ShardingSphereSchema> schemas;
+
@Override
public Integer encrypt(final Integer plainValue, final EncryptContext encryptContext) {
byte[] bytes = toBytes(plainValue);
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
index b4346a12c3b..52c647d573a 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
@@ -171,10 +171,9 @@ public final class EncryptRuleTest {
@SuppressWarnings("rawtypes")
@Test
- public void assertSetUpEncryptorSchema() {
+ public void assertSchemaMetaData() {
EncryptRule encryptRule = new EncryptRule(createEncryptRuleConfiguration(), Collections.emptyMap());
- Map<String, ShardingSphereSchema> schemas = mockSchemaMap();
- encryptRule.setUpEncryptorSchema(schemas, "test");
+ encryptRule.setSchemaMetaData("test", mockSchemaMap());
Optional<EncryptAlgorithm> actual = encryptRule.findEncryptor("t_encrypt", "name");
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(CustomizedEncryptAlgorithm.class));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
index 92407531482..46233024ce2 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
@@ -40,10 +40,10 @@ public final class IndexTokenGenerator implements CollectionSQLTokenGenerator<SQ
private ShardingRule shardingRule;
- private Map<String, ShardingSphereSchema> schemas;
-
private String databaseName;
+ private Map<String, ShardingSphereSchema> schemas;
+
@Override
public boolean isGenerateSQLToken(final SQLStatementContext<?> sqlStatementContext) {
return sqlStatementContext instanceof IndexAvailable && !((IndexAvailable) sqlStatementContext).getIndexes().isEmpty();
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/SchemaMetaDataAware.java b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/SchemaMetaDataAware.java
index bced4cac2e0..a132fb4d585 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/SchemaMetaDataAware.java
+++ b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/SchemaMetaDataAware.java
@@ -27,16 +27,16 @@ import java.util.Map;
public interface SchemaMetaDataAware {
/**
- * Set schema meta data.
- *
- * @param schemas schema meta data map
+ * Set database name.
+ *
+ * @param databaseName database name
*/
- void setSchemas(Map<String, ShardingSphereSchema> schemas);
+ void setDatabaseName(String databaseName);
/**
- * Set database name.
+ * Set schema meta data.
*
- * @param databaseName database name
+ * @param schemas schema meta data map
*/
- void setDatabaseName(String databaseName);
+ void setSchemas(Map<String, ShardingSphereSchema> schemas);
}
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/SchemaBasedEncryptAlgorithmFixture.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/SchemaBasedEncryptAlgorithmFixture.java
index 997291228f8..1aa83b43957 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/SchemaBasedEncryptAlgorithmFixture.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/SchemaBasedEncryptAlgorithmFixture.java
@@ -34,10 +34,10 @@ public final class SchemaBasedEncryptAlgorithmFixture implements EncryptAlgorith
@Getter
private Properties props;
- private Map<String, ShardingSphereSchema> schemas;
-
private String databaseName;
+ private Map<String, ShardingSphereSchema> schemas;
+
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
TableMetaData tableMetaData = schemas.get(databaseName).get(encryptContext.getTableName());