[shardingsphere] branch master updated: Remove getLogicAndCipherColumnsMap.getLogicAndCipherColumnsMap() (#26349)

[zh...@apache.org]

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

zhonghongsheng 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 43097d7c383 Remove getLogicAndCipherColumnsMap.getLogicAndCipherColumnsMap() (#26349)
43097d7c383 is described below

commit 43097d7c3839075e394708ed20dba791c9859632
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jun 14 20:53:52 2023 +0800

    Remove getLogicAndCipherColumnsMap.getLogicAndCipherColumnsMap() (#26349)
---
 .../token/generator/InsertCipherNameTokenGenerator.java       | 11 ++++++-----
 .../org/apache/shardingsphere/encrypt/rule/EncryptRule.java   | 10 ----------
 .../apache/shardingsphere/encrypt/rule/EncryptRuleTest.java   |  5 -----
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
index aea76521fdd..f3eb38e3099 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
@@ -56,13 +56,14 @@ public final class InsertCipherNameTokenGenerator implements CollectionSQLTokenG
     
     @Override
     public Collection<SQLToken> generateSQLTokens(final InsertStatementContext insertStatementContext) {
-        Optional<InsertColumnsSegment> sqlSegment = insertStatementContext.getSqlStatement().getInsertColumns();
-        Preconditions.checkState(sqlSegment.isPresent());
-        Map<String, String> logicAndCipherColumns = encryptRule.getLogicAndCipherColumnsMap(insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue());
+        Optional<InsertColumnsSegment> insertColumnsSegment = insertStatementContext.getSqlStatement().getInsertColumns();
+        Preconditions.checkState(insertColumnsSegment.isPresent());
+        Map<String, String> logicAndCipherColumns = encryptRule.getEncryptTable(
+                insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue()).getLogicAndCipherColumns();
         Collection<SQLToken> result = new LinkedList<>();
-        for (ColumnSegment each : sqlSegment.get().getColumns()) {
+        for (ColumnSegment each : insertColumnsSegment.get().getColumns()) {
             if (logicAndCipherColumns.containsKey(each.getIdentifier().getValue())) {
-                Collection<Projection> projections = Collections.singletonList(new ColumnProjection(null, logicAndCipherColumns.get(each.getIdentifier().getValue()), null));
+                Collection<Projection> projections = Collections.singleton(new ColumnProjection(null, logicAndCipherColumns.get(each.getIdentifier().getValue()), null));
                 result.add(new SubstitutableColumnNameToken(each.getStartIndex(), each.getStopIndex(), projections));
             }
         }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
index d16d7847587..05371fc2528 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
@@ -200,16 +200,6 @@ public final class EncryptRule implements DatabaseRule, TableContainedRule {
         return result;
     }
     
-    /**
-     * Get logic and cipher columns map.
-     *
-     * @param tableName table name 
-     * @return logic and cipher columns map
-     */
-    public Map<String, String> getLogicAndCipherColumnsMap(final String tableName) {
-        return findEncryptTable(tableName).map(EncryptTable::getLogicAndCipherColumns).orElse(Collections.emptyMap());
-    }
-    
     /**
      * Get assisted query columns.
      * 
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
index e1077799d6c..18708034105 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
@@ -84,11 +84,6 @@ class EncryptRuleTest {
         }
     }
     
-    @Test
-    void assertGetLogicAndCipherColumns() {
-        assertFalse(new EncryptRule(createEncryptRuleConfiguration()).getLogicAndCipherColumnsMap("t_encrypt").isEmpty());
-    }
-    
     @Test
     void assertGetEncryptAssistedQueryValues() {
         List<Object> encryptAssistedQueryValues = new EncryptRule(createEncryptRuleConfiguration())