[shardingsphere] branch master updated: Refactor AssistedQueryColumnItem and LikeQueryColumnItem (#26499)

[sunnianjun]

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

sunnianjun 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 a6f7fd42f61 Refactor AssistedQueryColumnItem and LikeQueryColumnItem 
(#26499)
a6f7fd42f61 is described below

commit a6f7fd42f61cd9e4474261a8d95e2c3acf0dcbd5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jun 22 21:21:24 2023 +0800

    Refactor AssistedQueryColumnItem and LikeQueryColumnItem (#26499)
---
 .../rewrite/token/generator/EncryptAlterTableTokenGenerator.java  | 8 ++++----
 .../encrypt/rule/column/item/AssistedQueryColumnItem.java         | 2 +-
 .../encrypt/rule/column/item/LikeQueryColumnItem.java             | 2 +-
 3 files changed, 6 insertions(+), 6 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 fe7a1afcc81..aa9806fded2 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
@@ -183,12 +183,12 @@ public final class EncryptAlterTableTokenGenerator 
implements CollectionSQLToken
     }
     
     private void isSameEncryptColumn(final EncryptTable encryptTable, final 
ChangeColumnDefinitionSegment segment) {
-        Optional<StandardEncryptAlgorithm<?, ?>> previousEncryptorName = 
encryptTable.findEncryptor(segment.getPreviousColumn().getIdentifier().getValue());
-        Optional<StandardEncryptAlgorithm<?, ?>> currentEncryptorName = 
encryptTable.findEncryptor(segment.getColumnDefinition().getColumnName().getIdentifier().getValue());
-        if (!previousEncryptorName.isPresent() && 
!currentEncryptorName.isPresent()) {
+        Optional<StandardEncryptAlgorithm<?, ?>> previousEncryptor = 
encryptTable.findEncryptor(segment.getPreviousColumn().getIdentifier().getValue());
+        Optional<StandardEncryptAlgorithm<?, ?>> currentEncryptor = 
encryptTable.findEncryptor(segment.getColumnDefinition().getColumnName().getIdentifier().getValue());
+        if (!previousEncryptor.isPresent() && !currentEncryptor.isPresent()) {
             return;
         }
-        
ShardingSpherePreconditions.checkState(previousEncryptorName.equals(currentEncryptorName)
 && checkPreviousAndAfterHasSameColumnNumber(encryptTable, segment),
+        
ShardingSpherePreconditions.checkState(previousEncryptor.equals(currentEncryptor)
 && checkPreviousAndAfterHasSameColumnNumber(encryptTable, segment),
                 () -> new EncryptColumnAlterException(
                         encryptTable.getTable(), 
segment.getColumnDefinition().getColumnName().getIdentifier().getValue(), 
segment.getPreviousColumn().getIdentifier().getValue()));
     }
diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
index dc9412bff7b..a11b2ddb5b4 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
@@ -30,9 +30,9 @@ import java.util.List;
  * Assisted query column item.
  */
 @RequiredArgsConstructor
-@Getter
 public final class AssistedQueryColumnItem {
     
+    @Getter
     private final String name;
     
     @SuppressWarnings("rawtypes")
diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
index 1971682f05e..5a0ebbf5a67 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
@@ -30,9 +30,9 @@ import java.util.List;
  * Like query column item.
  */
 @RequiredArgsConstructor
-@Getter
 public final class LikeQueryColumnItem {
     
+    @Getter
     private final String name;
     
     @SuppressWarnings("rawtypes")