(shardingsphere) branch master updated: Refactor EncryptTable (#33634)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 8e684ae6bdf Refactor EncryptTable (#33634)
8e684ae6bdf is described below

commit 8e684ae6bdf0cfdf582af899a7d75d909f516df1
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Nov 12 22:58:51 2024 +0800

    Refactor EncryptTable (#33634)
---
 .../apache/shardingsphere/encrypt/rule/table/EncryptTable.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/table/EncryptTable.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/table/EncryptTable.java
index 707b0770792..629649cde02 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/table/EncryptTable.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/table/EncryptTable.java
@@ -59,12 +59,15 @@ public final class EncryptTable {
     }
     
     private EncryptColumn createEncryptColumn(final 
EncryptColumnRuleConfiguration config, final Map<String, EncryptAlgorithm> 
encryptors) {
-        EncryptColumn result = new EncryptColumn(config.getName(), new 
CipherColumnItem(config.getCipher().getName(), 
encryptors.get(config.getCipher().getEncryptorName())));
+        CipherColumnItem cipherColumnItem = new 
CipherColumnItem(config.getCipher().getName(), 
encryptors.get(config.getCipher().getEncryptorName()));
+        EncryptColumn result = new EncryptColumn(config.getName(), 
cipherColumnItem);
         if (config.getAssistedQuery().isPresent()) {
-            result.setAssistedQuery(new 
AssistedQueryColumnItem(config.getAssistedQuery().get().getName(), 
encryptors.get(config.getAssistedQuery().get().getEncryptorName())));
+            AssistedQueryColumnItem assistedQueryColumn = new 
AssistedQueryColumnItem(config.getAssistedQuery().get().getName(), 
encryptors.get(config.getAssistedQuery().get().getEncryptorName()));
+            result.setAssistedQuery(assistedQueryColumn);
         }
         if (config.getLikeQuery().isPresent()) {
-            result.setLikeQuery(new 
LikeQueryColumnItem(config.getLikeQuery().get().getName(), 
encryptors.get(config.getLikeQuery().get().getEncryptorName())));
+            LikeQueryColumnItem likeQueryColumn = new 
LikeQueryColumnItem(config.getLikeQuery().get().getName(), 
encryptors.get(config.getLikeQuery().get().getEncryptorName()));
+            result.setLikeQuery(likeQueryColumn);
         }
         return result;
     }