This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 78c05da2841 Refactor ArgsUtils.getConfigurationSubject() (#30114)
78c05da2841 is described below
commit 78c05da2841013577dee827afd197e67dc060e3e
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 13 23:49:23 2024 +0800
Refactor ArgsUtils.getConfigurationSubject() (#30114)
* Refactor ShowEncryptRuleExecutor
* Refactor ArgsUtils
---
.../distsql/handler/query/ShowEncryptRuleExecutor.java | 13 ++++++-------
.../shardingsphere/driver/jdbc/core/driver/ArgsUtils.java | 12 ++++++------
.../driver/spi/absolutepath/AbsolutePathURLProvider.java | 2 +-
.../AbsolutePathWithEnvironmentURLProvider.java | 2 +-
.../core/driver/spi/classpath/ClasspathURLProvider.java | 2 +-
.../spi/classpath/ClasspathWithEnvironmentURLProvider.java | 2 +-
.../spi/classpath/ClasspathWithSystemPropsURLProvider.java | 2 +-
7 files changed, 17 insertions(+), 18 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index 44514d9e9ad..8bdb5712514 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -34,7 +34,6 @@ import java.util.Collection;
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 @@ public final class ShowEncryptRuleExecutor implements
DistSQLQueryExecutor<ShowE
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
index 59e89dd6dcb..124042939d0 100644
---
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 final class ArgsUtils {
}
/**
- * 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/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
index 65d77487d53..602a780158b 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
@@ -41,7 +41,7 @@ public final class AbsolutePathURLProvider implements
AbstractAbsolutePathURLPro
@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/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java
index ec43e84da81..e8280d97758 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java
@@ -42,7 +42,7 @@ public final class AbsolutePathWithEnvironmentURLProvider
implements AbstractAbs
@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/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java
index c68edb77992..acb7d37ad1c 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java
@@ -39,7 +39,7 @@ public final class ClasspathURLProvider implements
AbstractClasspathURLProvider
@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/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java
index 82ca3b2acd0..4d635a7230d 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java
@@ -40,7 +40,7 @@ public final class ClasspathWithEnvironmentURLProvider
implements AbstractClassp
@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/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java
index 8ff7f221342..ad47fb136f6 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java
@@ -40,7 +40,7 @@ public final class ClasspathWithSystemPropsURLProvider
implements AbstractClassp
@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))) {
