Refactor EncryptRuleConfigurationToDistSQLConverter

apache · Oct 30, 2024 · 03c7954 · 03c7954
1 parent 6cb1a64
commit 03c7954
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/...gsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java b/...gsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
@@ -58,14 +58,11 @@ private String convertEncryptColumn(final EncryptColumnRuleConfiguration columnR
 
     private String convertColumns(final EncryptColumnRuleConfiguration columnRuleConfig) {
         StringBuilder result = new StringBuilder();
-        String cipherColumnName = columnRuleConfig.getCipher().getName();
-        result.append(String.format(EncryptConvertDistSQLConstants.CIPHER, cipherColumnName));
-        if (columnRuleConfig.getAssistedQuery().isPresent()) {
-            result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_COLUMN, columnRuleConfig.getAssistedQuery().get().getName()));
-        }
-        if (columnRuleConfig.getLikeQuery().isPresent()) {
-            result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_COLUMN, columnRuleConfig.getLikeQuery().get().getName()));
-        }
+        result.append(String.format(EncryptConvertDistSQLConstants.CIPHER, columnRuleConfig.getCipher().getName()));
+        columnRuleConfig.getAssistedQuery()
+                .ifPresent(optional -> result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_COLUMN, optional.getName())));
+        columnRuleConfig.getLikeQuery()
+                .ifPresent(optional -> result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_COLUMN, optional.getName())));
         return result.toString();
     }