You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/08/23 12:46:29 UTC
(shardingsphere) branch master updated: Rename package name from org.apache.shardingsphere.database.connector.core.connector to org.apache.shardingsphere.database.connector.core.jdbcurl (#36395)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 ded84cedbf3 Rename package name from org.apache.shardingsphere.database.connector.core.connector to org.apache.shardingsphere.database.connector.core.jdbcurl (#36395)
ded84cedbf3 is described below
commit ded84cedbf3df819c31d17a259f12babfbfa7c9a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Aug 23 20:46:24 2025 +0800
Rename package name from org.apache.shardingsphere.database.connector.core.connector to org.apache.shardingsphere.database.connector.core.jdbcurl (#36395)
---
RELEASE-NOTES.md | 4 +--
.../advice/TracingJDBCExecutorCallbackAdvice.java | 2 +-
.../OpenTelemetryJDBCExecutorCallbackAdvice.java | 2 +-
...penTelemetryJDBCExecutorCallbackAdviceTest.java | 2 +-
.../url => jdbcurl/appender}/JdbcUrlAppender.java | 4 +--
.../parser}/ConnectionProperties.java | 2 +-
.../parser}/ConnectionPropertiesParser.java | 2 +-
.../parser}/StandardConnectionProperties.java | 2 +-
.../parser/standard/StandardJdbcUrl.java} | 4 +--
.../parser/standard}/StandardJdbcUrlParser.java | 8 ++---
.../appender}/JdbcUrlAppenderTest.java | 2 +-
.../parser}/StandardConnectionPropertiesTest.java | 2 +-
.../fixture/ConnectionPropertiesParserFixture.java | 8 ++---
.../standard}/StandardJdbcUrlParserTest.java | 4 +--
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../ClickHouseConnectionPropertiesParser.java | 17 ++++-----
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../ClickHouseConnectionPropertiesParserTest.java | 6 ++--
.../FirebirdConnectionPropertiesParser.java | 8 ++---
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../FirebirdConnectionPropertiesParserTest.java | 6 ++--
.../H2ConnectionProperties.java | 6 ++--
.../H2ConnectionPropertiesParser.java | 6 ++--
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../H2ConnectionPropertiesTest.java | 6 ++--
.../HiveConnectionPropertiesParser.java | 8 ++---
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../HiveConnectionPropertiesParserTest.java | 6 ++--
.../MySQLConnectionPropertiesParser.java | 18 +++++-----
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../MySQLConnectionPropertiesParserTest.java | 6 ++--
.../OpenGaussConnectionPropertiesParser.java | 17 ++++-----
...ector.core.connector.ConnectionPropertiesParser | 18 ----------
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../OpenGaussConnectionPropertiesParserTest.java | 6 ++--
.../OracleConnectionPropertiesParser.java | 8 ++---
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../OracleConnectionPropertiesParserTest.java | 6 ++--
.../PostgreSQLConnectionPropertiesParser.java | 17 ++++-----
...ector.core.connector.ConnectionPropertiesParser | 18 ----------
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../PostgreSQLConnectionPropertiesParserTest.java | 6 ++--
.../PrestoConnectionPropertiesParser.java | 17 ++++-----
...ector.core.connector.ConnectionPropertiesParser | 18 ----------
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../SQL92ConnectionPropertiesParser.java | 8 ++---
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../SQL92ConnectionPropertiesParserTest.java | 6 ++--
.../SQLServerConnectionPropertiesParser.java | 8 ++---
...ector.core.connector.ConnectionPropertiesParser | 18 ----------
...core.jdbcurl.parser.ConnectionPropertiesParser} | 2 +-
.../SQLServerConnectionPropertiesParserTest.java | 6 ++--
...river_That_Requires_No_Code_Modifications.en.md | 8 ++---
...herColumn__ShardingSphere_5.3.0_Deep_Dive.en.md | 2 +-
..._Update_Spring_Configuration_Update_Guide.en.md | 8 ++---
docs/blog/content/material/proxyIntroduce.cn.md | 2 +-
.../content/reference/management/_index.cn.md | 4 +--
.../content/reference/management/_index.en.md | 4 +--
.../test-manual/module-test/rewrite-test.cn.md | 2 +-
.../test-manual/module-test/rewrite-test.en.md | 2 +-
.../optional-plugins/clickhouse/_index.cn.md | 12 +++----
.../optional-plugins/clickhouse/_index.en.md | 12 +++----
.../optional-plugins/firebird/_index.cn.md | 8 ++---
.../optional-plugins/firebird/_index.en.md | 8 ++---
.../optional-plugins/hiveserver2/_index.cn.md | 40 +++++++++++-----------
.../optional-plugins/hiveserver2/_index.en.md | 40 +++++++++++-----------
.../optional-plugins/presto/_index.cn.md | 12 +++----
.../optional-plugins/presto/_index.en.md | 12 +++----
.../special-api/transaction/seata.cn.md | 6 ++--
.../special-api/transaction/seata.en.md | 6 ++--
.../yaml-config/data-source.cn.md | 8 ++---
.../yaml-config/data-source.en.md | 8 ++---
.../yaml-config/jdbc-driver/_index.cn.md | 8 ++---
.../yaml-config/jdbc-driver/_index.en.md | 8 ++---
.../jdbc-driver/known-implementation/_index.cn.md | 12 +++----
.../jdbc-driver/known-implementation/_index.en.md | 12 +++----
.../yaml-config/rules/broadcast.cn.md | 4 +--
.../yaml-config/rules/broadcast.en.md | 4 +--
.../yaml-config/rules/encrypt.cn.md | 2 +-
.../yaml-config/rules/encrypt.en.md | 2 +-
.../yaml-config/rules/mask.cn.md | 2 +-
.../yaml-config/rules/mask.en.md | 2 +-
.../yaml-config/rules/sharding.cn.md | 4 +--
.../yaml-config/rules/sharding.en.md | 4 +--
.../optional-plugins/seata-at/_index.cn.md | 4 +--
.../optional-plugins/seata-at/_index.en.md | 4 +--
.../resources/template/resources/yaml/config.ftl | 6 ++--
.../resource/node/StorageNodeAggregator.java | 4 +--
.../database/resource/unit/StorageUnit.java | 4 +--
.../resource/unit/StorageUnitNodeMapCreator.java | 4 +--
.../pool/creator/DataSourcePoolReflection.java | 4 +--
.../rdl/resource/AlterStorageUnitExecutor.java | 4 +--
.../rql/resource/ShowStorageUnitExecutor.java | 2 +-
.../rdl/resource/AlterStorageUnitExecutorTest.java | 2 +-
.../engine/driver/jdbc/JDBCExecutorCallback.java | 2 +-
.../executor/sql/hook/SPISQLExecutionHook.java | 2 +-
.../infra/executor/sql/hook/SQLExecutionHook.java | 2 +-
.../sql/hook/fixture/SQLExecutionHookFixture.java | 2 +-
.../metadata/ShardingSphereDatabaseMetaData.java | 2 +-
.../ShardingSphereDatabaseMetaDataTest.java | 2 +-
...rdingSpherePipelineDataSourceConfiguration.java | 4 +--
.../StandardPipelineDataSourceConfiguration.java | 4 +--
.../incremental/dumper/MySQLIncrementalDumper.java | 4 +--
.../wal/OpenGaussLogicalReplication.java | 4 +--
.../scenario/migration/api/MigrationJobAPI.java | 4 +--
.../at/SeataTransactionalSQLExecutionHook.java | 2 +-
.../at/SeataTransactionalSQLExecutionHookTest.java | 2 +-
.../export/ExportStorageNodesExecutor.java | 2 +-
.../pipeline/cases/PipelineContainerComposer.java | 2 +-
.../container/compose/NativeContainerComposer.java | 2 +-
.../MockedConnectionPropertiesParser.java | 15 ++++----
...core.jdbcurl.parser.ConnectionPropertiesParser} | 0
112 files changed, 319 insertions(+), 386 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 92b00a1cab3..96dcaac4573 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -326,7 +326,7 @@
### Bug Fixes
1. Kernel: Replace ThreadLocal with TransmittableThreadLocal in HintManager to support cross Thread usage
-1. Kernel: Use ConnectionPropertiesParser spi to parse jdbcUrl to solve oracle url parse error
+1. Kernel: Use ConnectionPropertiesParser spi to parse standardJdbcUrl to solve oracle url parse error
1. Kernel: Fixes column count assert exception caused by postgresql system table judge
1. Metadata: Keep in-used storage node when unregister storage unit
1. Metadata: Fixes the generated key column name case insensitivity error
@@ -1167,7 +1167,7 @@
1. Scaling: Fix resource leak caused by error occurred when creating DataSource in ShardingSphere-Scaling
1. Scaling: Fix ShardingSphereDataSource creation ignoring other rules
1. Scaling: Fix on preparation job could not be stopped
-1. Scaling: Fix data source property url and jdbcUrl compatibility
+1. Scaling: Fix data source property url and standardJdbcUrl compatibility
1. Scaling: Fix openGauss logical replication slot creation, avoid possible incremental data loss
1. Scaling: Update local job status before persisting job status to registry center, make sure it won't be overwritten later
1. Scaling: Handling null value in TestDecodingPlugin for PostgreSQL
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingJDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingJDBCExecutorCallbackAdvice.java
index f9105b4ef87..87aa7bb6881 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingJDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingJDBCExecutorCallbackAdvice.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.core.advice.AbstractInstanceMethodAdvice;
import org.apache.shardingsphere.agent.plugin.core.util.AgentReflectionUtils;
import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdvice.java
index fdded35882f..d09d9913f4e 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdvice.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingJDBCExecutorCallbackAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.constant.AttributeConstants;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
index 2b5e3586345..48df33aff8d 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.agent.plugin.tracing.core.RootSpanContext;
import org.apache.shardingsphere.agent.plugin.tracing.core.constant.AttributeConstants;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.fixture.JDBCExecutorCallbackFixture;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppender.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppender.java
similarity index 94%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppender.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppender.java
index 00f117fc815..429737b9782 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppender.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppender.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.url;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.appender;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionProperties.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionProperties.java
similarity index 96%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionProperties.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionProperties.java
index 34ca13938bc..0c8378a7422 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionProperties.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser;
import java.util.Properties;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionPropertiesParser.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionPropertiesParser.java
similarity index 94%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionPropertiesParser.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionPropertiesParser.java
index ae7924bebd5..3fbe0a52440 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/ConnectionPropertiesParser.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/ConnectionPropertiesParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionProperties.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionProperties.java
similarity index 95%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionProperties.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionProperties.java
index 0c145f8e746..af79a03a28c 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionProperties.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrl.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
similarity index 91%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrl.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
index 15715234853..2085b225782 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrl.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.url;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -27,7 +27,7 @@ import java.util.Properties;
*/
@RequiredArgsConstructor
@Getter
-public final class JdbcUrl {
+public final class StandardJdbcUrl {
private final String hostname;
diff --git a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParser.java b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
similarity index 90%
rename from database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParser.java
rename to database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
index efb24dbbc69..950ed5970df 100644
--- a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParser.java
+++ b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.url;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -64,17 +64,17 @@ public final class StandardJdbcUrlParser {
* @param jdbcUrl JDBC URL to be parsed
* @return parsed JDBC URL
*/
- public JdbcUrl parse(final String jdbcUrl) {
+ public StandardJdbcUrl parse(final String jdbcUrl) {
Matcher matcher = CONNECTION_URL_PATTERN.matcher(jdbcUrl);
ShardingSpherePreconditions.checkState(matcher.matches(), () -> new UnrecognizedDatabaseURLException(jdbcUrl, CONNECTION_URL_PATTERN.pattern().replaceAll("%", "%%")));
String authority = matcher.group(AUTHORITY_GROUP_KEY);
ShardingSpherePreconditions.checkNotNull(authority, () -> new UnrecognizedDatabaseURLException(jdbcUrl, CONNECTION_URL_PATTERN.pattern().replaceAll("%", "%%")));
if (authority.isEmpty()) {
- return new JdbcUrl("", -1, matcher.group(PATH_GROUP_KEY), parseQueryProperties(matcher.group(QUERY_GROUP_KEY)));
+ return new StandardJdbcUrl("", -1, matcher.group(PATH_GROUP_KEY), parseQueryProperties(matcher.group(QUERY_GROUP_KEY)));
}
Matcher hostMatcher = HOST_PORT_PATTERN_PATTERN.matcher(authority);
ShardingSpherePreconditions.checkState(hostMatcher.find(), () -> new UnrecognizedDatabaseURLException(jdbcUrl, CONNECTION_URL_PATTERN.pattern().replaceAll("%", "%%")));
- return new JdbcUrl(parseHostname(hostMatcher), parsePort(hostMatcher), matcher.group(PATH_GROUP_KEY), parseQueryProperties(matcher.group(QUERY_GROUP_KEY)));
+ return new StandardJdbcUrl(parseHostname(hostMatcher), parsePort(hostMatcher), matcher.group(PATH_GROUP_KEY), parseQueryProperties(matcher.group(QUERY_GROUP_KEY)));
}
private String parseHostname(final Matcher hostMatcher) {
diff --git a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppenderTest.java b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppenderTest.java
similarity index 97%
rename from database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppenderTest.java
rename to database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppenderTest.java
index e2fc424ca3c..d2096e3f589 100644
--- a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/JdbcUrlAppenderTest.java
+++ b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/appender/JdbcUrlAppenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.url;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.appender;
import org.apache.shardingsphere.infra.util.props.PropertiesBuilder;
import org.apache.shardingsphere.infra.util.props.PropertiesBuilder.Property;
diff --git a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionPropertiesTest.java b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionPropertiesTest.java
similarity index 96%
rename from database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionPropertiesTest.java
rename to database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionPropertiesTest.java
index e15e47cd805..29061ddbe70 100644
--- a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/StandardConnectionPropertiesTest.java
+++ b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/StandardConnectionPropertiesTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser;
import org.junit.jupiter.api.Test;
diff --git a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/fixture/ConnectionPropertiesParserFixture.java b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
similarity index 79%
rename from database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/fixture/ConnectionPropertiesParserFixture.java
rename to database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
index 3d1a72e0071..7ebdd4f39dd 100644
--- a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/fixture/ConnectionPropertiesParserFixture.java
+++ b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.fixture;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser.fixture;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
diff --git a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParserTest.java b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
similarity index 97%
rename from database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParserTest.java
rename to database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
index 8c67126be73..2cc94816ab3 100644
--- a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/connector/url/StandardJdbcUrlParserTest.java
+++ b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.core.connector.url;
+package org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
import org.apache.shardingsphere.infra.util.props.PropertiesBuilder;
@@ -40,7 +40,7 @@ class StandardJdbcUrlParserTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertParse(final String name, final String actualURL, final String expectedHostname, final int expectedPort, final String expectedDatabaseName, final Properties expectedQueryProps) {
- JdbcUrl actual = new StandardJdbcUrlParser().parse(actualURL);
+ StandardJdbcUrl actual = new StandardJdbcUrlParser().parse(actualURL);
assertThat(actual.getHostname(), is(expectedHostname));
assertThat(actual.getPort(), is(expectedPort));
assertThat(actual.getDatabase(), is(expectedDatabaseName));
diff --git a/database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 88%
rename from database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index 4643cdae08b..451a78aac86 100644
--- a/database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.clickhouse.connector.ClickHouseConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.core.jdbcurl.parser.fixture.ConnectionPropertiesParserFixture
diff --git a/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParser.java b/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
similarity index 61%
rename from database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParser.java
rename to database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
index d7e14e7b035..c965d69b7c9 100644
--- a/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParser.java
+++ b/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.clickhouse.connector;
+package org.apache.shardingsphere.database.connector.clickhouse.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import java.util.Properties;
@@ -34,8 +34,9 @@ public final class ClickHouseConnectionPropertiesParser implements ConnectionPro
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(DEFAULT_PORT), jdbcUrl.getDatabase(), null, jdbcUrl.getQueryProperties(), new Properties());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(), null, standardJdbcUrl.getQueryProperties(),
+ new Properties());
}
@Override
diff --git a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 88%
copy from database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
copy to database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index efa2d21b3e9..b14de2d4133 100644
--- a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/clickhouse/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.firebird.connector.FirebirdConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.clickhouse.jdbcurl.ClickHouseConnectionPropertiesParser
diff --git a/database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParserTest.java b/database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParserTest.java
similarity index 94%
rename from database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParserTest.java
rename to database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParserTest.java
index 2ae708bc085..accadf96218 100644
--- a/database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/connector/ClickHouseConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/clickhouse/src/test/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.clickhouse.connector;
+package org.apache.shardingsphere.database.connector.clickhouse.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParser.java b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParser.java
similarity index 85%
rename from database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParser.java
rename to database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParser.java
index 1fe8e064e6a..7d065d8bbbd 100644
--- a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParser.java
+++ b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParser.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.firebird.connector;
+package org.apache.shardingsphere.database.connector.firebird.jdbcurl;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
import org.firebirdsql.gds.impl.DbAttachInfo;
import org.firebirdsql.gds.impl.GDSFactory;
import org.firebirdsql.gds.impl.GDSType;
diff --git a/database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 89%
rename from database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index 53b73f60713..bf0a77c535d 100644
--- a/database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.oracle.connector.OracleConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.firebird.jdbcurl.FirebirdConnectionPropertiesParser
diff --git a/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParserTest.java b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParserTest.java
similarity index 94%
rename from database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParserTest.java
rename to database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParserTest.java
index f3bb809b862..8b535c347f5 100644
--- a/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/connector/FirebirdConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/jdbcurl/FirebirdConnectionPropertiesParserTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.firebird.connector;
+package org.apache.shardingsphere.database.connector.firebird.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionProperties.java b/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionProperties.java
similarity index 91%
rename from database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionProperties.java
rename to database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionProperties.java
index e77daa6651d..77ba9b3ab9d 100644
--- a/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionProperties.java
+++ b/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionProperties.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.h2.connector;
+package org.apache.shardingsphere.database.connector.h2.jdbcurl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import java.util.Properties;
@@ -64,7 +64,7 @@ public final class H2ConnectionProperties implements ConnectionProperties {
if (!(connectionProps instanceof H2ConnectionProperties)) {
return false;
}
- if (!isSameModel(getModel(), ((H2ConnectionProperties) connectionProps).getModel())) {
+ if (!isSameModel(model, ((H2ConnectionProperties) connectionProps).model)) {
return false;
}
return hostname.equals(connectionProps.getHostname()) && port == connectionProps.getPort();
diff --git a/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesParser.java b/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesParser.java
similarity index 92%
rename from database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesParser.java
rename to database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesParser.java
index 50f31eb3891..e478e1de8c5 100644
--- a/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesParser.java
+++ b/database/connector/dialect/h2/src/main/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesParser.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.h2.connector;
+package org.apache.shardingsphere.database.connector.h2.jdbcurl;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import java.util.regex.Matcher;
diff --git a/database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 90%
rename from database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index 10f251334ce..ba2b63fdc35 100644
--- a/database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.h2.connector.H2ConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.h2.jdbcurl.H2ConnectionPropertiesParser
diff --git a/database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesTest.java b/database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesTest.java
similarity index 95%
rename from database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesTest.java
rename to database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesTest.java
index b3d20d52425..981fa4a2c60 100644
--- a/database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/connector/H2ConnectionPropertiesTest.java
+++ b/database/connector/dialect/h2/src/test/java/org/apache/shardingsphere/database/connector/h2/jdbcurl/H2ConnectionPropertiesTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.h2.connector;
+package org.apache.shardingsphere.database.connector.h2.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParser.java b/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParser.java
similarity index 86%
rename from database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParser.java
rename to database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParser.java
index 1947cf13a59..5c4df02b341 100644
--- a/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParser.java
+++ b/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParser.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.hive.connector;
+package org.apache.shardingsphere.database.connector.hive.jdbcurl;
import lombok.SneakyThrows;
import org.apache.hive.jdbc.JdbcUriParseException;
import org.apache.hive.jdbc.Utils;
import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
import org.apache.hive.jdbc.ZooKeeperHiveClientException;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
import java.sql.SQLException;
import java.util.Properties;
diff --git a/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 89%
rename from database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index bf29b4cc4d7..309a1b52738 100644
--- a/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.mysql.connector.MySQLConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.hive.jdbcurl.HiveConnectionPropertiesParser
diff --git a/database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParserTest.java b/database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParserTest.java
similarity index 94%
rename from database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParserTest.java
rename to database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParserTest.java
index df301cf0975..ffa696a5f42 100644
--- a/database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/connector/HiveConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/hive/src/test/java/org/apache/shardingsphere/database/connector/hive/jdbcurl/HiveConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.hive.connector;
+package org.apache.shardingsphere.database.connector.hive.jdbcurl;
import org.apache.hive.jdbc.JdbcUriParseException;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParser.java b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
similarity index 72%
rename from database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParser.java
rename to database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
index 8e4f1a3ae33..2db8bf31cf9 100644
--- a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParser.java
+++ b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.mysql.connector;
+package org.apache.shardingsphere.database.connector.mysql.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import java.util.Properties;
@@ -34,9 +34,9 @@ public final class MySQLConnectionPropertiesParser implements ConnectionProperti
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(DEFAULT_PORT),
- null == catalog ? jdbcUrl.getDatabase() : catalog, null, jdbcUrl.getQueryProperties(), buildDefaultQueryProperties());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(DEFAULT_PORT),
+ null == catalog ? standardJdbcUrl.getDatabase() : catalog, null, standardJdbcUrl.getQueryProperties(), buildDefaultQueryProperties());
}
private Properties buildDefaultQueryProperties() {
diff --git a/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 92%
copy from database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
copy to database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index 84039183816..e98f1ae5ab4 100644
--- a/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.hive.connector.HiveConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.mysql.jdbcurl.MySQLConnectionPropertiesParser
diff --git a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParserTest.java b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParserTest.java
similarity index 93%
rename from database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParserTest.java
rename to database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParserTest.java
index efcbcd69fb0..2153e6c8b36 100644
--- a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/connector/MySQLConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.mysql.connector;
+package org.apache.shardingsphere.database.connector.mysql.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParser.java b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
similarity index 58%
rename from database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParser.java
rename to database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
index fdbb0b4f391..50b52f3dee2 100644
--- a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParser.java
+++ b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.opengauss.connector;
+package org.apache.shardingsphere.database.connector.opengauss.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import java.util.Properties;
@@ -34,8 +34,9 @@ public final class OpenGaussConnectionPropertiesParser implements ConnectionProp
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(DEFAULT_PORT), jdbcUrl.getDatabase(), null, jdbcUrl.getQueryProperties(), new Properties());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(), null, standardJdbcUrl.getQueryProperties(),
+ new Properties());
}
@Override
diff --git a/database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
deleted file mode 100644
index 64629bcedfe..00000000000
--- a/database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.database.connector.opengauss.connector.OpenGaussConnectionPropertiesParser
diff --git a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 88%
copy from database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
copy to database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index efa2d21b3e9..b25f910f824 100644
--- a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.firebird.connector.FirebirdConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.opengauss.jdbcurl.OpenGaussConnectionPropertiesParser
diff --git a/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParserTest.java b/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParserTest.java
similarity index 93%
rename from database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParserTest.java
rename to database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParserTest.java
index 1e6aab391e5..3443e95bdc5 100644
--- a/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/connector/OpenGaussConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.opengauss.connector;
+package org.apache.shardingsphere.database.connector.opengauss.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParser.java b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParser.java
similarity index 89%
rename from database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParser.java
rename to database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParser.java
index 25939651c7b..f83a8a4eb28 100644
--- a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParser.java
+++ b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.oracle.connector;
+package org.apache.shardingsphere.database.connector.oracle.jdbcurl;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
import java.util.Arrays;
import java.util.List;
diff --git a/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 89%
copy from database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
copy to database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index b20138d4edd..4a0b2f15168 100644
--- a/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.sql92.connector.SQL92ConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.oracle.jdbcurl.OracleConnectionPropertiesParser
diff --git a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParserTest.java b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParserTest.java
similarity index 95%
rename from database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParserTest.java
rename to database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParserTest.java
index 9cdd141f3f5..436cee42de1 100644
--- a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/connector/OracleConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/jdbcurl/OracleConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.oracle.connector;
+package org.apache.shardingsphere.database.connector.oracle.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParser.java b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
similarity index 61%
rename from database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParser.java
rename to database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
index 5651a40cad3..10a60b4bb16 100644
--- a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParser.java
+++ b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.postgresql.connector;
+package org.apache.shardingsphere.database.connector.postgresql.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import java.util.Properties;
@@ -34,8 +34,9 @@ public final class PostgreSQLConnectionPropertiesParser implements ConnectionPro
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(DEFAULT_PORT), jdbcUrl.getDatabase(), null, jdbcUrl.getQueryProperties(), new Properties());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(), null, standardJdbcUrl.getQueryProperties(),
+ new Properties());
}
@Override
diff --git a/database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
deleted file mode 100644
index 22f8eed35b8..00000000000
--- a/database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.database.connector.postgresql.connector.PostgreSQLConnectionPropertiesParser
diff --git a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 88%
rename from database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index efa2d21b3e9..643daeae5e6 100644
--- a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.firebird.connector.FirebirdConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.postgresql.jdbcurl.PostgreSQLConnectionPropertiesParser
diff --git a/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParserTest.java b/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParserTest.java
similarity index 94%
rename from database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParserTest.java
rename to database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParserTest.java
index 758c38e6b8c..107e40854d9 100644
--- a/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/connector/PostgreSQLConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.postgresql.connector;
+package org.apache.shardingsphere.database.connector.postgresql.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/connector/PrestoConnectionPropertiesParser.java b/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
similarity index 58%
rename from database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/connector/PrestoConnectionPropertiesParser.java
rename to database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
index 2c69d32b819..3f7e3ed696c 100644
--- a/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/connector/PrestoConnectionPropertiesParser.java
+++ b/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.presto.connector;
+package org.apache.shardingsphere.database.connector.presto.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import java.util.Properties;
@@ -34,8 +34,9 @@ public final class PrestoConnectionPropertiesParser implements ConnectionPropert
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(DEFAULT_PORT), jdbcUrl.getDatabase(), null, jdbcUrl.getQueryProperties(), new Properties());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(), null, standardJdbcUrl.getQueryProperties(),
+ new Properties());
}
@Override
diff --git a/database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
deleted file mode 100644
index 6c9d766a254..00000000000
--- a/database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.database.connector.presto.connector.PrestoConnectionPropertiesParser
diff --git a/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 89%
rename from database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index b20138d4edd..5a7636a6138 100644
--- a/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/presto/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.sql92.connector.SQL92ConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.presto.jdbcurl.PrestoConnectionPropertiesParser
diff --git a/database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParser.java b/database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParser.java
similarity index 83%
rename from database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParser.java
rename to database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParser.java
index eff10da512a..9fa9756ffd4 100644
--- a/database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParser.java
+++ b/database/connector/dialect/sql92/src/main/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParser.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.sql92.connector;
+package org.apache.shardingsphere.database.connector.sql92.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import java.util.regex.Matcher;
diff --git a/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 92%
rename from database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index 84039183816..ae0ba97ea72 100644
--- a/database/connector/dialect/hive/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.hive.connector.HiveConnectionPropertiesParser
+org.apache.shardingsphere.database.connector.sql92.jdbcurl.SQL92ConnectionPropertiesParser
diff --git a/database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParserTest.java b/database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParserTest.java
similarity index 92%
rename from database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParserTest.java
rename to database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParserTest.java
index 894b7099db2..10aec9cfd91 100644
--- a/database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/connector/SQL92ConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/sql92/src/test/java/org/apache/shardingsphere/database/connector/sql92/jdbcurl/SQL92ConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.sql92.connector;
+package org.apache.shardingsphere.database.connector.sql92.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParser.java b/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParser.java
similarity index 87%
rename from database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParser.java
rename to database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParser.java
index 7d696a16593..351d1bde46c 100644
--- a/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParser.java
+++ b/database/connector/dialect/sqlserver/src/main/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParser.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.sql92.sqlserver.connector;
+package org.apache.shardingsphere.database.connector.sql92.sqlserver.jdbcurl;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import java.util.regex.Matcher;
diff --git a/database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
deleted file mode 100644
index 9ba43eedeaa..00000000000
--- a/database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.database.connector.sql92.sqlserver.connector.SQLServerConnectionPropertiesParser
diff --git a/database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 88%
rename from database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
index d080a0a8cb8..6e8b813f5e0 100644
--- a/database/connector/core/src/test/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
+++ b/database/connector/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.database.connector.core.connector.fixture.ConnectionPropertiesParserFixture
+org.apache.shardingsphere.database.connector.sql92.sqlserver.jdbcurl.SQLServerConnectionPropertiesParser
diff --git a/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java b/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParserTest.java
similarity index 95%
rename from database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
rename to database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParserTest.java
index 11f69ce592e..30884f536d8 100644
--- a/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/connector/SQLServerConnectionPropertiesParserTest.java
+++ b/database/connector/dialect/sqlserver/src/test/java/org/apache/shardingsphere/database/connector/sql92/sqlserver/jdbcurl/SQLServerConnectionPropertiesParserTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.database.connector.sql92.sqlserver.connector;
+package org.apache.shardingsphere.database.connector.sql92.sqlserver.jdbcurl;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/docs/blog/content/material/2022_07_06_ShardingSphere-JDBC_Driver_Released_A_JDBC_Driver_That_Requires_No_Code_Modifications.en.md b/docs/blog/content/material/2022_07_06_ShardingSphere-JDBC_Driver_Released_A_JDBC_Driver_That_Requires_No_Code_Modifications.en.md
index 07baba52a26..7831e45c66a 100644
--- a/docs/blog/content/material/2022_07_06_ShardingSphere-JDBC_Driver_Released_A_JDBC_Driver_That_Requires_No_Code_Modifications.en.md
+++ b/docs/blog/content/material/2022_07_06_ShardingSphere-JDBC_Driver_Released_A_JDBC_Driver_That_Requires_No_Code_Modifications.en.md
@@ -55,11 +55,11 @@ If there’s no prefix, the configuration file is loaded from an absolute path (
```java
Class.forName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
- Connection conn = DriverManager.getConnection(jdbcUrl);
+ Connection conn = DriverManager.getConnection(standardJdbcUrl);
PreparedStatement ps = conn.prepareStatement(sql)) {
ps.setInt(1, 10);
ps.setInt(2, 1000);
@@ -73,9 +73,9 @@ try (
```java
String driverClassName = "org.apache.shardingsphere.driver.ShardingSphereDriver";
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";// take HikariCP as an example HikariDataSource dataSource = new HikariDataSource();
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";// take HikariCP as an example HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(driverClassName);
-dataSource.setJdbcUrl(jdbcUrl);
+dataSource.setJdbcUrl(standardJdbcUrl);
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
diff --git a/docs/blog/content/material/2022_12_28_Fuzzy_query_for_CipherColumn__ShardingSphere_5.3.0_Deep_Dive.en.md b/docs/blog/content/material/2022_12_28_Fuzzy_query_for_CipherColumn__ShardingSphere_5.3.0_Deep_Dive.en.md
index 88f25bde162..b467682fe58 100644
--- a/docs/blog/content/material/2022_12_28_Fuzzy_query_for_CipherColumn__ShardingSphere_5.3.0_Deep_Dive.en.md
+++ b/docs/blog/content/material/2022_12_28_Fuzzy_query_for_CipherColumn__ShardingSphere_5.3.0_Deep_Dive.en.md
@@ -310,7 +310,7 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?allowPublicKeyRetrieval=true
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/test?allowPublicKeyRetrieval=true
username: root
password: root
diff --git a/docs/blog/content/material/2023_03_07_ShardingSphere_5.3.x_Update_Spring_Configuration_Update_Guide.en.md b/docs/blog/content/material/2023_03_07_ShardingSphere_5.3.x_Update_Spring_Configuration_Update_Guide.en.md
index 2b0484a305e..072e7a951a4 100644
--- a/docs/blog/content/material/2023_03_07_ShardingSphere_5.3.x_Update_Spring_Configuration_Update_Guide.en.md
+++ b/docs/blog/content/material/2023_03_07_ShardingSphere_5.3.x_Update_Spring_Configuration_Update_Guide.en.md
@@ -149,13 +149,13 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false
username: root
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false
username: root
password:
@@ -240,14 +240,14 @@ spring:
<bean id="ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
+ <property name="standardJdbcUrl" value="jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
<property name="username" value="root"/>
<property name="password" value=""/>
</bean>
<bean id="ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
+ <property name="standardJdbcUrl" value="jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8"/>
<property name="username" value="root"/>
<property name="password" value=""/>
</bean>
diff --git a/docs/blog/content/material/proxyIntroduce.cn.md b/docs/blog/content/material/proxyIntroduce.cn.md
index 0c582e187ff..834860c8e63 100644
--- a/docs/blog/content/material/proxyIntroduce.cn.md
+++ b/docs/blog/content/material/proxyIntroduce.cn.md
@@ -108,7 +108,7 @@ mode:
repository:
type: H2
props:
- jdbcUrl: jdbc:h2:file:~/config_data # 元数据持久化数据库连接 URL
+ standardJdbcUrl: jdbc:h2:file:~/config_data # 元数据持久化数据库连接 URL
rules: # 认证信息
- !AUTHORITY
diff --git a/docs/document/content/reference/management/_index.cn.md b/docs/document/content/reference/management/_index.cn.md
index df8bb033db1..aa20d877c31 100644
--- a/docs/document/content/reference/management/_index.cn.md
+++ b/docs/document/content/reference/management/_index.cn.md
@@ -135,7 +135,7 @@ ds_0:
minimumIdle: 1
password: root
idleTimeout: 60000
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
maximumPoolSize: 50
connectionTimeout: 30000
@@ -155,7 +155,7 @@ ds_0:
minimumIdle: 1
password: root
idleTimeout: 60000
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
maximumPoolSize: 50
connectionTimeout: 30000
diff --git a/docs/document/content/reference/management/_index.en.md b/docs/document/content/reference/management/_index.en.md
index 32918a018e5..d1caedca8aa 100644
--- a/docs/document/content/reference/management/_index.en.md
+++ b/docs/document/content/reference/management/_index.en.md
@@ -135,7 +135,7 @@ ds_0:
minimumIdle: 1
password: root
idleTimeout: 60000
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
maximumPoolSize: 50
connectionTimeout: 30000
@@ -156,7 +156,7 @@ ds_0:
minimumIdle: 1
password: root
idleTimeout: 60000
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/ds_0?serverTimezone=UTC&useSSL=false
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
maximumPoolSize: 50
connectionTimeout: 30000
diff --git a/docs/document/content/test-manual/module-test/rewrite-test.cn.md b/docs/document/content/test-manual/module-test/rewrite-test.cn.md
index 9a45bb5ac4e..5c812dc74f9 100644
--- a/docs/document/content/test-manual/module-test/rewrite-test.cn.md
+++ b/docs/document/content/test-manual/module-test/rewrite-test.cn.md
@@ -23,7 +23,7 @@ SQL 改写测试用例位于 `test/it/rewriter` 下的 test 中。SQL 改写的
dataSources:
db: !!com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ standardJdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
username: sa
password:
diff --git a/docs/document/content/test-manual/module-test/rewrite-test.en.md b/docs/document/content/test-manual/module-test/rewrite-test.en.md
index a3d3a472701..436e9141fee 100644
--- a/docs/document/content/test-manual/module-test/rewrite-test.en.md
+++ b/docs/document/content/test-manual/module-test/rewrite-test.en.md
@@ -23,7 +23,7 @@ Environment configuration is the yaml file under test type under `test\resources
dataSources:
db: !!com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+ standardJdbcUrl: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
username: sa
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md
index f726c3aec18..5bd5262cdb8 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md
@@ -10,7 +10,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
## 前提条件
-要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:ch://localhost:8123/demo_ds_0` 的 `jdbcUrl`，
+要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:ch://localhost:8123/demo_ds_0` 的 `standardJdbcUrl`，
可能的 Maven 依赖关系如下，
```xml
@@ -61,7 +61,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-在 DBeaver Community 内，使用 `jdbc:ch://localhost:8123/default` 的 `jdbcUrl`，`default` 的`username` 连接至 ClickHouse，
+在 DBeaver Community 内，使用 `jdbc:ch://localhost:8123/default` 的 `standardJdbcUrl`，`default` 的`username` 连接至 ClickHouse，
`password` 留空。
执行如下 SQL，
@@ -73,7 +73,7 @@ CREATE DATABASE demo_ds_2;
```
分别使用 `jdbc:ch://localhost:8123/demo_ds_0` ，
-`jdbc:ch://localhost:8123/demo_ds_1` 和 `jdbc:ch://localhost:8123/demo_ds_2` 的 `jdbcUrl` 连接至 ClickHouse 来执行如下 SQL，
+`jdbc:ch://localhost:8123/demo_ds_1` 和 `jdbc:ch://localhost:8123/demo_ds_2` 的 `standardJdbcUrl` 连接至 ClickHouse 来执行如下 SQL，
```sql
-- noinspection SqlNoDataSourceInspectionForFile
@@ -99,19 +99,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_0
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_0
username: default
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_1
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_1
username: default
password:
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_2
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_2
username: default
password:
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md
index 1de9af104ce..2ca667c6ec0 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md
@@ -10,7 +10,7 @@ ShardingSphere's support for ClickHouse JDBC Driver is in the optional module.
## Prerequisites
-To use a `jdbcUrl` like `jdbc:ch://localhost:8123/demo_ds_0` for the data node in the ShardingSphere configuration file,
+To use a `standardJdbcUrl` like `jdbc:ch://localhost:8123/demo_ds_0` for the data node in the ShardingSphere configuration file,
the possible Maven dependencies are as follows,
```xml
@@ -61,7 +61,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-In DBeaver Community, use `jdbcUrl` of `jdbc:ch://localhost:8123/default`, `username` of `default` to connect to ClickHouse,
+In DBeaver Community, use `standardJdbcUrl` of `jdbc:ch://localhost:8123/default`, `username` of `default` to connect to ClickHouse,
and leave `password` blank.
Execute the following SQL,
@@ -72,7 +72,7 @@ CREATE DATABASE demo_ds_1;
CREATE DATABASE demo_ds_2;
```
-Use `jdbcUrl` of `jdbc:ch://localhost:8123/demo_ds_0`,
+Use `standardJdbcUrl` of `jdbc:ch://localhost:8123/demo_ds_0`,
`jdbc:ch://localhost:8123/demo_ds_1` and `jdbc:ch://localhost:8123/demo_ds_2`
to connect to ClickHouse and execute the following SQL.
@@ -101,19 +101,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_0
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_0
username: default
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_1
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_1
username: default
password:
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.clickhouse.jdbc.ClickHouseDriver
- jdbcUrl: jdbc:ch://localhost:8123/demo_ds_2
+ standardJdbcUrl: jdbc:ch://localhost:8123/demo_ds_2
username: default
password:
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.cn.md
index 9c2afcd4b68..8de6033d5cd 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.cn.md
@@ -10,7 +10,7 @@ ShardingSphere 对 Firebird JDBC Driver 的支持位于可选模块中。
## 前提条件
-要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb` 的 `jdbcUrl`，
+要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb` 的 `standardJdbcUrl`，
可能的 Maven 依赖关系如下，
```xml
@@ -91,19 +91,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb
username: alice
password: masterkey
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_1.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_1.fdb
username: alice
password: masterkey
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_2.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_2.fdb
username: alice
password: masterkey
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.en.md
index b3e7d366444..fac7e73f15e 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.en.md
@@ -10,7 +10,7 @@ ShardingSphere's support for Firebird JDBC Driver is in an optional module.
## Prerequisites
-To use a `jdbcUrl` like `jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb` for the data node in the ShardingSphere configuration file,
+To use a `standardJdbcUrl` like `jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb` for the data node in the ShardingSphere configuration file,
the possible Maven dependencies are as follows,
```xml
@@ -92,19 +92,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_0.fdb
username: alice
password: masterkey
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_1.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_1.fdb
username: alice
password: masterkey
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.firebirdsql.jdbc.FBDriver
- jdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_2.fdb
+ standardJdbcUrl: jdbc:firebird://localhost:3050//var/lib/firebird/data/demo_ds_2.fdb
username: alice
password: masterkey
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
index 36d6b464f92..a8517a8f135 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
@@ -10,7 +10,7 @@ ShardingSphere 对 HiveServer2 JDBC Driver 的支持位于可选模块中。
## 前提条件
-要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:hive2://localhost:10000/` 的 `jdbcUrl`，
+要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:hive2://localhost:10000/` 的 `standardJdbcUrl`，
可能的 Maven 依赖关系如下，
```xml
@@ -101,7 +101,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-在 DBeaver Community 内，使用 `jdbc:hive2://localhost:10000/` 的 `jdbcUrl` 连接至 HiveServer2，`username` 和 `password` 留空。
+在 DBeaver Community 内，使用 `jdbc:hive2://localhost:10000/` 的 `standardJdbcUrl` 连接至 HiveServer2，`username` 和 `password` 留空。
执行如下 SQL，
```sql
@@ -112,7 +112,7 @@ CREATE DATABASE demo_ds_2;
```
分别使用 `jdbc:hive2://localhost:10000/demo_ds_0` ，
-`jdbc:hive2://localhost:10000/demo_ds_1` 和 `jdbc:hive2://localhost:10000/demo_ds_2` 的 `jdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
+`jdbc:hive2://localhost:10000/demo_ds_1` 和 `jdbc:hive2://localhost:10000/demo_ds_2` 的 `standardJdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
```sql
-- noinspection SqlNoDataSourceInspectionForFile
@@ -136,15 +136,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_1
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_1
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_2
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_2
rules:
- !SHARDING
tables:
@@ -199,7 +199,7 @@ public class ExampleUtils {
### 连接至开启 ZooKeeper Service Discovery 的 HiveServer2
-ShardingSphere 配置文件中的 `jdbcUrl` 可配置连接至开启 ZooKeeper Service Discovery 的 HiveServer2。
+ShardingSphere 配置文件中的 `standardJdbcUrl` 可配置连接至开启 ZooKeeper Service Discovery 的 HiveServer2。
引入讨论，假设存在如下 Docker Compose 文件来启动开启 ZooKeeper Service Discovery 的 HiveServer2。
@@ -226,7 +226,7 @@ services:
```
在 DBeaver Community 内，
-使用 `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 的 `jdbcUrl` 连接至 HiveServer2，
+使用 `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 的 `standardJdbcUrl` 连接至 HiveServer2，
`username` 和 `password` 留空。
执行如下 SQL，
@@ -240,7 +240,7 @@ CREATE DATABASE demo_ds_2;
分别使用 `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` ，
`jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 和
`jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
-的 `jdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
+的 `standardJdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
```sql
-- noinspection SqlNoDataSourceInspectionForFile
@@ -262,15 +262,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
rules:
- !SHARDING
tables:
@@ -343,7 +343,7 @@ networks:
```
在 DBeaver Community 内，
-使用 `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 的 `jdbcUrl` 连接至 HiveServer2，
+使用 `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 的 `standardJdbcUrl` 连接至 HiveServer2，
`username` 和 `password` 留空。
执行如下 SQL，
@@ -357,7 +357,7 @@ CREATE DATABASE demo_ds_2;
分别使用 `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` ，
`jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` 和
`jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
-的 `jdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
+的 `standardJdbcUrl` 连接至 HiveServer2 来执行如下 SQL，
```sql
-- noinspection SqlNoDataSourceInspectionForFile
@@ -462,15 +462,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
```
`/tmp/init.sql` 的可能内容如下，
@@ -495,15 +495,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds0.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds0.jdbc-url::}
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds1.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds1.jdbc-url::}
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds2.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds2.jdbc-url::}
```
此时使用 ShardingSphere JDBC Driver 时可以通过拼接字符串的手段传入业务项目的 classpath 上的文件的绝对路径。
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
index a9a4c45f5bf..277030376d0 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
@@ -11,7 +11,7 @@ ShardingSphere's support for HiveServer2 JDBC Driver is in the optional module.
## Prerequisites
-To use a `jdbcUrl` like `jdbc:hive2://localhost:10000/` for the data node in the ShardingSphere configuration file,
+To use a `standardJdbcUrl` like `jdbc:hive2://localhost:10000/` for the data node in the ShardingSphere configuration file,
The possible Maven dependencies are as follows.
```xml
@@ -103,7 +103,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-In DBeaver Community, use the `jdbcUrl` of `jdbc:hive2://localhost:10000/` to connect to HiveServer2,
+In DBeaver Community, use the `standardJdbcUrl` of `jdbc:hive2://localhost:10000/` to connect to HiveServer2,
and leave `username` and `password` blank.
Execute the following SQL,
@@ -114,7 +114,7 @@ CREATE DATABASE demo_ds_1;
CREATE DATABASE demo_ds_2;
```
-Use the `jdbcUrl` of `jdbc:hive2://localhost:10000/demo_ds_0`,
+Use the `standardJdbcUrl` of `jdbc:hive2://localhost:10000/demo_ds_0`,
`jdbc:hive2://localhost:10000/demo_ds_1` and `jdbc:hive2://localhost:10000/demo_ds_2` to connect to HiveServer2 to execute the following SQL,
```sql
@@ -140,15 +140,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_1
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_1
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_2
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_2
rules:
- !SHARDING
tables:
@@ -203,7 +203,7 @@ public class ExampleUtils {
### Connect to HiveServer2 with ZooKeeper Service Discovery enabled
-`jdbcUrl` in the ShardingSphere configuration file can be configured to connect to HiveServer2 with ZooKeeper Service Discovery enabled.
+`standardJdbcUrl` in the ShardingSphere configuration file can be configured to connect to HiveServer2 with ZooKeeper Service Discovery enabled.
For discussion, assume that there is the following Docker Compose file to start HiveServer2 with ZooKeeper Service Discovery.
@@ -230,7 +230,7 @@ services:
```
In DBeaver Community,
-use `jdbcUrl` of `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` to connect to HiveServer2,
+use `standardJdbcUrl` of `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` to connect to HiveServer2,
leave `username` and `password` blank.
Execute the following SQL,
@@ -241,7 +241,7 @@ CREATE DATABASE demo_ds_1;
CREATE DATABASE demo_ds_2;
```
-Use `jdbcUrl` of `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`,
+Use `standardJdbcUrl` of `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`,
`jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
and `jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
to connect to HiveServer2 and execute the following SQL,
@@ -267,15 +267,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
+ standardJdbcUrl: jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
rules:
- !SHARDING
tables:
@@ -348,7 +348,7 @@ networks:
```
In DBeaver Community,
-use `jdbcUrl` of `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` to connect to HiveServer2,
+use `standardJdbcUrl` of `jdbc:hive2://127.0.0.1:2181/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2` to connect to HiveServer2,
leave `username` and `password` blank.
Execute the following SQL,
@@ -359,7 +359,7 @@ CREATE DATABASE demo_ds_1;
CREATE DATABASE demo_ds_2;
```
-Use `jdbcUrl` of `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`,
+Use `standardJdbcUrl` of `jdbc:hive2://127.0.0.1:2181/demo_ds_0;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`,
`jdbc:hive2://127.0.0.1:2181/demo_ds_1;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
and `jdbc:hive2://127.0.0.1:2181/demo_ds_2;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2`
to connect to HiveServer2 and execute the following SQL,
@@ -470,15 +470,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
+ standardJdbcUrl: jdbc:hive2://localhost:10000/demo_ds_0;initFile=/tmp/init.sql
```
The possible contents of `/tmp/init.sql` are as follows,
@@ -503,15 +503,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds0.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds0.jdbc-url::}
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds1.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds1.jdbc-url::}
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.apache.hive.jdbc.HiveDriver
- jdbcUrl: $${fixture.hive.ds2.jdbc-url::}
+ standardJdbcUrl: $${fixture.hive.ds2.jdbc-url::}
```
When using ShardingSphere JDBC Driver,
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.cn.md
index 777a1ff9989..95ac6b394b5 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.cn.md
@@ -10,7 +10,7 @@ ShardingSphere 对 Presto JDBC Driver 的支持位于可选模块中。
## 前提条件
-要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:presto://localhost:8080/iceberg/demo_ds_0` 的 `jdbcUrl`，
+要在 ShardingSphere 的配置文件为数据节点使用类似 `jdbc:presto://localhost:8080/iceberg/demo_ds_0` 的 `standardJdbcUrl`，
可能的 Maven 依赖关系如下，
```xml
@@ -70,7 +70,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-在 DBeaver Community 内，使用 `jdbc:presto://localhost:8080/iceberg` 的 `jdbcUrl`，`test` 的`username` 连接至 Presto，
+在 DBeaver Community 内，使用 `jdbc:presto://localhost:8080/iceberg` 的 `standardJdbcUrl`，`test` 的`username` 连接至 Presto，
`password` 留空。
执行如下 SQL，
@@ -82,7 +82,7 @@ CREATE SCHEMA iceberg.demo_ds_2;
```
分别使用 `jdbc:presto://localhost:8080/iceberg/demo_ds_0` ，
-`jdbc:presto://localhost:8080/iceberg/demo_ds_1` 和 `jdbc:presto://localhost:8080/iceberg/demo_ds_2` 的 `jdbcUrl` 连接至 Presto 来执行如下 SQL，
+`jdbc:presto://localhost:8080/iceberg/demo_ds_1` 和 `jdbc:presto://localhost:8080/iceberg/demo_ds_2` 的 `standardJdbcUrl` 连接至 Presto 来执行如下 SQL，
```sql
-- noinspection SqlNoDataSourceInspectionForFile
@@ -105,17 +105,17 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_0
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_0
username: test
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_1
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_1
username: test
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_2
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_2
username: test
rules:
- !SHARDING
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.en.md
index b1c25a7f784..b43765cb4bb 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/presto/_index.en.md
@@ -10,7 +10,7 @@ ShardingSphere's support for Presto JDBC Driver is in an optional module.
## Prerequisites
-To use a `jdbcUrl` like `jdbc:presto://localhost:8080/iceberg/demo_ds_0` for the data node in the ShardingSphere configuration file,
+To use a `standardJdbcUrl` like `jdbc:presto://localhost:8080/iceberg/demo_ds_0` for the data node in the ShardingSphere configuration file,
Possible Maven dependencies are as follows,
```xml
@@ -71,7 +71,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-In DBeaver Community, use `jdbcUrl` of `jdbc:presto://localhost:8080/iceberg`, `username` of `test` to connect to Presto, and leave `password` blank.
+In DBeaver Community, use `standardJdbcUrl` of `jdbc:presto://localhost:8080/iceberg`, `username` of `test` to connect to Presto, and leave `password` blank.
Execute the following SQL,
```sql
@@ -81,7 +81,7 @@ CREATE SCHEMA iceberg.demo_ds_1;
CREATE SCHEMA iceberg.demo_ds_2;
```
-Use the `jdbcUrl` of `jdbc:presto://localhost:8080/iceberg/demo_ds_0`,
+Use the `standardJdbcUrl` of `jdbc:presto://localhost:8080/iceberg/demo_ds_0`,
`jdbc:presto://localhost:8080/iceberg/demo_ds_1` and `jdbc:presto://localhost:8080/iceberg/demo_ds_2` to connect to Presto and execute the following SQL,
```sql
@@ -106,17 +106,17 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_0
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_0
username: test
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_1
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_1
username: test
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.facebook.presto.jdbc.PrestoDriver
- jdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_2
+ standardJdbcUrl: jdbc:presto://localhost:8080/iceberg/demo_ds_2
username: test
rules:
- !SHARDING
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
index bcffee5fc7c..7c50f7ee6d4 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
@@ -223,19 +223,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?sslMode=REQUIRED
username: root
password: example
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?sslMode=REQUIRED
username: root
password: example
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_2?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_2?sslMode=REQUIRED
username: root
password: example
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
index 2f6e9ac2b1c..8daf23e79ca 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
@@ -235,19 +235,19 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?sslMode=REQUIRED
username: root
password: example
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?sslMode=REQUIRED
username: root
password: example
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_2?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_2?sslMode=REQUIRED
username: root
password: example
rules:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
index 3e35cd88001..c33e62a3050 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.cn.md
@@ -8,7 +8,7 @@ chapter = true
ShardingSphere-JDBC 支持所有的数据库 JDBC 驱动和连接池。
-示例的数据库驱动为 MySQL，连接池为 HikariCP，可以更换为其他数据库驱动和连接池。当使用 ShardingSphere-JDBC 时，JDBC 池的属性名取决于各自 JDBC 池自己的定义，并不由 ShardingSphere 定义，相关的处理可以参考类`org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`。例如对于 Alibaba Druid 1.2.9 而言，使用 `url` 代替如下示例中的 `jdbcUrl` 是预期行为。
+示例的数据库驱动为 MySQL，连接池为 HikariCP，可以更换为其他数据库驱动和连接池。当使用 ShardingSphere-JDBC 时，JDBC 池的属性名取决于各自 JDBC 池自己的定义，并不由 ShardingSphere 定义，相关的处理可以参考类`org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`。例如对于 Alibaba Druid 1.2.9 而言，使用 `url` 代替如下示例中的 `standardJdbcUrl` 是预期行为。
## 参数解释
@@ -17,7 +17,7 @@ dataSources: # 数据源配置，可配置多个 <data-source-name>
<data_source_name>: # 数据源名称
dataSourceClassName: # 数据源完整类名
driverClassName: # 数据库驱动类名，以数据库连接池自身配置为准
- jdbcUrl: # 数据库 URL 连接，以数据库连接池自身配置为准
+ standardJdbcUrl: # 数据库 URL 连接，以数据库连接池自身配置为准
username: # 数据库用户名，以数据库连接池自身配置为准
password: # 数据库密码，以数据库连接池自身配置为准
# ... 数据库连接池的其它属性
@@ -29,13 +29,13 @@ dataSources:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/ds_1
+ standardJdbcUrl: jdbc:mysql://localhost:3306/ds_1
username: root
password:
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/ds_2
+ standardJdbcUrl: jdbc:mysql://localhost:3306/ds_2
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
index ea36212089d..6e69a0bbc6b 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/data-source.en.md
@@ -10,7 +10,7 @@ ShardingSphere-JDBC Supports all JDBC drivers and data source connection pools.
In this example, the database driver is MySQL, and the connection pool is HikariCP, which can be replaced with other database drivers and connection pools.
When using ShardingSphere JDBC, the property name of the JDBC pool depends on the definition of the respective JDBC pool and is not defined by ShardingSphere. For related processing, please refer to the class `org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator`.
-For example, with Alibaba Druid 1.2.9, using url instead of jdbcUrl in the example below is the expected behavior.
+For example, with Alibaba Druid 1.2.9, using url instead of standardJdbcUrl in the example below is the expected behavior.
## Parameters
@@ -19,7 +19,7 @@ dataSources: # Data sources configuration, multiple <data-source-name> available
<data_source_name>: # Data source name
dataSourceClassName: # Data source class name
driverClassName: # The database driver class name is subject to the configuration of the data source connection pool itself
- jdbcUrl: # The database URL connection is subject to the configuration of the data source connection pool itself
+ standardJdbcUrl: # The database URL connection is subject to the configuration of the data source connection pool itself
username: # Database username, subject to the configuration of the data source connection pool itself
password: # The database password is subject to the configuration of the data source connection pool itself
# ... Other properties of data source pool
@@ -31,13 +31,13 @@ dataSources:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/ds_1
+ standardJdbcUrl: jdbc:mysql://localhost:3306/ds_1
username: root
password:
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/ds_2
+ standardJdbcUrl: jdbc:mysql://localhost:3306/ds_2
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md
index 83d1009d7a0..ab10f72ff1d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md
@@ -36,11 +36,11 @@ ShardingSphere-JDBC 提供了 JDBC 驱动，可以仅通过配置变更即可使
```java
Class.forName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
- Connection conn = DriverManager.getConnection(jdbcUrl);
+ Connection conn = DriverManager.getConnection(standardJdbcUrl);
PreparedStatement ps = conn.prepareStatement(sql)) {
ps.setInt(1, 10);
ps.setInt(2, 1000);
@@ -56,12 +56,12 @@ try (
```java
String driverClassName = "org.apache.shardingsphere.driver.ShardingSphereDriver";
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
// 以 HikariCP 为例
HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(driverClassName);
-dataSource.setJdbcUrl(jdbcUrl);
+dataSource.setJdbcUrl(standardJdbcUrl);
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md
index 8ae06bbdedd..49b70e6302c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md
@@ -36,11 +36,11 @@ Refer to [known Implementation](./known-implementation/_index.en.md).
```java
Class.forName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
- Connection conn = DriverManager.getConnection(jdbcUrl);
+ Connection conn = DriverManager.getConnection(standardJdbcUrl);
PreparedStatement ps = conn.prepareStatement(sql)) {
ps.setInt(1, 10);
ps.setInt(2, 1000);
@@ -56,12 +56,12 @@ try (
```java
String driverClassName = "org.apache.shardingsphere.driver.ShardingSphereDriver";
-String jdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
+String standardJdbcUrl = "jdbc:shardingsphere:classpath:config.yaml";
// Take HikariCP as an example
HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(driverClassName);
-dataSource.setJdbcUrl(jdbcUrl);
+dataSource.setJdbcUrl(standardJdbcUrl);
String sql = "SELECT i.* FROM t_order o JOIN t_order_item i ON o.order_id=i.order_id WHERE o.user_id=? AND o.order_id=?";
try (
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.cn.md
index 266c6183126..15f054ca472 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.cn.md
@@ -91,7 +91,7 @@ chapter = true
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${FIXTURE_DRIVER_CLASS_NAME::org.h2.Driver}
- jdbcUrl: $${FIXTURE_JDBC_URL::jdbc:h2:mem:foo_ds_do_not_use}
+ standardJdbcUrl: $${FIXTURE_JDBC_URL::jdbc:h2:mem:foo_ds_do_not_use}
username: $${FIXTURE_USERNAME::}
password: $${FIXTURE_PASSWORD::}
```
@@ -102,7 +102,7 @@ ds_1:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ standardJdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
username: sa
password:
```
@@ -128,7 +128,7 @@ ds_1:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${fixture.config.driver.driver-class-name::org.h2.Driver}
- jdbcUrl: $${fixture.config.driver.jdbc-url::jdbc:h2:mem:foo_ds_do_not_use}
+ standardJdbcUrl: $${fixture.config.driver.jdbc-url::jdbc:h2:mem:foo_ds_do_not_use}
username: $${fixture.config.driver.username::}
password: $${fixture.config.driver.password::}
```
@@ -139,7 +139,7 @@ ds_1:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ standardJdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
username: sa
password:
```
@@ -195,7 +195,7 @@ public class ExampleUtils {
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${FIXTURE_DRIVER_CLASS_NAME::com.mysql.cj.jdbc.Driver}
- jdbcUrl: jdbc:mysql://$${FIXTURE_HOST::}:$${FIXTURE_PORT::}/$${FIXTURE_DATABASE::}?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://$${FIXTURE_HOST::}:$${FIXTURE_PORT::}/$${FIXTURE_DATABASE::}?sslMode=REQUIRED
username: $${FIXTURE_USERNAME::}
password: $${FIXTURE_PASSWORD::}
```
@@ -206,7 +206,7 @@ ds_1:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/test?sslMode=REQUIRED
username: sa
password:
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.en.md
index 33322009382..0d770949d50 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/known-implementation/_index.en.md
@@ -107,7 +107,7 @@ Then for the intercepted fragment of the following YAML file,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${FIXTURE_DRIVER_CLASS_NAME::org.h2.Driver}
- jdbcUrl: $${FIXTURE_JDBC_URL::jdbc:h2:mem:foo_ds_do_not_use}
+ standardJdbcUrl: $${FIXTURE_JDBC_URL::jdbc:h2:mem:foo_ds_do_not_use}
username: $${FIXTURE_USERNAME::}
password: $${FIXTURE_PASSWORD::}
```
@@ -118,7 +118,7 @@ This YAML snippet will be parsed as,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ standardJdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
username: sa
password:
```
@@ -144,7 +144,7 @@ Then for the intercepted fragment of the following YAML file,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${fixture.config.driver.driver-class-name::org.h2.Driver}
- jdbcUrl: $${fixture.config.driver.jdbc-url::jdbc:h2:mem:foo_ds_do_not_use}
+ standardJdbcUrl: $${fixture.config.driver.jdbc-url::jdbc:h2:mem:foo_ds_do_not_use}
username: $${fixture.config.driver.username::}
password: $${fixture.config.driver.password::}
```
@@ -155,7 +155,7 @@ This YAML snippet will be parsed as,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.h2.Driver
- jdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
+ standardJdbcUrl: jdbc:h2:mem:foo_ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL
username: sa
password:
```
@@ -213,7 +213,7 @@ Then for the intercepted fragment of the following YAML file,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: $${FIXTURE_DRIVER_CLASS_NAME::com.mysql.cj.jdbc.Driver}
- jdbcUrl: jdbc:mysql://$${FIXTURE_HOST::}:$${FIXTURE_PORT::}/$${FIXTURE_DATABASE::}?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://$${FIXTURE_HOST::}:$${FIXTURE_PORT::}/$${FIXTURE_DATABASE::}?sslMode=REQUIRED
username: $${FIXTURE_USERNAME::}
password: $${FIXTURE_PASSWORD::}
```
@@ -224,7 +224,7 @@ This YAML snippet will be parsed as,
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?sslMode=REQUIRED
+ standardJdbcUrl: jdbc:mysql://127.0.0.1:3306/test?sslMode=REQUIRED
username: sa
password:
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.cn.md
index e31ead46897..9f8db25f3dc 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.cn.md
@@ -29,13 +29,13 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.en.md
index 95ee3c8e849..8f5c11d166e 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/broadcast.en.md
@@ -31,13 +31,13 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
index ed97ecef0eb..c9e03dcd70a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.cn.md
@@ -50,7 +50,7 @@ dataSources:
unique_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
index 7f657051151..1cabe06ba51 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/encrypt.en.md
@@ -51,7 +51,7 @@ dataSources:
unique_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.cn.md
index fc0f560f5de..f15b1001d3b 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.cn.md
@@ -42,7 +42,7 @@ dataSources:
unique_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.en.md
index 7c3d6ebc671..6d5e8896ed9 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/mask.en.md
@@ -43,7 +43,7 @@ dataSources:
unique_ds:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
index 6dcc4f14f10..779b4de3c52 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.cn.md
@@ -89,13 +89,13 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
index 226932233ae..af4981dcc6c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/sharding.en.md
@@ -90,13 +90,13 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+ standardJdbcUrl: jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
index bba02d87298..bc0a672b51a 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.cn.md
@@ -285,7 +285,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-在 DBeaver Community 内，使用 `jdbc:postgresql://127.0.0.1:3308/postgres` 的 `jdbcUrl` 连接至 ShardingSphere Proxy，
+在 DBeaver Community 内，使用 `jdbc:postgresql://127.0.0.1:3308/postgres` 的 `standardJdbcUrl` 连接至 ShardingSphere Proxy，
username 和 password 均为 `root`。所需的 JDBC Driver 与 ShardingSphere Proxy 设置的 `proxy-frontend-database-protocol-type` 对应。
执行如下 SQL，
@@ -294,7 +294,7 @@ username 和 password 均为 `root`。所需的 JDBC Driver 与 ShardingSphere P
CREATE DATABASE sharding_db;
```
-在 DBeaver Community 内，使用 `jdbc:postgresql://127.0.0.1:3308/sharding_db` 的 `jdbcUrl` 连接至 ShardingSphere Proxy，
+在 DBeaver Community 内，使用 `jdbc:postgresql://127.0.0.1:3308/sharding_db` 的 `standardJdbcUrl` 连接至 ShardingSphere Proxy，
username 和 password 均为 `root`。
执行如下 SQL，
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
index 26abf658f1e..8388ff5625d 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/seata-at/_index.en.md
@@ -289,7 +289,7 @@ sudo snap install dbeaver-ce
snap run dbeaver-ce
```
-In DBeaver Community, use the `jdbcUrl` of `jdbc:postgresql://127.0.0.1:3308/postgres` to connect to ShardingSphere Proxy,
+In DBeaver Community, use the `standardJdbcUrl` of `jdbc:postgresql://127.0.0.1:3308/postgres` to connect to ShardingSphere Proxy,
and the username and password are both `root`.
The required JDBC Driver corresponds to the `proxy-frontend-database-protocol-type` set by ShardingSphere Proxy.
Execute the following SQL,
@@ -299,7 +299,7 @@ Execute the following SQL,
CREATE DATABASE sharding_db;
```
-In DBeaver Community, use the `jdbcUrl` of `jdbc:postgresql://127.0.0.1:3308/sharding_db` to connect to ShardingSphere Proxy,
+In DBeaver Community, use the `standardJdbcUrl` of `jdbc:postgresql://127.0.0.1:3308/sharding_db` to connect to ShardingSphere Proxy,
and the username and password are both `root`. Execute the following SQL,
```sql
diff --git a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/config.ftl b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/config.ftl
index fc998745fe7..93f1a6aef19 100644
--- a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/config.ftl
+++ b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/config.ftl
@@ -23,7 +23,7 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+ standardJdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
username: ${username}
password: ${(password)?string}
maxPoolSize: 10
@@ -31,7 +31,7 @@ dataSources:
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+ standardJdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
username: ${username}
password: ${(password)?string}
maxPoolSize: 10
@@ -39,7 +39,7 @@ dataSources:
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
- jdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_2?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+ standardJdbcUrl: jdbc:mysql://${host}:${port}/demo_ds_2?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
username: ${username}
password: ${(password)?string}
maxPoolSize: 10
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/node/StorageNodeAggregator.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/node/StorageNodeAggregator.java
index c48cbf43457..93bb9a0a255 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/node/StorageNodeAggregator.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/node/StorageNodeAggregator.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.infra.metadata.database.resource.node;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
index cdf132ea407..4c6a80f9f97 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.infra.metadata.database.resource.unit;
import lombok.Getter;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapCreator.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapCreator.java
index 4442fe9ee36..2c1f5c7ef4a 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapCreator.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapCreator.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.infra.metadata.database.resource.unit;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.exception.UnrecognizedDatabaseURLException;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
diff --git a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
index aaab52433ae..0223d2b3305 100644
--- a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
+++ b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.infra.datasource.pool.creator;
import com.google.common.base.CaseFormat;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
import org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
index 63180cfe1e2..2053fecb285 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.checker.PrivilegeCheckType;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
index e2cf6581ada..3f21259af5c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
import lombok.Setter;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java
index f4c3615a5a3..dc3bfb8ca3b 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
index 90bf9c82758..c6d53a32d85 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorCallback;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
index 25784129ef4..50e2f3d7548 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.hook;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import java.util.Collection;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
index 49c93251c61..461e84163e1 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.hook;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.infra.spi.ShardingSphereSPI;
import java.util.List;
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
index 5ec7ac5e20e..8999f03ae3c 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.hook.fixture;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook;
import java.util.Collection;
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index 14b3f6301fc..98fca70d984 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.driver.jdbc.core.datasource.metadata;
import com.google.common.base.Strings;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.driver.jdbc.adapter.AdaptedDatabaseMetaData;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.core.resultset.DatabaseMetaDataResultSet;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.attribute.datanode.DataNodeRuleAttribute;
diff --git a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
index 763c6c1f183..fe5f530e743 100644
--- a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
+++ b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.driver.jdbc.core.datasource.metadata;
import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.core.resultset.DatabaseMetaDataResultSet;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/ShardingSpherePipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/ShardingSpherePipelineDataSourceConfiguration.java
index 013a1f81885..8da5e363a3c 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/ShardingSpherePipelineDataSourceConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/ShardingSpherePipelineDataSourceConfiguration.java
@@ -23,8 +23,8 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrlAppender;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.appender.JdbcUrlAppender;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
index 13b80c88b90..e6ea28f37c3 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
@@ -22,8 +22,8 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrlAppender;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.appender.JdbcUrlAppender;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/dumper/MySQLIncrementalDumper.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/dumper/MySQLIncrementalDumper.java
index ef7383c3a28..f69dedb9f98 100644
--- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/dumper/MySQLIncrementalDumper.java
+++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/dumper/MySQLIncrementalDumper.java
@@ -41,8 +41,8 @@ import org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.binlog.e
import org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.binlog.position.MySQLBinlogPosition;
import org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.ConnectInfo;
import org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.MySQLBinlogClient;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/wal/OpenGaussLogicalReplication.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/wal/OpenGaussLogicalReplication.java
index 93299fb6180..d7ce8ad3c34 100644
--- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/wal/OpenGaussLogicalReplication.java
+++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/wal/OpenGaussLogicalReplication.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.data.pipeline.opengauss.ingest.incremental.wal
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration;
import org.apache.shardingsphere.data.pipeline.postgresql.ingest.incremental.wal.decode.BaseLogSequenceNumber;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
index b5aef13e8d2..ae3750b8769 100644
--- a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
+++ b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
@@ -44,8 +44,8 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobTy
import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import org.apache.shardingsphere.data.pipeline.scenario.migration.config.yaml.config.YamlMigrationJobConfiguration;
import org.apache.shardingsphere.data.pipeline.scenario.migration.config.yaml.swapper.YamlMigrationJobConfigurationSwapper;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
diff --git a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHook.java b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHook.java
index 0844fb30bfb..35622f5e5ea 100644
--- a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHook.java
+++ b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHook.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.base.seata.at;
import org.apache.seata.core.context.RootContext;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook;
import java.util.List;
diff --git a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHookTest.java b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHookTest.java
index 0ea10d47419..eceef65310c 100644
--- a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHookTest.java
+++ b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataTransactionalSQLExecutionHookTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.base.seata.at;
import org.apache.seata.core.context.RootContext;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutor.java
index 844c8a7168b..627af36c457 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportStorageNodesStatement;
import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
index 7ba575cc8ff..64a7d1fa851 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.data.pipeline.cdc.CDCJobType;
import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
import org.apache.shardingsphere.data.pipeline.core.job.JobStatus;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrlAppender;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.appender.JdbcUrlAppender;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.database.connector.mysql.type.MySQLDatabaseType;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
index 76b96ccfafe..3ea53291a36 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.compose;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrlAppender;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.appender.JdbcUrlAppender;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.util.props.PropertiesBuilder;
diff --git a/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java b/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
index 0ca4bf05d66..37e44b944e1 100644
--- a/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
+++ b/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.test.infra.fixture.connector;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser;
-import org.apache.shardingsphere.database.connector.core.connector.StandardConnectionProperties;
-import org.apache.shardingsphere.database.connector.core.connector.url.JdbcUrl;
-import org.apache.shardingsphere.database.connector.core.connector.url.StandardJdbcUrlParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.StandardConnectionProperties;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrl;
+import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.standard.StandardJdbcUrlParser;
/**
* Mocked connection properties parser.
@@ -31,8 +31,9 @@ public final class MockedConnectionPropertiesParser implements ConnectionPropert
@Override
public ConnectionProperties parse(final String url, final String username, final String catalog) {
- JdbcUrl jdbcUrl = new StandardJdbcUrlParser().parse(url);
- return new StandardConnectionProperties(jdbcUrl.getHostname(), jdbcUrl.getPort(), Strings.isNullOrEmpty(catalog) ? jdbcUrl.getDatabase() : catalog, jdbcUrl.getDatabase());
+ StandardJdbcUrl standardJdbcUrl = new StandardJdbcUrlParser().parse(url);
+ return new StandardConnectionProperties(standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(), Strings.isNullOrEmpty(catalog) ? standardJdbcUrl.getDatabase() : catalog,
+ standardJdbcUrl.getDatabase());
}
@Override
diff --git a/test/infra/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser b/test/infra/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser
similarity index 100%
rename from test/infra/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.connector.ConnectionPropertiesParser
rename to test/infra/fixture/database/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser