Refactor ShardingSphereURLProvider.getContent() (#30116)

apache · Feb 13, 2024 · 4538c3f · 4538c3f
1 parent 79643ab
commit 4538c3f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/...main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java b/...main/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManager.java
@@ -41,7 +41,7 @@ public static byte[] getContent(final String url, final String urlPrefix) {
         ShardingSpherePreconditions.checkNotNull(url, () -> new URLProviderNotFoundException(url));
         for (ShardingSphereURLProvider each : ShardingSphereServiceLoader.getServiceInstances(ShardingSphereURLProvider.class)) {
             if (url.contains(each.getConfigurationType())) {
-                return each.getContent(url, urlPrefix);
+                return each.getContent(url, ArgsUtils.getConfigurationSubject(url, urlPrefix, each.getConfigurationType()));
             }
         }
         throw new URLProviderNotFoundException(url);

diff --git a/...ain/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java b/...ain/java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLProvider.java
@@ -33,8 +33,8 @@ public interface ShardingSphereURLProvider {
      * Get configuration content from URL.
      *
      * @param url driver URL
-     * @param urlPrefix URL prefix
+     * @param configurationSubject configuration subject
      * @return configuration content
      */
-    byte[] getContent(String url, String urlPrefix);
+    byte[] getContent(String url, String configurationSubject);
 }
diff --git a/...ache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java b/...ache/shardingsphere/driver/jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.driver.jdbc.core.driver.spi.absolutepath;
 
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.driver.jdbc.core.driver.ArgsUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -40,10 +39,9 @@ public String getConfigurationType() {
 
     @Override
     @SneakyThrows(IOException.class)
-    public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getConfigurationType());
+    public byte[] getContent(final String url, final String configurationSubject) {
         try (
-                InputStream stream = Files.newInputStream(new File(file).toPath());
+                InputStream stream = Files.newInputStream(new File(configurationSubject).toPath());
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             StringBuilder builder = new StringBuilder();
             String line;

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

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
@@ -38,10 +38,9 @@ public String getConfigurationType() {
 
     @Override
     @SneakyThrows(IOException.class)
-    public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationSubject(url, urlPrefix, getConfigurationType());
+    public byte[] getContent(final String url, final String configurationSubject) {
         try (
-                InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(file);
+                InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(configurationSubject);
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             StringBuilder builder = new StringBuilder();
             String line;

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

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