This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 9881ee6d0a4 Rename EncryptForUseDefaultInsertColumnsTokenGenerator to
EncryptInsertDefaultColumnsTokenGenerator and move package to insert (#28364)
9881ee6d0a4 is described below
commit 9881ee6d0a4954096e55bb735b68d89e370bebfc
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Tue Sep 5 14:40:47 2023 +0800
Rename EncryptForUseDefaultInsertColumnsTokenGenerator to
EncryptInsertDefaultColumnsTokenGenerator and move package to insert (#28364)
---
.../encrypt/rewrite/token/EncryptTokenGenerateBuilder.java | 4 ++--
.../EncryptInsertDefaultColumnsTokenGenerator.java} | 6 +++---
.../EncryptInsertDefaultColumnsTokenGeneratorTest.java} | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
index a5eea848e1a..6612ac3db59 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptAlterTableTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptAssignmentTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptCreateTableTokenGenerator;
-import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptForUseDefaultInsertColumnsTokenGenerator;
+import
org.apache.shardingsphere.encrypt.rewrite.token.generator.insert.EncryptInsertDefaultColumnsTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptGroupByItemTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptIndexColumnTokenGenerator;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.EncryptOrderByItemTokenGenerator;
@@ -67,7 +67,7 @@ public final class EncryptTokenGenerateBuilder implements
SQLTokenGeneratorBuild
addSQLTokenGenerator(result, new
EncryptPredicateColumnTokenGenerator());
addSQLTokenGenerator(result, new
EncryptPredicateRightValueTokenGenerator());
addSQLTokenGenerator(result, new EncryptInsertValuesTokenGenerator());
- addSQLTokenGenerator(result, new
EncryptForUseDefaultInsertColumnsTokenGenerator());
+ addSQLTokenGenerator(result, new
EncryptInsertDefaultColumnsTokenGenerator());
addSQLTokenGenerator(result, new
EncryptInsertCipherNameTokenGenerator());
addSQLTokenGenerator(result, new
EncryptInsertDerivedColumnsTokenGenerator());
addSQLTokenGenerator(result, new
EncryptInsertOnUpdateTokenGenerator());
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
similarity index 96%
rename from
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
rename to
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
index 2df782b4763..f9e6b71f0c2 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+package org.apache.shardingsphere.encrypt.rewrite.token.generator.insert;
import com.google.common.base.Preconditions;
import lombok.Setter;
@@ -37,10 +37,10 @@ import java.util.List;
import java.util.Optional;
/**
- * Use default insert columns token generator for encrypt.
+ * Insert default columns token generator for encrypt.
*/
@Setter
-public final class EncryptForUseDefaultInsertColumnsTokenGenerator implements
OptionalSQLTokenGenerator<InsertStatementContext>, PreviousSQLTokensAware,
EncryptRuleAware {
+public final class EncryptInsertDefaultColumnsTokenGenerator implements
OptionalSQLTokenGenerator<InsertStatementContext>, PreviousSQLTokensAware,
EncryptRuleAware {
private List<SQLToken> previousSQLTokens;
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java
similarity index 92%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java
index accff00c537..617597f6ff3 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptForUseDefaultInsertColumnsTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.rewrite.token.generator;
+package org.apache.shardingsphere.encrypt.rewrite.token.generator.insert;
import
org.apache.shardingsphere.encrypt.rewrite.token.generator.fixture.EncryptGeneratorFixtureBuilder;
import org.junit.jupiter.api.BeforeEach;
@@ -27,9 +27,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
-class EncryptForUseDefaultInsertColumnsTokenGeneratorTest {
+class EncryptInsertDefaultColumnsTokenGeneratorTest {
- private final EncryptForUseDefaultInsertColumnsTokenGenerator generator =
new EncryptForUseDefaultInsertColumnsTokenGenerator();
+ private final EncryptInsertDefaultColumnsTokenGenerator generator = new
EncryptInsertDefaultColumnsTokenGenerator();
@BeforeEach
void setup() {
