You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2024/02/14 14:45:50 UTC
(shardingsphere) branch master updated: Refactor ShardingSphereURLManager (#30126)
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 e8203c784af Refactor ShardingSphereURLManager (#30126)
e8203c784af is described below
commit e8203c784af64c38cfadc33eb72463317f5b7a92
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Feb 14 22:45:43 2024 +0800
Refactor ShardingSphereURLManager (#30126)
---
.../driver/jdbc/core/driver/DriverDataSourceCache.java | 2 +-
.../driver/jdbc/core/driver/url/ShardingSphereURL.java | 9 ++++-----
.../jdbc/core/driver/url/ShardingSphereURLManager.java | 5 ++---
.../jdbc/core/driver/url/type/ClasspathURLProvider.java | 2 +-
.../jdbc/core/driver/url/ShardingSphereURLManagerTest.java | 12 +++++-------
.../core/driver/url/type/AbsolutePathURLProviderTest.java | 2 +-
.../jdbc/core/driver/url/type/ClasspathURLProviderTest.java | 2 +-
7 files changed, 15 insertions(+), 19 deletions(-)
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 bcfd3f63e91..e176231bd3c 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
@@ -50,7 +50,7 @@ public final class DriverDataSourceCache {
@SuppressWarnings("unchecked")
private <T extends Throwable> DataSource createDataSource(final String url, final String urlPrefix) throws T {
try {
- return YamlShardingSphereDataSourceFactory.createDataSource(ShardingSphereURLManager.getContent(url, urlPrefix));
+ return YamlShardingSphereDataSourceFactory.createDataSource(ShardingSphereURLManager.getContent(url.substring(urlPrefix.length())));
} catch (final IOException ex) {
throw (T) new SQLException(ex);
} catch (final SQLException ex) {
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURL.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURL.java
index 40e95069ddb..70edae354a4 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURL.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURL.java
@@ -42,16 +42,15 @@ public final class ShardingSphereURL {
* Parse ShardingSphere URL.
*
* @param url ShardingSphere URL
- * @param urlPrefix URL prefix
* @param sourceType source type
* @return ShardingSphere URL
*/
- public static ShardingSphereURL parse(final String url, final String urlPrefix, final String sourceType) {
- return new ShardingSphereURL(parseConfigurationSubject(url, urlPrefix, sourceType), parseParameters(url));
+ public static ShardingSphereURL parse(final String url, final String sourceType) {
+ return new ShardingSphereURL(parseConfigurationSubject(url, sourceType), parseParameters(url));
}
- private static String parseConfigurationSubject(final String url, final String urlPrefix, final String configurationType) {
- String configuredSubject = url.substring(urlPrefix.length(), url.contains("?") ? url.indexOf('?') : url.length());
+ private static String parseConfigurationSubject(final String url, final String configurationType) {
+ String configuredSubject = url.substring(0, url.contains("?") ? url.indexOf('?') : url.length());
String result = configuredSubject.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/url/ShardingSphereURLManager.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManager.java
index 47c8efa3f39..78c756f45e3 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
@@ -33,15 +33,14 @@ public final class ShardingSphereURLManager {
* Get configuration content from URL.
*
* @param url driver URL
- * @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) {
+ public static byte[] getContent(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, urlPrefix, each.getSourceType()));
+ return each.getContent(ShardingSphereURL.parse(url, each.getSourceType()));
}
}
throw new URLProviderNotFoundException(url);
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProvider.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProvider.java
index 2c38940b2f1..ebca3431eca 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProvider.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/type/ClasspathURLProvider.java
@@ -45,7 +45,7 @@ public final class ClasspathURLProvider implements ShardingSphereURLProvider {
}
}
- private static InputStream getResourceAsStreamFromClasspath(final String resource) {
+ private InputStream getResourceAsStreamFromClasspath(final String resource) {
InputStream result = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
result = null == result ? Thread.currentThread().getContextClassLoader().getResourceAsStream("/" + resource) : result;
Preconditions.checkNotNull(result, "Can not find configuration file `%s`.", resource);
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManagerTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManagerTest.java
index c734aad633e..125c4bb43e6 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManagerTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/driver/url/ShardingSphereURLManagerTest.java
@@ -37,24 +37,22 @@ class ShardingSphereURLManagerTest {
private final int fooDriverConfigLengthOnWindows = 1040;
- private final String urlPrefix = "jdbc:shardingsphere:";
-
@Test
void assertNewConstructorWithEmptyURL() {
- assertThrows(URLProviderNotFoundException.class, () -> ShardingSphereURLManager.getContent("jdbc:shardingsphere:", urlPrefix));
+ assertThrows(URLProviderNotFoundException.class, () -> ShardingSphereURLManager.getContent("invalid:xxx"));
}
@Test
@EnabledOnOs({OS.LINUX, OS.MAC})
void assertToClasspathConfigurationFile() {
- byte[] actual = ShardingSphereURLManager.getContent("jdbc:shardingsphere:classpath:config/driver/foo-driver-fixture.yaml", urlPrefix);
+ byte[] actual = ShardingSphereURLManager.getContent("classpath:config/driver/foo-driver-fixture.yaml");
assertThat(actual.length, is(fooDriverConfigLengthOnUnix));
}
@Test
@EnabledOnOs(OS.WINDOWS)
void assertToClasspathConfigurationFileOnWindows() {
- byte[] actual = ShardingSphereURLManager.getContent("jdbc:shardingsphere:classpath:config/driver/foo-driver-fixture.yaml", urlPrefix);
+ byte[] actual = ShardingSphereURLManager.getContent("classpath:config/driver/foo-driver-fixture.yaml");
assertThat(actual.length, is(fooDriverConfigLengthOnWindows));
}
@@ -62,7 +60,7 @@ class ShardingSphereURLManagerTest {
@EnabledOnOs({OS.LINUX, OS.MAC})
void assertToAbsolutePathConfigurationFile() {
String absolutePath = Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("config/driver/foo-driver-fixture.yaml")).getPath();
- byte[] actual = ShardingSphereURLManager.getContent("jdbc:shardingsphere:absolutepath:" + absolutePath, urlPrefix);
+ byte[] actual = ShardingSphereURLManager.getContent("absolutepath:" + absolutePath);
assertThat(actual.length, is(fooDriverConfigLengthOnUnix));
}
@@ -70,7 +68,7 @@ class ShardingSphereURLManagerTest {
@EnabledOnOs(OS.WINDOWS)
void assertToAbsolutePathConfigurationFileOnWindows() {
String absolutePath = Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("config/driver/foo-driver-fixture.yaml")).getPath();
- byte[] actual = ShardingSphereURLManager.getContent("jdbc:shardingsphere:absolutepath:" + absolutePath, urlPrefix);
+ byte[] actual = ShardingSphereURLManager.getContent("absolutepath:" + absolutePath);
assertThat(actual.length, is(fooDriverConfigLengthOnWindows));
}
}
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 d7ca42b90ad..73b54ed6311 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
@@ -35,7 +35,7 @@ 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("jdbc:shardingsphere:absolutepath:" + path, "jdbc:shardingsphere:");
+ byte[] expected = ShardingSphereURLManager.getContent("absolutepath:" + path);
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 4ad92e6c2ef..6c1cbe8d9a4 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
@@ -32,7 +32,7 @@ class ClasspathURLProviderTest {
@Test
void assertGetContent() {
byte[] actual = new ClasspathURLProvider().getContent(mockURL());
- byte[] expected = ShardingSphereURLManager.getContent("jdbc:shardingsphere:classpath:config/driver/foo-driver-fixture.yaml", "jdbc:shardingsphere:");
+ byte[] expected = ShardingSphereURLManager.getContent("classpath:config/driver/foo-driver-fixture.yaml");
assertThat(actual, is(expected));
}