This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 9d12f6b3a60 format DatabaseType (#18940)
9d12f6b3a60 is described below
commit 9d12f6b3a60c35636d83e355ddb8c8aad9aaa438
Author: JingShang Lu <[email protected]>
AuthorDate: Thu Jul 7 22:03:56 2022 +0800
format DatabaseType (#18940)
---
.../apache/shardingsphere/infra/database/type/DatabaseType.java | 8 --------
.../infra/database/type/dialect/H2DatabaseType.java | 6 ------
.../infra/database/type/dialect/MariaDBDatabaseType.java | 6 ------
.../infra/database/type/dialect/MySQLDatabaseType.java | 6 ------
.../infra/database/type/dialect/OpenGaussDatabaseType.java | 6 ------
.../infra/database/type/dialect/OracleDatabaseType.java | 5 -----
.../infra/database/type/dialect/PostgreSQLDatabaseType.java | 6 ------
.../infra/database/type/dialect/SQL92DatabaseType.java | 6 ------
.../infra/database/type/dialect/SQLServerDatabaseType.java | 6 ------
.../infra/database/type/dialect/H2DatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/MariaDBDatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/MySQLDatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/OracleDatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/PostgreSQLDatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/SQL92DatabaseTypeTest.java | 6 ------
.../infra/database/type/dialect/SQLServerDatabaseTypeTest.java | 6 ------
.../apache/shardingsphere/infra/fixture/FixtureDatabaseType.java | 6 ------
.../datetime/database/fixture/FixtureDatabaseType.java | 6 ------
.../infra/executor/sql/fixture/FixtureDatabaseType.java | 6 ------
.../pipeline/spi/fixture/DDLGeneratorDatabaseTypeFixture.java | 6 ------
.../proxy/backend/text/admin/fixture/FixtureDatabaseType.java | 6 ------
.../proxy/frontend/fixture/FixtureDatabaseType.java | 6 ------
.../frontend/reactive/protocol/fixture/DummyDatabaseType.java | 6 ------
23 files changed, 139 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseType.java
index ef318289944..2ec75e5f3b8 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseType.java
@@ -27,7 +27,6 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Map;
-import java.util.Optional;
/**
* Database type.
@@ -58,13 +57,6 @@ public interface DatabaseType extends TypedSPI {
*/
DataSourceMetaData getDataSourceMetaData(String url, String username);
- /**
- * Get data source class name.
- *
- * @return data source class name
- */
- Optional<String> getDataSourceClassName();
-
/**
* Get system database schema map.
*
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseType.java
index 64ddfd7b50a..9b76049060d 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseType.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of H2.
@@ -48,11 +47,6 @@ public final class H2DatabaseType implements
BranchDatabaseType {
return new H2DataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("org.h2.jdbcx.JdbcDataSource");
- }
-
@Override
public DatabaseType getTrunkDatabaseType() {
return DatabaseTypeFactory.getInstance("MySQL");
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseType.java
index 8a8d16b230e..284a031d479 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseType.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of MariaDB.
@@ -48,11 +47,6 @@ public final class MariaDBDatabaseType implements
BranchDatabaseType {
return new MariaDBDataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("org.mariadb.jdbc.MariaDbDataSource");
- }
-
@Override
public DatabaseType getTrunkDatabaseType() {
return DatabaseTypeFactory.getInstance("MySQL");
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseType.java
index adef4091c95..5e626112ff3 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseType.java
@@ -26,7 +26,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of MySQL.
@@ -57,11 +56,6 @@ public final class MySQLDatabaseType implements DatabaseType
{
return new MySQLDataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return SYSTEM_DATABASE_SCHEMA_MAP;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OpenGaussDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OpenGaussDatabaseType.java
index d1a6b188e3f..4355c8ef958 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OpenGaussDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OpenGaussDatabaseType.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of openGauss.
@@ -63,11 +62,6 @@ public final class OpenGaussDatabaseType implements
SchemaSupportedDatabaseType
return new OpenGaussDataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("org.opengauss.ds.PGSimpleDataSource");
- }
-
@Override
public void handleRollbackOnly(final boolean rollbackOnly, final
SQLStatement statement) throws SQLException {
if (rollbackOnly && !(statement instanceof CommitStatement) &&
!(statement instanceof RollbackStatement)) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseType.java
index 33d095762d4..6c7c0f1ba6a 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseType.java
@@ -48,11 +48,6 @@ public final class OracleDatabaseType implements
DatabaseType {
return new OracleDataSourceMetaData(url, username);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public String getSchema(final Connection connection) {
try {
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseType.java
index 0cc6485c540..5dd9b1f9213 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseType.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of PostgreSQL.
@@ -62,11 +61,6 @@ public final class PostgreSQLDatabaseType implements
SchemaSupportedDatabaseType
return new PostgreSQLDataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("org.postgresql.ds.PGSimpleDataSource");
- }
-
@Override
public void handleRollbackOnly(final boolean rollbackOnly, final
SQLStatement statement) throws SQLException {
if (rollbackOnly && !(statement instanceof CommitStatement) &&
!(statement instanceof RollbackStatement)) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseType.java
index a1f32ffffc0..24f7ac35f81 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseType.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of SQL92.
@@ -46,11 +45,6 @@ public final class SQL92DatabaseType implements DatabaseType
{
return new SQL92DataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseType.java
index b66cb58fa51..7bd0ff92503 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseType.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Database type of SQLServer.
@@ -47,11 +46,6 @@ public final class SQLServerDatabaseType implements
DatabaseType {
return new SQLServerDataSourceMetaData(url);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.of("com.microsoft.sqlserver.jdbc.SQLServerDataSource");
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseTypeTest.java
index 83485be2fac..911d6b0552c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/H2DatabaseTypeTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import org.junit.Test;
import java.util.Collections;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -47,11 +46,6 @@ public final class H2DatabaseTypeTest {
assertThat(new
H2DatabaseType().getDataSourceMetaData("jdbc:h2:mem:foo_ds", "sa"),
instanceOf(H2DataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new H2DatabaseType().getDataSourceClassName(),
is(Optional.of("org.h2.jdbcx.JdbcDataSource")));
- }
-
@Test
public void assertGetTrunkDatabaseType() {
assertThat(new H2DatabaseType().getTrunkDatabaseType().getType(),
is("MySQL"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseTypeTest.java
index fa55543131e..b631d6a47e6 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MariaDBDatabaseTypeTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import org.junit.Test;
import java.util.Collections;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -46,11 +45,6 @@ public final class MariaDBDatabaseTypeTest {
assertThat(new
MariaDBDatabaseType().getDataSourceMetaData("jdbc:mariadb://localhost:3306/foo_ds",
"root"), instanceOf(MariaDBDataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new MariaDBDatabaseType().getDataSourceClassName(),
is(Optional.of("org.mariadb.jdbc.MariaDbDataSource")));
- }
-
@Test
public void assertGetTrunkDatabaseType() {
assertThat(new MariaDBDatabaseType().getTrunkDatabaseType().getType(),
is("MySQL"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseTypeTest.java
index eb897f26046..c1cd4b82526 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/MySQLDatabaseTypeTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -47,11 +46,6 @@ public final class MySQLDatabaseTypeTest {
assertThat(new
MySQLDatabaseType().getDataSourceMetaData("jdbc:mysql://127.0.0.1/foo_ds",
"root"), instanceOf(MySQLDataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new MySQLDatabaseType().getDataSourceClassName(),
is(Optional.of("com.mysql.jdbc.jdbc2.optional.MysqlDataSource")));
- }
-
@Test
public void assertGetSystemDatabases() {
assertTrue(new
MySQLDatabaseType().getSystemDatabaseSchemaMap().containsKey("information_schema"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseTypeTest.java
index 2025223702e..b78b8dfaf0e 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/OracleDatabaseTypeTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -52,11 +51,6 @@ public final class OracleDatabaseTypeTest {
assertThat(new
OracleDatabaseType().getDataSourceMetaData("jdbc:oracle:oci:@127.0.0.1/foo_ds",
"scott"), instanceOf(OracleDataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new OracleDatabaseType().getDataSourceClassName(),
is(Optional.empty()));
- }
-
@Test
public void assertGetSchema() throws SQLException {
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseTypeTest.java
index 4a841e1dd47..33c571e4225 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/PostgreSQLDatabaseTypeTest.java
@@ -29,7 +29,6 @@ import java.sql.SQLFeatureNotSupportedException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -54,11 +53,6 @@ public final class PostgreSQLDatabaseTypeTest {
assertThat(new
PostgreSQLDatabaseType().getDataSourceMetaData("jdbc:postgresql://localhost:5432/demo_ds_0",
"postgres"), instanceOf(PostgreSQLDataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new PostgreSQLDatabaseType().getDataSourceClassName(),
is(Optional.of("org.postgresql.ds.PGSimpleDataSource")));
- }
-
@Test
public void assertHandleRollbackOnlyForNotRollbackOnly() throws
SQLException {
new PostgreSQLDatabaseType().handleRollbackOnly(false,
mock(CommitStatement.class));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseTypeTest.java
index cc6a2d18a75..e06449d5884 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQL92DatabaseTypeTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import org.junit.Test;
import java.util.Collections;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -46,11 +45,6 @@ public final class SQL92DatabaseTypeTest {
assertThat(new SQL92DatabaseType().getDataSourceMetaData("jdbc:xxx",
"root"), instanceOf(SQL92DataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new SQL92DatabaseType().getDataSourceClassName(),
is(Optional.empty()));
- }
-
@Test
public void assertGetSystemDatabases() {
assertTrue(new
SQL92DatabaseType().getSystemDatabaseSchemaMap().isEmpty());
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseTypeTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseTypeTest.java
index 061c7b33f8f..300fcf71ef8 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseTypeTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/dialect/SQLServerDatabaseTypeTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import org.junit.Test;
import java.util.Arrays;
-import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -47,11 +46,6 @@ public final class SQLServerDatabaseTypeTest {
assertThat(new
SQLServerDatabaseType().getDataSourceMetaData("jdbc:microsoft:sqlserver://127.0.0.1;DatabaseName=ds_0",
"sa"), instanceOf(SQLServerDataSourceMetaData.class));
}
- @Test
- public void assertGetDataSourceClassName() {
- assertThat(new SQLServerDatabaseType().getDataSourceClassName(),
is(Optional.of("com.microsoft.sqlserver.jdbc.SQLServerDataSource")));
- }
-
@Test
public void assertGetSystemDatabases() {
assertTrue(new
SQLServerDatabaseType().getSystemDatabaseSchemaMap().isEmpty());
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/FixtureDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/FixtureDatabaseType.java
index f78b70e1e3a..a1ca8cd3dae 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/FixtureDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/FixtureDatabaseType.java
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Optional;
public final class FixtureDatabaseType implements DatabaseType {
@@ -44,11 +43,6 @@ public final class FixtureDatabaseType implements
DatabaseType {
return null;
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return new HashMap<>();
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/fixture/FixtureDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/fixture/FixtureDatabaseType.java
index f5a981857c6..401bf34fd1c 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/fixture/FixtureDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/fixture/FixtureDatabaseType.java
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Optional;
public final class FixtureDatabaseType implements DatabaseType {
@@ -44,11 +43,6 @@ public final class FixtureDatabaseType implements
DatabaseType {
return null;
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return new HashMap<>();
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/fixture/FixtureDatabaseType.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/fixture/FixtureDatabaseType.java
index 6b93178b87f..1e5f9c76ff2 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/fixture/FixtureDatabaseType.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/fixture/FixtureDatabaseType.java
@@ -23,7 +23,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Map;
-import java.util.Optional;
public final class FixtureDatabaseType implements DatabaseType {
@@ -42,11 +41,6 @@ public final class FixtureDatabaseType implements
DatabaseType {
return null;
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return null;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/spi/fixture/DDLGeneratorDatabaseTypeFixture.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/spi/fixture/DDLGeneratorDatabaseTypeFixture.java
index 546523425fe..979350da1c7 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/spi/fixture/DDLGeneratorDatabaseTypeFixture.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/spi/fixture/DDLGeneratorDatabaseTypeFixture.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
import static org.mockito.Mockito.mock;
@@ -45,11 +44,6 @@ public final class DDLGeneratorDatabaseTypeFixture
implements DatabaseType {
return mock(DataSourceMetaData.class);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/fixture/FixtureDatabaseType.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/fixture/FixtureDatabaseType.java
index f5415a103f7..049fd90a2b4 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/fixture/FixtureDatabaseType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/fixture/FixtureDatabaseType.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
import static org.mockito.Mockito.mock;
@@ -50,11 +49,6 @@ public final class FixtureDatabaseType implements
DatabaseType {
return mock(DataSourceMetaData.class);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/FixtureDatabaseType.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/FixtureDatabaseType.java
index a4adda5df8a..6dbb29e6272 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/FixtureDatabaseType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/FixtureDatabaseType.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
import static org.mockito.Mockito.mock;
@@ -50,11 +49,6 @@ public final class FixtureDatabaseType implements
DatabaseType {
return mock(DataSourceMetaData.class);
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-core/src/test/java/org/apache/shardingsphere/proxy/frontend/reactive/protocol/fixture/DummyDatabaseType.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-core/src/test/java/org/apache/shardingsphere/proxy/frontend/reactive/protocol/fixture/DummyDatabaseType.java
index 69aa317e015..9296e11410e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-core/src/test/java/org/apache/shardingsphere/proxy/frontend/reactive/protocol/fixture/DummyDatabaseType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-reactive-core/src/test/java/org/apache/shardingsphere/proxy/frontend/reactive/protocol/fixture/DummyDatabaseType.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
public final class DummyDatabaseType implements DatabaseType {
@@ -48,11 +47,6 @@ public final class DummyDatabaseType implements DatabaseType
{
return null;
}
- @Override
- public Optional<String> getDataSourceClassName() {
- return Optional.empty();
- }
-
@Override
public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
return Collections.emptyMap();