(shardingsphere) branch master updated: Remove useless ShardingSphereURLManager.getContent() (#30129)

[panjuan]

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 ee4cbc8a2d5 Remove useless ShardingSphereURLManager.getContent() 
(#30129)
ee4cbc8a2d5 is described below

commit ee4cbc8a2d55c21356044e0d6599d4ced0d0a643
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 15 11:44:48 2024 +0800

    Remove useless ShardingSphereURLManager.getContent() (#30129)
---
 .../driver/jdbc/core/driver/url/ShardingSphereURLManager.java  | 10 +++++-----
 .../jdbc/core/driver/url/type/AbsolutePathURLProviderTest.java |  4 +++-
 .../jdbc/core/driver/url/type/ClasspathURLProviderTest.java    |  4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManager.java
 
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManager.java
index b657e398a72..c896ce3e3f9 100644
--- 
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManager.java
+++ 
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManager.java
@@ -30,17 +30,17 @@ import 
org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 public final class ShardingSphereURLManager {
     
     /**
-     * Get configuration content from URL.
+     * Get ShardingSphere URL provider.
      *
      * @param url URL
-     * @return configuration content
-     * @throws URLProviderNotFoundException driver URL provider not found 
exception
+     * @return URL provider
+     * @throws URLProviderNotFoundException thrown if URL provider not found
      */
-    public static byte[] getContent(final String url) {
+    public static ShardingSphereURLProvider getURLProvider(final String url) {
         ShardingSpherePreconditions.checkNotNull(url, () -> new 
URLProviderNotFoundException(url));
         for (ShardingSphereURLProvider each : 
ShardingSphereServiceLoader.getServiceInstances(ShardingSphereURLProvider.class))
 {
             if (url.contains(each.getSourceType())) {
-                return each.getContent(ShardingSphereURL.parse(url, 
each.getSourceType()));
+                return each;
             }
         }
         throw new URLProviderNotFoundException(url);
diff --git 
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/AbsolutePathURLProviderTest.java
 
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/AbsolutePathURLProviderTest.java
index 73b54ed6311..eee7afe0aa7 100644
--- 
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/AbsolutePathURLProviderTest.java
+++ 
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/AbsolutePathURLProviderTest.java
@@ -19,6 +19,7 @@ package 
org.apache.shardingsphere.driver.jdbc.core.driver.url.type;
 
 import org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURL;
 import 
org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURLManager;
+import 
org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURLProvider;
 import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
@@ -35,7 +36,8 @@ class AbsolutePathURLProviderTest {
     void assertGetContent() {
         String path = 
Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("config/driver/foo-driver-fixture.yaml")).getPath();
         byte[] actual = new 
AbsolutePathURLProvider().getContent(mockURL(path));
-        byte[] expected = ShardingSphereURLManager.getContent("absolutepath:" 
+ path);
+        ShardingSphereURLProvider urlProvider = 
ShardingSphereURLManager.getURLProvider("absolutepath:" + path);
+        byte[] expected = 
urlProvider.getContent(ShardingSphereURL.parse("absolutepath:" + path, 
urlProvider.getSourceType()));
         assertThat(actual, is(expected));
     }
     
diff --git 
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProviderTest.java
 
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProviderTest.java
index 6c1cbe8d9a4..88f9ae6d94f 100644
--- 
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProviderTest.java
+++ 
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProviderTest.java
@@ -19,6 +19,7 @@ package 
org.apache.shardingsphere.driver.jdbc.core.driver.url.type;
 
 import org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURL;
 import 
org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURLManager;
+import 
org.apache.shardingsphere.driver.jdbc.core.driver.url.ShardingSphereURLProvider;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +33,8 @@ class ClasspathURLProviderTest {
     @Test
     void assertGetContent() {
         byte[] actual = new ClasspathURLProvider().getContent(mockURL());
-        byte[] expected = 
ShardingSphereURLManager.getContent("classpath:config/driver/foo-driver-fixture.yaml");
+        ShardingSphereURLProvider urlProvider = 
ShardingSphereURLManager.getURLProvider("classpath:config/driver/foo-driver-fixture.yaml");
+        byte[] expected = 
urlProvider.getContent(ShardingSphereURL.parse("classpath:config/driver/foo-driver-fixture.yaml",
 urlProvider.getSourceType()));
         assertThat(actual, is(expected));
     }