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 8166d960ee8 Use details column item to instead of EncryptColumnItem 
(#26491)
8166d960ee8 is described below

commit 8166d960ee8be7c7a5975f84c9389666f6a93295
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 21 22:00:41 2023 +0800

    Use details column item to instead of EncryptColumnItem (#26491)
    
    * Use details column item to instead of EncryptColumnItem
    
    * Use details column item to instead of EncryptColumnItem
---
 .../generator/EncryptAlterTableTokenGenerator.java     |  9 +++++----
 .../shardingsphere/encrypt/rule/EncryptTable.java      | 16 +++++++++-------
 .../encrypt/rule/{ => column}/EncryptColumn.java       | 18 +++++++++---------
 .../item/AssistedQueryColumnItem.java}                 | 12 +++++-------
 .../item/CipherColumnItem.java}                        | 12 +++++-------
 .../item/LikeQueryColumnItem.java}                     | 12 +++++-------
 .../generator/EncryptAlterTableTokenGeneratorTest.java | 18 ++++++++++--------
 .../EncryptCreateTableTokenGeneratorTest.java          | 16 +++++++++-------
 8 files changed, 57 insertions(+), 56 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
index 1db71f39e8f..fe7a1afcc81 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
@@ -22,10 +22,11 @@ import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlg
 import 
org.apache.shardingsphere.encrypt.exception.metadata.EncryptColumnAlterException;
 import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
 import 
org.apache.shardingsphere.encrypt.rewrite.token.pojo.EncryptAlterTableToken;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumn;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumnItem;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.EncryptTable;
+import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import 
org.apache.shardingsphere.encrypt.rule.column.item.AssistedQueryColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
 import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
 import 
org.apache.shardingsphere.infra.binder.statement.ddl.AlterTableStatementContext;
 import 
org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator;
@@ -213,11 +214,11 @@ public final class EncryptAlterTableTokenGenerator 
implements CollectionSQLToken
         EncryptColumn encryptColumn = 
