Refactor ArgsUtils.getConfigurationSubject() (#30114)

* Refactor ShowEncryptRuleExecutor * Refactor ArgsUtils
apache · Feb 13, 2024 · 78c05da · 78c05da
1 parent 7b3a525
commit 78c05da
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/...java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java b/...java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -34,7 +34,6 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
@@ -67,14 +66,14 @@ private Collection<LocalDataQueryResultRow> buildColumnData(final EncryptTableRu
                     tableRuleConfig.getName(),
                     each.getName(),
                     each.getCipher().getName(),
-                    each.getAssistedQuery().map(EncryptColumnItemRuleConfiguration::getName).orElse(""),
-                    each.getLikeQuery().map(EncryptColumnItemRuleConfiguration::getName).orElse(""),
+                    each.getAssistedQuery().map(EncryptColumnItemRuleConfiguration::getName),
+                    each.getLikeQuery().map(EncryptColumnItemRuleConfiguration::getName),
                     encryptorAlgorithmConfig.getType(),
                     encryptorAlgorithmConfig.getProps(),
-                    assistedQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getType).orElse(""),
-                    assistedQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getProps).orElse(new Properties()),
-                    likeQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getType).orElse(""),
-                    likeQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getProps).orElse(new Properties())));
+                    assistedQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getType),
+                    assistedQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getProps),
+                    likeQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getType),
+                    likeQueryEncryptorAlgorithmConfig.map(AlgorithmConfiguration::getProps)));
         }
         return result;
     }

diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ArgsUtils.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ArgsUtils.java
@@ -80,17 +80,17 @@ public static String replaceArg(final String targetValue, final String defaultVa
     }
 
     /**
-     * Get configuration file.
+     * Get configuration subject.
      *
      * @param url URL
      * @param urlPrefix URL prefix
-     * @param pathType path type
-     * @return configuration file
+     * @param configurationType configuration type
+     * @return configuration subject
      */
-    public static String getConfigurationFile(final String url, final String urlPrefix, final String pathType) {
+    public static String getConfigurationSubject(final String url, final String urlPrefix, final String configurationType) {
         String configuredFile = url.substring(urlPrefix.length(), url.contains("?") ? url.indexOf('?') : url.length());
-        String result = configuredFile.substring(pathType.length());
-        Preconditions.checkArgument(!result.isEmpty(), "Configuration file is required in ShardingSphere URL.");
+        String result = configuredFile.substring(configurationType.length());
+        Preconditions.checkArgument(!result.isEmpty(), "Configuration subject is required in driver URL.");
         return result;
     }
 

diff --git a/...ache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java b/...ache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
@@ -41,7 +41,7 @@ public String getPathType() {
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
+        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getPathType());
         try (
                 InputStream stream = Files.newInputStream(new File(file).toPath());
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {

diff --git a/...here/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java b/...here/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java
@@ -42,7 +42,7 @@ public String getPathType() {
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
+        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getPathType());
         try (
                 InputStream stream = Files.newInputStream(new File(file).toPath());
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {

diff --git a/...org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java b/...org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java
@@ -39,7 +39,7 @@ public String getPathType() {
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
+        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getPathType());
         try (
                 InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(file);
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {

diff --git a/...dingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java b/...dingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java
@@ -40,7 +40,7 @@ public String getPathType() {
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
+        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getPathType());
         try (
                 InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(file);
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {

diff --git a/...dingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java b/...dingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java
@@ -40,7 +40,7 @@ public String getPathType() {
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
+        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getPathType());
         try (
                 InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(file);
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {