This is an automated email from the ASF dual-hosted git repository.
panjuan 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 c0bee274782 Refactor ArgsUtils (#30105)
c0bee274782 is described below
commit c0bee274782b17546341f07c1f44ff4afc0de65c
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 13 14:55:08 2024 +0800
Refactor ArgsUtils (#30105)
---
.../driver/jdbc/core/driver/ArgsUtils.java | 47 +++++++++++-----------
.../jdbc/core/driver/DriverDataSourceCache.java | 2 +-
2 files changed, 25 insertions(+), 24 deletions(-)
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 74e8395a508..59e89dd6dcb 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
@@ -19,15 +19,18 @@ package org.apache.shardingsphere.driver.jdbc.core.driver;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import java.io.InputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Arguments Utils.
+ * Arguments utils.
*/
-public class ArgsUtils {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ArgsUtils {
private static final String KEY_VALUE_SEPARATOR = "::";
@@ -38,9 +41,9 @@ public class ArgsUtils {
}
/**
- * Get Pattern.
+ * Get pattern.
*
- * @return {@link java.util.regex.Pattern}
+ * @return got pattern
*/
public static Pattern getPattern() {
return PATTERN;
@@ -49,8 +52,8 @@ public class ArgsUtils {
/**
* Get arg name and default value.
*
- * @param matcher {@link Matcher}
- * @return Argument name and default value.
+ * @param matcher matcher
+ * @return argument name and default value
*/
public static String[] getArgNameAndDefaultValue(final Matcher matcher) {
String groupString = matcher.group(1);
@@ -60,10 +63,10 @@ public class ArgsUtils {
/**
* Replace argument.
*
- * @param targetValue the value of the argument
- * @param defaultValue the default value of the argument
- * @param matcher {@link Matcher}
- * @return {@link String}
+ * @param targetValue value of argument
+ * @param defaultValue default value of argument
+ * @param matcher matcher
+ * @return replaced argument
*/
public static String replaceArg(final String targetValue, final String
defaultValue, final Matcher matcher) {
if (Strings.isNullOrEmpty(targetValue) && defaultValue.isEmpty()) {
@@ -79,31 +82,29 @@ public class ArgsUtils {
/**
* Get configuration file.
*
- * @param url url
- * @param urlPrefix url prefix
- * @param pathType path type
- * @return {@link String}
+ * @param url URL
+ * @param urlPrefix URL prefix
+ * @param pathType path type
+ * @return configuration file
*/
public static String getConfigurationFile(final String url, final String
urlPrefix, final String pathType) {
String configuredFile = url.substring(urlPrefix.length(),
url.contains("?") ? url.indexOf('?') : url.length());
- String file = configuredFile.substring(pathType.length());
- Preconditions.checkArgument(!file.isEmpty(), "Configuration file is
required in ShardingSphere URL.");
- return file;
+ String result = configuredFile.substring(pathType.length());
+ Preconditions.checkArgument(!result.isEmpty(), "Configuration file is
required in ShardingSphere URL.");
+ return result;
}
/**
* Get resource as stream from classpath.
*
* @param resource resource
- * @return {@link InputStream}
- * @throws IllegalArgumentException Can not find configuration file.
+ * @return input stream
+ * @throws IllegalArgumentException throw when configuration file not found
*/
public static InputStream getResourceAsStreamFromClasspath(final String
resource) {
InputStream result =
Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
result = null == result ?
Thread.currentThread().getContextClassLoader().getResourceAsStream("/" +
resource) : result;
- if (null != result) {
- return result;
- }
- throw new IllegalArgumentException(String.format("Can not find
configuration file `%s`.", resource));
+ Preconditions.checkNotNull(result, "Can not find configuration file
`%s`.", resource);
+ return result;
}
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
index 0550bc8fc8a..5bc52ffdd37 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
@@ -36,7 +36,7 @@ public final class DriverDataSourceCache {
* Get data source.
*
* @param url URL
- * @param urlPrefix url prefix
+ * @param urlPrefix URL prefix
* @return got data source
*/
public DataSource get(final String url, final String urlPrefix) {
