for #1898, JDBCURLRecognizerXXX => JDBCDriverURLRecognizerXXX

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/datasource/JDBCRawBackendDataSourceFactory.java

@@ -22,7 +22,7 @@ import com.zaxxer.hikari.HikariDataSource;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.core.exception.ShardingException;
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCURLRecognizerEngine;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCDriverURLRecognizerEngine;
 import org.apache.shardingsphere.shardingproxy.config.yaml.YamlDataSourceParameter;
 
 import javax.sql.DataSource;
@@ -50,7 +50,7 @@ public final class JDBCRawBackendDataSourceFactory implements JDBCBackendDataSou
     @Override
     public DataSource build(final String dataSourceName, final YamlDataSourceParameter dataSourceParameter) {
         HikariConfig config = new HikariConfig();
-        String driverClassName = JDBCURLRecognizerEngine.getDriverClassName(dataSourceParameter.getUrl());
+        String driverClassName = JDBCDriverURLRecognizerEngine.getDriverClassName(dataSourceParameter.getUrl());
         validateDriverClassName(driverClassName);
         config.setDriverClassName(driverClassName);
         config.setJdbcUrl(dataSourceParameter.getUrl());

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/datasource/JDBCXABackendDataSourceFactory.java

@@ -23,11 +23,12 @@ import com.atomikos.jdbc.AtomikosDataSourceBean;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.core.config.DatabaseAccessConfiguration;
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCURLRecognizerEngine;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCDriverURLRecognizerEngine;
 import org.apache.shardingsphere.shardingproxy.config.yaml.YamlDataSourceParameter;
 import org.apache.shardingsphere.shardingproxy.runtime.GlobalRegistry;
 import org.apache.shardingsphere.transaction.xa.jta.datasource.XADataSourceFactory;
 import org.apache.shardingsphere.transaction.xa.jta.datasource.properties.XAPropertiesFactory;
+
 import javax.sql.DataSource;
 import javax.sql.XADataSource;
 import java.util.Properties;
@@ -73,7 +74,7 @@ public final class JDBCXABackendDataSourceFactory implements JDBCBackendDataSour
                                  final String dataSourceName, final XADataSource xaDataSource, final YamlDataSourceParameter dataSourceParameter) throws PropertyException {
         dataSourceBean.setXaDataSourceClassName(xaDataSource.getClass().getName());
         dataSourceBean.setUniqueResourceName(dataSourceName);
-        Properties xaProperties = XAPropertiesFactory.createXAProperties(JDBCURLRecognizerEngine.getDatabaseType(dataSourceParameter.getUrl())).build(
+        Properties xaProperties = XAPropertiesFactory.createXAProperties(JDBCDriverURLRecognizerEngine.getDatabaseType(dataSourceParameter.getUrl())).build(
                 new DatabaseAccessConfiguration(dataSourceParameter.getUrl(), dataSourceParameter.getUsername(), dataSourceParameter.getPassword()));
         PropertyUtils.setProperties(xaDataSource, xaProperties);
         dataSourceBean.setXaProperties(xaProperties);

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/JDBCURLRecognizerEngine.java → sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/JDBCDriverURLRecognizerEngine.java

@@ -21,7 +21,7 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.core.constant.DatabaseType;
 import org.apache.shardingsphere.core.exception.ShardingException;
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,12 +29,12 @@ import java.util.Map.Entry;
 import java.util.ServiceLoader;
 
 /**
- * JDBC URL recognizer engine.
+ * JDBC driver URL recognizer engine.
  *
  * @author zhangliang
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class JDBCURLRecognizerEngine {
+public final class JDBCDriverURLRecognizerEngine {
     
     private static final Map<String, String> URL_PREFIX_AND_DRIVER_CLASS_NAME_MAPPER = new HashMap<>();
     
@@ -43,7 +43,7 @@ public final class JDBCURLRecognizerEngine {
     }
     
     private static void load() {
-        for (JDBCURLRecognizer each : ServiceLoader.load(JDBCURLRecognizer.class)) {
+        for (JDBCDriverURLRecognizer each : ServiceLoader.load(JDBCDriverURLRecognizer.class)) {
             for (String prefix : each.getURLPrefixes()) {
                 URL_PREFIX_AND_DRIVER_CLASS_NAME_MAPPER.put(prefix, each.getDriverClassName());
             }
@@ -62,7 +62,7 @@ public final class JDBCURLRecognizerEngine {
                 return entry.getValue();
             }
         }
-        throw new ShardingException("Cannot resolve JDBC url `%s`. Please implements `%s` and add to SPI.", url, JDBCURLRecognizer.class.getName());
+        throw new ShardingException("Cannot resolve JDBC url `%s`. Please implements `%s` and add to SPI.", url, JDBCDriverURLRecognizer.class.getName());
     }
     
     /**

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/H2Recognizer.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Collections;
  *
  * @author zhangliang
  */
-public final class H2Recognizer implements JDBCURLRecognizer {
+public final class H2Recognizer implements JDBCDriverURLRecognizer {
     
     @Override
     public Collection<String> getURLPrefixes() {

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/MySQLRecognizer.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Collections;
  *
  * @author zhangliang
  */
-public final class MySQLRecognizer implements JDBCURLRecognizer {
+public final class MySQLRecognizer implements JDBCDriverURLRecognizer {
     
     @Override
     public Collection<String> getURLPrefixes() {

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/OracleRecognizer.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Collections;
  *
  * @author zhangliang
  */
-public final class OracleRecognizer implements JDBCURLRecognizer {
+public final class OracleRecognizer implements JDBCDriverURLRecognizer {
     
     @Override
     public Collection<String> getURLPrefixes() {

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/PostgreSQLRecognizer.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Collections;
  *
  * @author zhangliang
  */
-public final class PostgreSQLRecognizer implements JDBCURLRecognizer {
+public final class PostgreSQLRecognizer implements JDBCDriverURLRecognizer {
     
     @Override
     public Collection<String> getURLPrefixes() {

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/SQLServerRecognizer.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Collection;
  *
  * @author zhangliang
  */
-public final class SQLServerRecognizer implements JDBCURLRecognizer {
+public final class SQLServerRecognizer implements JDBCDriverURLRecognizer {
     
     @Override
     public Collection<String> getURLPrefixes() {

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/spi/JDBCURLRecognizer.java → sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/spi/JDBCDriverURLRecognizer.java

@@ -20,11 +20,11 @@ package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recog
 import java.util.Collection;
 
 /**
- * JDBC URL recognizer.
+ * JDBC driver URL recognizer.
  *
  * @author zhangliang
  */
-public interface JDBCURLRecognizer {
+public interface JDBCDriverURLRecognizer {
     
     /**
      * Get JDBC URL prefixes.

sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/runtime/GlobalRegistry.java

@@ -36,7 +36,7 @@ import org.apache.shardingsphere.orchestration.internal.registry.config.event.Pr
 import org.apache.shardingsphere.orchestration.internal.registry.config.event.SchemaAddedEvent;
 import org.apache.shardingsphere.orchestration.internal.registry.config.event.SchemaDeletedEvent;
 import org.apache.shardingsphere.orchestration.internal.registry.state.event.CircuitStateChangedEvent;
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCURLRecognizerEngine;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.JDBCDriverURLRecognizerEngine;
 import org.apache.shardingsphere.shardingproxy.config.yaml.YamlDataSourceParameter;
 import org.apache.shardingsphere.shardingproxy.runtime.schema.LogicSchema;
 import org.apache.shardingsphere.shardingproxy.runtime.schema.MasterSlaveSchema;
@@ -122,7 +122,7 @@ public final class GlobalRegistry {
         if (null != props) {
             shardingProperties = new ShardingProperties(props);
         }
-        databaseType = JDBCURLRecognizerEngine.getDatabaseType(schemaDataSources.values().iterator().next().values().iterator().next().getUrl());
+        databaseType = JDBCDriverURLRecognizerEngine.getDatabaseType(schemaDataSources.values().iterator().next().values().iterator().next().getUrl());
         this.authentication = authentication;
         initSchema(schemaDataSources, schemaRules, isUsingRegistry);
     }

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/AllRecognizerTests.java

@@ -28,7 +28,7 @@ import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
-        JDBCURLRecognizerEngineTest.class,
+        JDBCDriverURLRecognizerEngineTest.class,
         MySQLRecognizerTest.class,
         PostgreSQLRecognizerTest.class,
         OracleRecognizerTest.class,

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/JDBCURLRecognizerEngineTest.java → sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/JDBCDriverURLRecognizerEngineTest.java

@@ -24,45 +24,45 @@ import org.junit.Test;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-public final class JDBCURLRecognizerEngineTest {
+public final class JDBCDriverURLRecognizerEngineTest {
     
     @Test
     public void assertGetDriverClassName() {
-        assertThat(JDBCURLRecognizerEngine.getDriverClassName("jdbc:h2:xxx"), is("org.h2.Driver"));
+        assertThat(JDBCDriverURLRecognizerEngine.getDriverClassName("jdbc:h2:xxx"), is("org.h2.Driver"));
     }
     
     @Test(expected = ShardingException.class)
     public void assertGetDriverClassNameFailure() {
-        JDBCURLRecognizerEngine.getDriverClassName("xxx");
+        JDBCDriverURLRecognizerEngine.getDriverClassName("xxx");
     }
     
     @Test
     public void assertGetDatabaseTypeForMySQL() {
-        assertThat(JDBCURLRecognizerEngine.getDatabaseType("jdbc:mysql:xxx"), is(DatabaseType.MySQL));
+        assertThat(JDBCDriverURLRecognizerEngine.getDatabaseType("jdbc:mysql:xxx"), is(DatabaseType.MySQL));
     }
     
     @Test
     public void assertGetDatabaseTypeForPostgreSQL() {
-        assertThat(JDBCURLRecognizerEngine.getDatabaseType("jdbc:postgresql:xxx"), is(DatabaseType.PostgreSQL));
+        assertThat(JDBCDriverURLRecognizerEngine.getDatabaseType("jdbc:postgresql:xxx"), is(DatabaseType.PostgreSQL));
     }
     
     @Test
     public void assertGetDatabaseTypeForOracle() {
-        assertThat(JDBCURLRecognizerEngine.getDatabaseType("jdbc:oracle:xxx"), is(DatabaseType.Oracle));
+        assertThat(JDBCDriverURLRecognizerEngine.getDatabaseType("jdbc:oracle:xxx"), is(DatabaseType.Oracle));
     }
     
     @Test
     public void assertGetDatabaseTypeForSQLServer() {
-        assertThat(JDBCURLRecognizerEngine.getDatabaseType("jdbc:sqlserver:xxx"), is(DatabaseType.SQLServer));
+        assertThat(JDBCDriverURLRecognizerEngine.getDatabaseType("jdbc:sqlserver:xxx"), is(DatabaseType.SQLServer));
     }
     
     @Test
     public void assertGetDatabaseTypeForH2() {
-        assertThat(JDBCURLRecognizerEngine.getDatabaseType("jdbc:h2:xxx"), is(DatabaseType.H2));
+        assertThat(JDBCDriverURLRecognizerEngine.getDatabaseType("jdbc:h2:xxx"), is(DatabaseType.H2));
     }
     
     @Test(expected = ShardingException.class)
     public void assertGetDatabaseTypeFailure() {
-        JDBCURLRecognizerEngine.getDatabaseType("xxx");
+        JDBCDriverURLRecognizerEngine.getDatabaseType("xxx");
     }
 }

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/H2RecognizerTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
 
 public final class H2RecognizerTest {
     
-    private final JDBCURLRecognizer recognizer = new H2Recognizer();
+    private final JDBCDriverURLRecognizer recognizer = new H2Recognizer();
     
     @Test
     public void assertGetURLPrefixes() {

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/MySQLRecognizerTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
 
 public final class MySQLRecognizerTest {
     
-    private final JDBCURLRecognizer recognizer = new MySQLRecognizer();
+    private final JDBCDriverURLRecognizer recognizer = new MySQLRecognizer();
     
     @Test
     public void assertGetURLPrefixes() {

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/OracleRecognizerTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
 
 public final class OracleRecognizerTest {
     
-    private final JDBCURLRecognizer recognizer = new OracleRecognizer();
+    private final JDBCDriverURLRecognizer recognizer = new OracleRecognizer();
     
     @Test
     public void assertGetURLPrefixes() {

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/PostgreSQLRecognizerTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
 
 public final class PostgreSQLRecognizerTest {
     
-    private final JDBCURLRecognizer recognizer = new PostgreSQLRecognizer();
+    private final JDBCDriverURLRecognizer recognizer = new PostgreSQLRecognizer();
     
     @Test
     public void assertGetURLPrefixes() {

sharding-proxy/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/recognizer/impl/SQLServerRecognizerTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.impl;
 
-import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCURLRecognizer;
+import org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.recognizer.spi.JDBCDriverURLRecognizer;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
 
 public final class SQLServerRecognizerTest {
     
-    private final JDBCURLRecognizer recognizer = new SQLServerRecognizer();
+    private final JDBCDriverURLRecognizer recognizer = new SQLServerRecognizer();
     
     @Test
     public void assertGetURLPrefixes() {