You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/06/05 01:09:59 UTC
[shardingsphere] branch master updated: Remove useless constructor and modify related unit test (#26047)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 744d7ac2b02 Remove useless constructor and modify related unit test (#26047)
744d7ac2b02 is described below
commit 744d7ac2b021439dbbaf679d36454128683bbec6
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Mon Jun 5 09:09:51 2023 +0800
Remove useless constructor and modify related unit test (#26047)
---
.../org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java | 4 ----
.../encrypt/rewrite/impl/EncryptAlterTableTokenGeneratorTest.java | 8 ++++----
.../rewrite/impl/EncryptCreateTableTokenGeneratorTest.java | 4 ++--
.../encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java | 4 ++--
.../org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java | 8 ++++----
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
index 29c5e4a7b37..36e0edf5eed 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
@@ -30,8 +30,4 @@ public final class EncryptColumnItem {
private final String name;
private final String encryptorName;
-
- public EncryptColumnItem(final String name) {
- this(name, null);
- }
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptAlterTableTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptAlterTableTokenGeneratorTest.java
index ec6f5231a83..9c366ef13bc 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptAlterTableTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptAlterTableTokenGeneratorTest.java
@@ -78,15 +78,15 @@ class EncryptAlterTableTokenGeneratorTest {
private EncryptColumn mockEncryptColumn() {
EncryptColumn result = new EncryptColumn("certificate_number", new EncryptColumnItem("cipher_certificate_number", "test"));
- result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number"));
- result.setLikeQuery(new EncryptColumnItem("like_certificate_number"));
+ result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number", "assisted_encryptor"));
+ result.setLikeQuery(new EncryptColumnItem("like_certificate_number", "like_encryptor"));
return result;
}
private EncryptColumn mockNewEncryptColumn() {
EncryptColumn result = new EncryptColumn("certificate_number_new", new EncryptColumnItem("cipher_certificate_number_new", "test"));
- result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number_new"));
- result.setLikeQuery(new EncryptColumnItem("like_certificate_number_new"));
+ result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number_new", "assisted_encryptor"));
+ result.setLikeQuery(new EncryptColumnItem("like_certificate_number_new", "like_encryptor"));
return result;
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptCreateTableTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptCreateTableTokenGeneratorTest.java
index fd8a1bba158..cb462cb8a0d 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptCreateTableTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptCreateTableTokenGeneratorTest.java
@@ -102,8 +102,8 @@ class EncryptCreateTableTokenGeneratorTest {
private EncryptColumn mockEncryptColumn() {
EncryptColumn result = new EncryptColumn("certificate_number", new EncryptColumnItem("cipher_certificate_number", "test"));
- result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number"));
- result.setLikeQuery(new EncryptColumnItem("like_certificate_number"));
+ result.setAssistedQuery(new EncryptColumnItem("assisted_certificate_number", "assisted_encryptor"));
+ result.setLikeQuery(new EncryptColumnItem("like_certificate_number", "like_encryptor"));
return result;
}
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
index be9a5a93044..eb53ff3f04b 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
@@ -70,8 +70,8 @@ class EncryptProjectionTokenGeneratorTest {
when(encryptTable2.getLogicColumns()).thenReturn(Collections.singletonList("mobile"));
when(result.findEncryptTable("doctor")).thenReturn(Optional.of(encryptTable1));
when(result.findEncryptTable("doctor1")).thenReturn(Optional.of(encryptTable2));
- EncryptColumn column = new EncryptColumn("mobile", new EncryptColumnItem("mobile"));
- column.setLikeQuery(new EncryptColumnItem("mobile"));
+ EncryptColumn column = new EncryptColumn("mobile", new EncryptColumnItem("mobile", "standard_encryptor"));
+ column.setLikeQuery(new EncryptColumnItem("mobile", "like_encryptor"));
when(result.findEncryptColumn("doctor", "mobile")).thenReturn(Optional.of(column));
return result;
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java
index ad1dea47cc0..577c739356b 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java
@@ -26,16 +26,16 @@ class EncryptColumnTest {
@Test
void assertGetAssistedQueryColumn() {
EncryptColumn encryptColumn = new EncryptColumn("logicColumn", new EncryptColumnItem("cipherColumn", "encryptorName"));
- encryptColumn.setLikeQuery(new EncryptColumnItem("likeQueryColumn"));
- encryptColumn.setAssistedQuery(new EncryptColumnItem("assistedQueryColumn"));
+ encryptColumn.setLikeQuery(new EncryptColumnItem("likeQueryColumn", "like_encryptor"));
+ encryptColumn.setAssistedQuery(new EncryptColumnItem("assistedQueryColumn", "assisted_encryptor"));
assertTrue(encryptColumn.getAssistedQuery().isPresent());
}
@Test
void assertGetLikeQueryColumn() {
EncryptColumn encryptColumn = new EncryptColumn("logicColumn", new EncryptColumnItem("cipherColumn", "encryptorName"));
- encryptColumn.setAssistedQuery(new EncryptColumnItem("assistedQueryColumn"));
- encryptColumn.setLikeQuery(new EncryptColumnItem("likeQueryColumn"));
+ encryptColumn.setAssistedQuery(new EncryptColumnItem("assistedQueryColumn", "assisted_encryptor"));
+ encryptColumn.setLikeQuery(new EncryptColumnItem("likeQueryColumn", "like_encryptor"));
assertTrue(encryptColumn.getLikeQuery().isPresent());
}
}