From b827018eb44bf16abb7533d0be45620003ba04db Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Thu, 25 Jul 2024 23:33:23 +0800 Subject: [PATCH] Rename EncryptorComparator (#32271) --- .../EncryptorComparator.java} | 10 +++++----- .../InsertSelectColumnsSameEncryptorUsageChecker.java | 6 +++--- .../JoinConditionsSameEncryptorUsageChecker.java | 6 +++--- .../EncryptPredicateColumnTokenGenerator.java | 2 +- .../insert/EncryptInsertCipherNameTokenGenerator.java | 2 +- .../EncryptInsertDefaultColumnsTokenGenerator.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/{acrosstable/SameEncryptorComparator.java => comparator/EncryptorComparator.java} (86%) rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/{acrosstable => comparator}/InsertSelectColumnsSameEncryptorUsageChecker.java (94%) rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/{acrosstable => comparator}/JoinConditionsSameEncryptorUsageChecker.java (92%) diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/SameEncryptorComparator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java similarity index 86% rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/SameEncryptorComparator.java rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java index 3d50ad0553c98..2dd7474d9c64a 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/SameEncryptorComparator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/InsertSelectColumnsSameEncryptorUsageChecker.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsSameEncryptorUsageChecker.java similarity index 94% rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/InsertSelectColumnsSameEncryptorUsageChecker.java rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsSameEncryptorUsageChecker.java index a5ebc696f305f..9cec77b5667b7 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/InsertSelectColumnsSameEncryptorUsageChecker.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsSameEncryptorUsageChecker.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 insertColumns, final Collection projections, final EncryptRule encryptRule) { Iterator insertColumnsIterator = insertColumns.iterator(); @@ -54,7 +54,7 @@ public static boolean isSame(final Collection 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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/JoinConditionsSameEncryptorUsageChecker.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsSameEncryptorUsageChecker.java similarity index 92% rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/JoinConditionsSameEncryptorUsageChecker.java rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsSameEncryptorUsageChecker.java index 15eda02e0fb4b..e506a4d697053 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/acrosstable/JoinConditionsSameEncryptorUsageChecker.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsSameEncryptorUsageChecker.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 joinConditions, final EncryptRule encryptRule) { for (BinaryOperationExpression each : joinConditions) { @@ -49,7 +49,7 @@ public static boolean isSame(final Collection 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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java index c16c27734c25a..69e2e744614b2 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateColumnTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java index 5cfb725118c98..fb3fc973aede8 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/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/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java index 454659e6f3462..2f6cdf1c711ee 100644 --- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java +++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/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;