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/13 07:30:53 UTC

(shardingsphere) branch master updated: Rename ShardingSphereURLProvider.getPrefix() to getPathType() (#30108)

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 69652f488c9 Rename ShardingSphereURLProvider.getPrefix() to getPathType() (#30108)
69652f488c9 is described below

commit 69652f488c93c7b5bdbd0a92b00f7c1186a8de8d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Feb 13 15:30:46 2024 +0800

    Rename ShardingSphereURLProvider.getPrefix() to getPathType() (#30108)
    
    * Remove duplicate code on DistSQLQueryExecuteEngine
    
    * Rename ShardingSphereURLProvider.getPrefix() to getPathType()
---
 .../driver/jdbc/core/driver/ShardingSphereURLManager.java           | 2 +-
 .../driver/jdbc/core/driver/ShardingSphereURLProvider.java          | 6 +++---
 .../jdbc/core/driver/spi/absolutepath/AbsolutePathURLProvider.java  | 4 ++--
 .../spi/absolutepath/AbsolutePathWithEnvironmentURLProvider.java    | 4 ++--
 .../driver/jdbc/core/driver/spi/classpath/ClasspathURLProvider.java | 4 ++--
 .../driver/spi/classpath/ClasspathWithEnvironmentURLProvider.java   | 4 ++--
 .../driver/spi/classpath/ClasspathWithSystemPropsURLProvider.java   | 4 ++--
 7 files changed, 14 insertions(+), 14 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 14d4b9fb795..1700db4c999 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
@@ -40,7 +40,7 @@ public final class ShardingSphereURLManager {
     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.getPrefix())) {
+            if (url.contains(each.getPathType())) {
                 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 15eaa40accb..c6847351a2c 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,11 +23,11 @@ package org.apache.shardingsphere.driver.jdbc.core.driver;
 public interface ShardingSphereURLProvider {
     
     /**
-     * Get URL prefix.
+     * Get path type.
      * 
-     * @return URL prefix
+     * @return path type
      */
-    String getPrefix();
+    String getPathType();
     
     /**
      * Get configuration content from URL.
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 f1cef34e4b7..65d77487d53 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
@@ -34,14 +34,14 @@ import java.nio.file.Files;
 public final class AbsolutePathURLProvider implements AbstractAbsolutePathURLProvider {
     
     @Override
-    public String getPrefix() {
+    public String getPathType() {
         return "absolutepath:";
     }
     
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPrefix());
+        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
         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 3715365745a..ec43e84da81 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
@@ -35,14 +35,14 @@ import java.util.regex.Matcher;
 public final class AbsolutePathWithEnvironmentURLProvider implements AbstractAbsolutePathURLProvider {
     
     @Override
-    public String getPrefix() {
+    public String getPathType() {
         return "absolutepath-environment:";
     }
     
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPrefix());
+        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
         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 a5d6f209f6b..c68edb77992 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
@@ -32,14 +32,14 @@ import java.nio.charset.StandardCharsets;
 public final class ClasspathURLProvider implements AbstractClasspathURLProvider {
     
     @Override
-    public String getPrefix() {
+    public String getPathType() {
         return "classpath:";
     }
     
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPrefix());
+        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
         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 bb77f47a8ae..82ca3b2acd0 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
@@ -33,14 +33,14 @@ import java.util.regex.Matcher;
 public final class ClasspathWithEnvironmentURLProvider implements AbstractClasspathURLProvider {
     
     @Override
-    public String getPrefix() {
+    public String getPathType() {
         return "classpath-environment:";
     }
     
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPrefix());
+        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
         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 c122a27c202..8ff7f221342 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
@@ -33,14 +33,14 @@ import java.util.regex.Matcher;
 public final class ClasspathWithSystemPropsURLProvider implements AbstractClasspathURLProvider {
     
     @Override
-    public String getPrefix() {
+    public String getPathType() {
         return "classpath-system-props:";
     }
     
     @Override
     @SneakyThrows(IOException.class)
     public byte[] getContent(final String url, final String urlPrefix) {
-        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPrefix());
+        String file = ArgsUtils.getConfigurationFile(url, urlPrefix, getPathType());
         try (
                 InputStream stream = ArgsUtils.getResourceAsStreamFromClasspath(file);
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {