This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 4e8c4c4c49f Replace ShardingSphereURLProvider.accept to getPrefix
(#30104)
4e8c4c4c49f is described below
commit 4e8c4c4c49f5eacf6cfb789073024b8ed4cda349
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 13 14:21:52 2024 +0800
Replace ShardingSphereURLProvider.accept to getPrefix (#30104)
* Fix javadoc for ShardingSphereURLProvider
* Replace ShardingSphereURLProvider.accept to getPrefix
---
.../driver/jdbc/core/driver/ShardingSphereURLManager.java | 8 +++++---
.../jdbc/core/driver/ShardingSphereURLProvider.java | 15 +++++++--------
.../driver/spi/absolutepath/AbsolutePathURLProvider.java | 9 +++------
.../AbsolutePathWithEnvironmentURLProvider.java | 9 +++------
.../core/driver/spi/classpath/ClasspathURLProvider.java | 9 +++------
.../classpath/ClasspathWithEnvironmentURLProvider.java | 9 +++------
.../classpath/ClasspathWithSystemPropsURLProvider.java | 9 +++------
7 files changed, 27 insertions(+), 41 deletions(-)
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java
index 10deed6cb25..14d4b9fb795 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.driver.jdbc.core.driver;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.driver.jdbc.exception.syntax.URLProviderNotFoundException;
+import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
/**
@@ -29,16 +30,17 @@ import
org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
public final class ShardingSphereURLManager {
/**
- * Get config content from URL.
+ * Get configuration content from URL.
*
* @param url driver URL
- * @param urlPrefix url prefix
+ * @param urlPrefix URL prefix
* @return configuration content
* @throws URLProviderNotFoundException driver URL provider not found
exception
*/
public static byte[] getContent(final String url, final String urlPrefix) {
+ ShardingSpherePreconditions.checkNotNull(url, () -> new
URLProviderNotFoundException(url));
for (ShardingSphereURLProvider each :
ShardingSphereServiceLoader.getServiceInstances(ShardingSphereURLProvider.class))
{
- if (each.accept(url)) {
+ if (url.contains(each.getPrefix())) {
return each.getContent(url, urlPrefix);
}
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java
index 0529181e260..15eaa40accb 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java
@@ -23,19 +23,18 @@ package org.apache.shardingsphere.driver.jdbc.core.driver;
public interface ShardingSphereURLProvider {
/**
- * Check if the url is suitable for this provider.
+ * Get URL prefix.
*
- * @param url the driver url
- * @return true if the url is suitable for this provider or false
+ * @return URL prefix
*/
- boolean accept(String url);
+ String getPrefix();
/**
- * Get config content from url.
+ * Get configuration content from URL.
*
- * @param url the driver url
- * @param urlPrefix url prefix
- * @return the config content
+ * @param url driver URL
+ * @param urlPrefix URL prefix
+ * @return configuration content
*/
byte[] getContent(String url, String urlPrefix);
}
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 fb681ec96a3..f1cef34e4b7 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.driver.spi.absolutepath;
-import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
@@ -34,17 +33,15 @@ import java.nio.file.Files;
*/
public final class AbsolutePathURLProvider implements
AbstractAbsolutePathURLProvider {
- private static final String PATH_TYPE = "absolutepath:";
-
@Override
- public boolean accept(final String url) {
- return !Strings.isNullOrEmpty(url) && url.contains(PATH_TYPE);
+ public String getPrefix() {
+ return "absolutepath:";
}
@Override
@SneakyThrows(IOException.class)
public byte[] getContent(final String url, final String urlPrefix) {
- String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
PATH_TYPE);
+ String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
getPrefix());
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 dad0a5e6fd9..3715365745a 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.driver.spi.absolutepath;
-import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
@@ -35,17 +34,15 @@ import java.util.regex.Matcher;
*/
public final class AbsolutePathWithEnvironmentURLProvider implements
AbstractAbsolutePathURLProvider {
- private static final String PATH_TYPE = "absolutepath-environment:";
-
@Override
- public boolean accept(final String url) {
- return !Strings.isNullOrEmpty(url) && url.contains(PATH_TYPE);
+ public String getPrefix() {
+ return "absolutepath-environment:";
}
@Override
@SneakyThrows(IOException.class)
public byte[] getContent(final String url, final String urlPrefix) {
- String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
PATH_TYPE);
+ String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
getPrefix());
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 6535923693e..a5d6f209f6b 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.driver.spi.classpath;
-import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
@@ -32,17 +31,15 @@ import java.nio.charset.StandardCharsets;
*/
public final class ClasspathURLProvider implements
AbstractClasspathURLProvider {
- private static final String PATH_TYPE = "classpath:";
-
@Override
- public boolean accept(final String url) {
- return !Strings.isNullOrEmpty(url) && url.contains(PATH_TYPE);
+ public String getPrefix() {
+ return "classpath:";
}
@Override
@SneakyThrows(IOException.class)
public byte[] getContent(final String url, final String urlPrefix) {
- String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
PATH_TYPE);
+ String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
getPrefix());
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 2f79f636632..bb77f47a8ae 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.driver.spi.classpath;
-import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
@@ -33,17 +32,15 @@ import java.util.regex.Matcher;
*/
public final class ClasspathWithEnvironmentURLProvider implements
AbstractClasspathURLProvider {
- private static final String PATH_TYPE = "classpath-environment:";
-
@Override
- public boolean accept(final String url) {
- return !Strings.isNullOrEmpty(url) && url.contains(PATH_TYPE);
+ public String getPrefix() {
+ return "classpath-environment:";
}
@Override
@SneakyThrows(IOException.class)
public byte[] getContent(final String url, final String urlPrefix) {
- String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
PATH_TYPE);
+ String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
getPrefix());
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 cc8a4e4294d..c122a27c202 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.driver.spi.classpath;
-import com.google.common.base.Strings;
import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
@@ -33,17 +32,15 @@ import java.util.regex.Matcher;
*/
public final class ClasspathWithSystemPropsURLProvider implements
AbstractClasspathURLProvider {
- private static final String PATH_TYPE = "classpath-system-props:";
-
@Override
- public boolean accept(final String url) {
- return !Strings.isNullOrEmpty(url) && url.contains(PATH_TYPE);
+ public String getPrefix() {
+ return "classpath-system-props:";
}
@Override
@SneakyThrows(IOException.class)
public byte[] getContent(final String url, final String urlPrefix) {
- String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
PATH_TYPE);
+ String file = ArgsUtils.getConfigurationFile(url, urlPrefix,
getPrefix());
try (
InputStream stream =
ArgsUtils.getResourceAsStreamFromClasspath(file);
BufferedReader reader = new BufferedReader(new
InputStreamReader(stream, StandardCharsets.UTF_8))) {
