Rename EncryptorComparator (#32271)

apache · Jul 25, 2024 · b827018 · b827018
1 parent b71b583
commit b827018
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.../acrosstable/SameEncryptorComparator.java → ...token/comparator/EncryptorComparator.java b/.../acrosstable/SameEncryptorComparator.java → ...token/comparator/EncryptorComparator.java
@@ -15,24 +15,24 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.acrosstable;
+package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
 
 /**
- * Same encryptor comparator.
+ * Encryptor comparator.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SameEncryptorComparator {
+public final class EncryptorComparator {
 
     /**
-     * Compare whether to same encryptor.
+     * Compare whether same encryptor.
      *
      * @param encryptor1 encryptor 1 to be compared
      * @param encryptor2 encryptor 2 to be compared
-     * @return same or different encryptors
+     * @return same encryptors or not
      */
     public static boolean isSame(final EncryptAlgorithm encryptor1, final EncryptAlgorithm encryptor2) {
         if (null == encryptor1 && null == encryptor2) {

diff --git a/...lectColumnsSameEncryptorUsageChecker.java → ...lectColumnsSameEncryptorUsageChecker.java b/...lectColumnsSameEncryptorUsageChecker.java → ...lectColumnsSameEncryptorUsageChecker.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.acrosstable;
+package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -42,7 +42,7 @@ public final class InsertSelectColumnsSameEncryptorUsageChecker {
      * @param insertColumns insert columns
      * @param projections projections
      * @param encryptRule encrypt rule
-     * @return same or different encryptors are using 
+     * @return same encryptors or not 
      */
     public static boolean isSame(final Collection<ColumnSegment> insertColumns, final Collection<Projection> projections, final EncryptRule encryptRule) {
         Iterator<ColumnSegment> insertColumnsIterator = insertColumns.iterator();
@@ -54,7 +54,7 @@ public static boolean isSame(final Collection<ColumnSegment> insertColumns, fina
             Projection projection = projectionIterator.next();
             ColumnSegmentBoundInfo columnBoundInfo = getColumnSegmentBoundInfo(projection);
             EncryptAlgorithm projectionEncryptor = encryptRule.findQueryEncryptor(columnBoundInfo.getOriginalTable().getValue(), columnBoundInfo.getOriginalColumn().getValue()).orElse(null);
-            if (!SameEncryptorComparator.isSame(columnEncryptor, projectionEncryptor)) {
+            if (!EncryptorComparator.isSame(columnEncryptor, projectionEncryptor)) {
                 return false;
             }
         }

diff --git a/...nConditionsSameEncryptorUsageChecker.java → ...nConditionsSameEncryptorUsageChecker.java b/...nConditionsSameEncryptorUsageChecker.java → ...nConditionsSameEncryptorUsageChecker.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.acrosstable;
+package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -38,7 +38,7 @@ public final class JoinConditionsSameEncryptorUsageChecker {
      *
      * @param joinConditions join conditions
      * @param encryptRule encrypt rule
-     * @return same or different encryptors are using
+     * @return same encryptors or not
      */
     public static boolean isSame(final Collection<BinaryOperationExpression> joinConditions, final EncryptRule encryptRule) {
         for (BinaryOperationExpression each : joinConditions) {
@@ -49,7 +49,7 @@ public static boolean isSame(final Collection<BinaryOperationExpression> joinCon
             EncryptAlgorithm leftColumnEncryptor = encryptRule.findQueryEncryptor(leftColumnInfo.getOriginalTable().getValue(), leftColumnInfo.getOriginalColumn().getValue()).orElse(null);
             ColumnSegmentBoundInfo rightColumnInfo = ((ColumnSegment) each.getRight()).getColumnBoundInfo();
             EncryptAlgorithm rightColumnEncryptor = encryptRule.findQueryEncryptor(rightColumnInfo.getOriginalTable().getValue(), rightColumnInfo.getOriginalColumn().getValue()).orElse(null);
-            if (!SameEncryptorComparator.isSame(leftColumnEncryptor, rightColumnEncryptor)) {
+            if (!EncryptorComparator.isSame(leftColumnEncryptor, rightColumnEncryptor)) {
                 return false;
             }
         }

diff --git a/.../shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java b/.../shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java
@@ -21,7 +21,7 @@
 import org.apache.shardingsphere.encrypt.exception.syntax.UnsupportedEncryptSQLException;
 import org.apache.shardingsphere.encrypt.rewrite.aware.DatabaseTypeAware;
 import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
-import org.apache.shardingsphere.encrypt.rewrite.token.acrosstable.JoinConditionsSameEncryptorUsageChecker;
+import org.apache.shardingsphere.encrypt.rewrite.token.comparator.JoinConditionsSameEncryptorUsageChecker;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
 import org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;

diff --git a/...gsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java b/...gsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Preconditions;
 import lombok.Setter;
 import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
-import org.apache.shardingsphere.encrypt.rewrite.token.acrosstable.InsertSelectColumnsSameEncryptorUsageChecker;
+import org.apache.shardingsphere.encrypt.rewrite.token.comparator.InsertSelectColumnsSameEncryptorUsageChecker;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;

diff --git a/...ere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java b/...ere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Preconditions;
 import lombok.Setter;
 import org.apache.shardingsphere.encrypt.rewrite.aware.EncryptRuleAware;
-import org.apache.shardingsphere.encrypt.rewrite.token.acrosstable.InsertSelectColumnsSameEncryptorUsageChecker;
+import org.apache.shardingsphere.encrypt.rewrite.token.comparator.InsertSelectColumnsSameEncryptorUsageChecker;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
 import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;