encryptTable.getEncryptColumn(segment.getColumnDefinition().getColumnName().getIdentifier().getValue());
         encryptTable.findAssistedQueryColumn(previousColumnName)
                 .map(optional -> new 
EncryptAlterTableToken(segment.getStopIndex() + 1, 
segment.getColumnDefinition().getColumnName().getStopIndex(),
-                        
encryptColumn.getAssistedQuery().map(EncryptColumnItem::getName).orElse(""), ", 
CHANGE COLUMN " + optional))
+                        
encryptColumn.getAssistedQuery().map(AssistedQueryColumnItem::getName).orElse(""),
 ", CHANGE COLUMN " + optional))
                 .ifPresent(result::add);
         encryptTable.findLikeQueryColumn(previousColumnName)
                 .map(optional -> new 
EncryptAlterTableToken(segment.getStopIndex() + 1, 
segment.getColumnDefinition().getColumnName().getStopIndex(),
-                        
encryptColumn.getLikeQuery().map(EncryptColumnItem::getName).orElse(""), ", 
CHANGE COLUMN " + optional))
+                        
encryptColumn.getLikeQuery().map(LikeQueryColumnItem::getName).orElse(""), ", 
CHANGE COLUMN " + optional))
                 .ifPresent(result::add);
         return result;
     }
diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
index 3ba33852fb9..505d2378d42 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
@@ -25,6 +25,10 @@ import 
org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
 import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
 import 
org.apache.shardingsphere.encrypt.exception.metadata.EncryptColumnNotFoundException;
 import 
org.apache.shardingsphere.encrypt.exception.metadata.EncryptLogicColumnNotFoundException;
+import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import 
org.apache.shardingsphere.encrypt.rule.column.item.AssistedQueryColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.CipherColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
 import 
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
 
 import java.util.Collection;
@@ -64,14 +68,12 @@ public final class EncryptTable {
     @SuppressWarnings("rawtypes")
     private EncryptColumn createEncryptColumn(final 
EncryptColumnRuleConfiguration config, final Map<String, 
StandardEncryptAlgorithm> standardEncryptors,
                                               final Map<String, 
AssistedEncryptAlgorithm> assistedEncryptors, final Map<String, 
LikeEncryptAlgorithm> likeEncryptors) {
-        EncryptColumn result = new EncryptColumn(config.getName(),
-                new EncryptColumnItem<StandardEncryptAlgorithm<?, 
?>>(config.getCipher().getName(), 
standardEncryptors.get(config.getCipher().getEncryptorName())));
+        EncryptColumn result = new EncryptColumn(config.getName(), new 
CipherColumnItem(config.getCipher().getName(), 
standardEncryptors.get(config.getCipher().getEncryptorName())));
         if (config.getAssistedQuery().isPresent()) {
-            result.setAssistedQuery(
-                    new EncryptColumnItem<AssistedEncryptAlgorithm<?, 
?>>(config.getAssistedQuery().get().getName(), 
assistedEncryptors.get(config.getAssistedQuery().get().getEncryptorName())));
+            result.setAssistedQuery(new 
AssistedQueryColumnItem(config.getAssistedQuery().get().getName(), 
assistedEncryptors.get(config.getAssistedQuery().get().getEncryptorName())));
         }
         if (config.getLikeQuery().isPresent()) {
-            result.setLikeQuery(new EncryptColumnItem<LikeEncryptAlgorithm<?, 
?>>(config.getLikeQuery().get().getName(), 
likeEncryptors.get(config.getLikeQuery().get().getEncryptorName())));
+            result.setLikeQuery(new 
LikeQueryColumnItem(config.getLikeQuery().get().getName(), 
likeEncryptors.get(config.getLikeQuery().get().getEncryptorName())));
         }
         return result;
     }
@@ -188,7 +190,7 @@ public final class EncryptTable {
      * @return assisted query column
      */
     public Optional<String> findAssistedQueryColumn(final String 
logicColumnName) {
-        return columns.containsKey(logicColumnName) ? 
columns.get(logicColumnName).getAssistedQuery().map(EncryptColumnItem::getName) 
: Optional.empty();
+        return columns.containsKey(logicColumnName) ? 
columns.get(logicColumnName).getAssistedQuery().map(AssistedQueryColumnItem::getName)
 : Optional.empty();
     }
     
     /**
@@ -198,7 +200,7 @@ public final class EncryptTable {
      * @return like query column
      */
     public Optional<String> findLikeQueryColumn(final String logicColumnName) {
-        return columns.containsKey(logicColumnName) ? 
columns.get(logicColumnName).getLikeQuery().map(EncryptColumnItem::getName) : 
Optional.empty();
+        return columns.containsKey(logicColumnName) ? 
columns.get(logicColumnName).getLikeQuery().map(LikeQueryColumnItem::getName) : 
Optional.empty();
     }
     
     /**
diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/EncryptColumn.java
similarity index 66%
rename from 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
rename to 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/EncryptColumn.java
index 3f0ea9549c1..c185187e47d 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/EncryptColumn.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rule;
+package org.apache.shardingsphere.encrypt.rule.column;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import 
org.apache.shardingsphere.encrypt.api.encrypt.assisted.AssistedEncryptAlgorithm;
-import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
-import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
+import 
org.apache.shardingsphere.encrypt.rule.column.item.AssistedQueryColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.CipherColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
 
 import java.util.Optional;
 
@@ -36,18 +36,18 @@ public final class EncryptColumn {
     
     private final String name;
     
-    private final EncryptColumnItem<StandardEncryptAlgorithm<?, ?>> cipher;
+    private final CipherColumnItem cipher;
     
-    private EncryptColumnItem<AssistedEncryptAlgorithm<?, ?>> assistedQuery;
+    private AssistedQueryColumnItem assistedQuery;
     
-    private EncryptColumnItem<LikeEncryptAlgorithm<?, ?>> likeQuery;
+    private LikeQueryColumnItem likeQuery;
     
     /**
      * Get assisted query column item.
      *
      * @return assisted query column item
      */
-    public Optional<EncryptColumnItem<AssistedEncryptAlgorithm<?, ?>>> 
getAssistedQuery() {
+    public Optional<AssistedQueryColumnItem> getAssistedQuery() {
         return Optional.ofNullable(assistedQuery);
     }
     
@@ -56,7 +56,7 @@ public final class EncryptColumn {
      *
      * @return like query column item
      */
-    public Optional<EncryptColumnItem<LikeEncryptAlgorithm<?, ?>>> 
getLikeQuery() {
+    public Optional<LikeQueryColumnItem> getLikeQuery() {
         return Optional.ofNullable(likeQuery);
     }
 }
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/column/item/AssistedQueryColumnItem.java
similarity index 76%
copy from 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
copy to 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
index 69f584f39f3..41bb6d21377 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/column/item/AssistedQueryColumnItem.java
@@ -15,22 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rule;
+package org.apache.shardingsphere.encrypt.rule.column.item;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
+import 
org.apache.shardingsphere.encrypt.api.encrypt.assisted.AssistedEncryptAlgorithm;
 
 /**
- * Encrypt column item.
- * 
- * @param <T> type of encryptor
+ * Assisted query column item.
  */
 @RequiredArgsConstructor
 @Getter
-public final class EncryptColumnItem<T extends EncryptAlgorithm<?, ?>> {
+public final class AssistedQueryColumnItem {
     
     private final String name;
     
-    private final T encryptor;
+    private final AssistedEncryptAlgorithm<?, ?> encryptor;
 }
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/column/item/CipherColumnItem.java
similarity index 77%
copy from 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
copy to 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/CipherColumnItem.java
index 69f584f39f3..4e59f4f9e66 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/column/item/CipherColumnItem.java
@@ -15,22 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rule;
+package org.apache.shardingsphere.encrypt.rule.column.item;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
+import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
 
 /**
- * Encrypt column item.
- * 
- * @param <T> type of encryptor
+ * Cipher column item.
  */
 @RequiredArgsConstructor
 @Getter
-public final class EncryptColumnItem<T extends EncryptAlgorithm<?, ?>> {
+public final class CipherColumnItem {
     
     private final String name;
     
-    private final T encryptor;
+    private final StandardEncryptAlgorithm<?, ?> encryptor;
 }
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/column/item/LikeQueryColumnItem.java
similarity index 77%
rename from 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
rename to 
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
index 69f584f39f3..100cd50bec8 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/column/item/LikeQueryColumnItem.java
@@ -15,22 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rule;
+package org.apache.shardingsphere.encrypt.rule.column.item;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
+import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
 
 /**
- * Encrypt column item.
- * 
- * @param <T> type of encryptor
+ * Like query column item.
  */
 @RequiredArgsConstructor
 @Getter
-public final class EncryptColumnItem<T extends EncryptAlgorithm<?, ?>> {
+public final class LikeQueryColumnItem {
     
     private final String name;
     
-    private final T encryptor;
+    private final LikeEncryptAlgorithm<?, ?> encryptor;
 }
diff --git 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
index 9cb592e3ddb..df4573f3e19 100644
--- 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
+++ 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGeneratorTest.java
@@ -21,10 +21,12 @@ import 
org.apache.shardingsphere.encrypt.api.encrypt.assisted.AssistedEncryptAlg
 import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
 import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
 import 
org.apache.shardingsphere.encrypt.rewrite.token.pojo.EncryptAlterTableToken;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumn;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumnItem;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.EncryptTable;
+import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import 
org.apache.shardingsphere.encrypt.rule.column.item.AssistedQueryColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.CipherColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
 import 
org.apache.shardingsphere.infra.binder.statement.ddl.AlterTableStatementContext;
 import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
 import 
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.RemoveToken;
@@ -82,17 +84,17 @@ class EncryptAlterTableTokenGeneratorTest {
     }
     
     private EncryptColumn mockEncryptColumn() {
-        EncryptColumn result = new EncryptColumn("certificate_number", new 
EncryptColumnItem<StandardEncryptAlgorithm<?, ?>>("cipher_certificate_number", 
mock(StandardEncryptAlgorithm.class)));
-        result.setAssistedQuery(new 
EncryptColumnItem<AssistedEncryptAlgorithm<?, 
?>>("assisted_certificate_number", mock(AssistedEncryptAlgorithm.class)));
-        result.setLikeQuery(new EncryptColumnItem<LikeEncryptAlgorithm<?, 
?>>("like_certificate_number", mock(LikeEncryptAlgorithm.class)));
+        EncryptColumn result = new EncryptColumn("certificate_number", new 
CipherColumnItem("cipher_certificate_number", 
mock(StandardEncryptAlgorithm.class)));
+        result.setAssistedQuery(new 
AssistedQueryColumnItem("assisted_certificate_number", 
mock(AssistedEncryptAlgorithm.class)));
+        result.setLikeQuery(new LikeQueryColumnItem("like_certificate_number", 
mock(LikeEncryptAlgorithm.class)));
         return result;
     }
     
     private EncryptColumn mockNewEncryptColumn() {
         EncryptColumn result = new EncryptColumn(
-                "certificate_number_new", new 
EncryptColumnItem<StandardEncryptAlgorithm<?, 
?>>("cipher_certificate_number_new", mock(StandardEncryptAlgorithm.class)));
-        result.setAssistedQuery(new 
EncryptColumnItem<AssistedEncryptAlgorithm<?, 
?>>("assisted_certificate_number_new", mock(AssistedEncryptAlgorithm.class)));
-        result.setLikeQuery(new EncryptColumnItem<LikeEncryptAlgorithm<?, 
?>>("like_certificate_number_new", mock(LikeEncryptAlgorithm.class)));
+                "certificate_number_new", new 
CipherColumnItem("cipher_certificate_number_new", 
mock(StandardEncryptAlgorithm.class)));
+        result.setAssistedQuery(new 
AssistedQueryColumnItem("assisted_certificate_number_new", 
mock(AssistedEncryptAlgorithm.class)));
+        result.setLikeQuery(new 
LikeQueryColumnItem("like_certificate_number_new", 
mock(LikeEncryptAlgorithm.class)));
         return result;
     }
     
diff --git 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
index a801fac7dd3..f86e145b033 100644
--- 
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
+++ 
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptCreateTableTokenGeneratorTest.java
@@ -20,10 +20,12 @@ package 
org.apache.shardingsphere.encrypt.rewrite.token.generator;
 import 
org.apache.shardingsphere.encrypt.api.encrypt.assisted.AssistedEncryptAlgorithm;
 import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
 import 
org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumn;
-import org.apache.shardingsphere.encrypt.rule.EncryptColumnItem;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.EncryptTable;
+import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import 
org.apache.shardingsphere.encrypt.rule.column.item.AssistedQueryColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.CipherColumnItem;
+import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
 import 
org.apache.shardingsphere.infra.binder.statement.ddl.CreateTableStatementContext;
 import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
 import 
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.RemoveToken;
@@ -68,15 +70,15 @@ class EncryptCreateTableTokenGeneratorTest {
         EncryptColumn column = mockEncryptColumn();
         when(result.isEncryptColumn("certificate_number")).thenReturn(true);
         
when(result.getCipherColumn("certificate_number")).thenReturn(column.getCipher().getName());
-        
when(result.findAssistedQueryColumn("certificate_number")).thenReturn(column.getAssistedQuery().map(EncryptColumnItem::getName));
-        
when(result.findLikeQueryColumn("certificate_number")).thenReturn(column.getLikeQuery().map(EncryptColumnItem::getName));
+        
when(result.findAssistedQueryColumn("certificate_number")).thenReturn(column.getAssistedQuery().map(AssistedQueryColumnItem::getName));
+        
when(result.findLikeQueryColumn("certificate_number")).thenReturn(column.getLikeQuery().map(LikeQueryColumnItem::getName));
         return result;
     }
     
     private EncryptColumn mockEncryptColumn() {
-        EncryptColumn result = new EncryptColumn("certificate_number", new 
EncryptColumnItem<StandardEncryptAlgorithm<?, ?>>("cipher_certificate_number", 
mock(StandardEncryptAlgorithm.class)));
-        result.setAssistedQuery(new 
EncryptColumnItem<AssistedEncryptAlgorithm<?, 
?>>("assisted_certificate_number", mock(AssistedEncryptAlgorithm.class)));
-        result.setLikeQuery(new EncryptColumnItem<LikeEncryptAlgorithm<?, 
?>>("like_certificate_number", mock(LikeEncryptAlgorithm.class)));
+        EncryptColumn result = new EncryptColumn("certificate_number", new 
CipherColumnItem("cipher_certificate_number", 
mock(StandardEncryptAlgorithm.class)));
+        result.setAssistedQuery(new 
AssistedQueryColumnItem("assisted_certificate_number", 
mock(AssistedEncryptAlgorithm.class)));
+        result.setLikeQuery(new LikeQueryColumnItem("like_certificate_number", 
mock(LikeEncryptAlgorithm.class)));
         return result;
     }
     

Reply via email to