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 2020/10/14 10:33:47 UTC
[shardingsphere] branch master updated: integration oracle
getSchema and decorate table name pattern (#7790)
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 4d9bbfc integration oracle getSchema and decorate table name pattern (#7790)
4d9bbfc is described below
commit 4d9bbfcf307ef58db68f40e047093182e7b2cb40
Author: xiaoyu <54...@qq.com>
AuthorDate: Wed Oct 14 18:33:24 2020 +0800
integration oracle getSchema and decorate table name pattern (#7790)
* integration oracle getSchema and decorate table name pattern to one spi interface
* final class
* renamed
---
.../physical/jdbc/MetaDataConnectionAdapter.java | 29 +--------
...er.java => DatabaseMetaDataDialectHandler.java} | 19 ++++--
.../jdbc/handler/TableNamePatternHandler.java | 34 ----------
.../impl/DatabaseMetaDataDialectHandlerFacade.java | 76 ++++++++++++++++++++++
...a => OracleDatabaseMetaDataDialectHandler.java} | 16 +++--
.../impl/OracleTableNamePatternHandler.java | 43 ------------
.../model/table/PhysicalTableMetaDataLoader.java | 27 +-------
...al.jdbc.handler.DatabaseMetaDataDialectHandler} | 2 +-
...a.model.physical.jdbc.handler.JDBCSchemaHandler | 18 -----
.../handler/OracleTableNamePatternHandlerTest.java | 64 ------------------
...> OracleDatabaseMetaDataDialectFacadeTest.java} | 44 +++++++------
11 files changed, 132 insertions(+), 240 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/MetaDataConnectionAdapter.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/MetaDataConnectionAdapter.java
index 4de741e..59c40b9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/MetaDataConnectionAdapter.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/MetaDataConnectionAdapter.java
@@ -19,10 +19,7 @@ package org.apache.shardingsphere.infra.metadata.model.physical.jdbc;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
+import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl.DatabaseMetaDataDialectHandlerFacade;
import java.sql.Array;
import java.sql.Blob;
@@ -39,8 +36,8 @@ import java.sql.SQLXML;
import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Struct;
+
import java.util.Map;
-import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.Executor;
@@ -50,10 +47,6 @@ import java.util.concurrent.Executor;
@RequiredArgsConstructor
public final class MetaDataConnectionAdapter implements Connection {
- static {
- ShardingSphereServiceLoader.register(JDBCSchemaHandler.class);
- }
-
private final DatabaseType databaseType;
private final Connection connection;
@@ -74,23 +67,7 @@ public final class MetaDataConnectionAdapter implements Connection {
@Override
public String getSchema() {
- return findJDBCSchemaHandler().map(handler -> handler.getSchema(connection)).orElse(getSchema(connection));
- }
-
- private String getSchema(final Connection connection) {
- try {
- return connection.getSchema();
- } catch (final SQLException ex) {
- return null;
- }
- }
-
- private Optional<JDBCSchemaHandler> findJDBCSchemaHandler() {
- try {
- return Optional.of(TypedSPIRegistry.getRegisteredService(JDBCSchemaHandler.class, databaseType.getName(), new Properties()));
- } catch (final ServiceProviderNotFoundException ignored) {
- return Optional.empty();
- }
+ return DatabaseMetaDataDialectHandlerFacade.getSchema(connection, databaseType);
}
@Override
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/JDBCSchemaHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/DatabaseMetaDataDialectHandler.java
similarity index 75%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/JDBCSchemaHandler.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/DatabaseMetaDataDialectHandler.java
index 25beac0..8918582 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/JDBCSchemaHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/DatabaseMetaDataDialectHandler.java
@@ -17,20 +17,29 @@
package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
-
import java.sql.Connection;
+import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
/**
- * JDBC schema handler.
+ * Database meta data dialect handler.
*/
-public interface JDBCSchemaHandler extends TypedSPI {
+public interface DatabaseMetaDataDialectHandler extends TypedSPI {
/**
* Get schema.
- *
+ *
* @param connection connection
* @return schema
*/
String getSchema(Connection connection);
+
+ /**
+ * Decorate table name pattern.
+ *
+ * @param tableNamePattern table name pattern
+ * @return decorated table name pattern
+ */
+ default String decorate(String tableNamePattern) {
+ return tableNamePattern;
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/TableNamePatternHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/TableNamePatternHandler.java
deleted file mode 100644
index 7c6ea57..0000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/TableNamePatternHandler.java
+++ /dev/null
@@ -1,34 +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.
- */
-
-package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler;
-
-import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
-
-/**
- * Table name pattern handler.
- */
-public interface TableNamePatternHandler extends TypedSPI {
-
- /**
- * Decorate table name pattern.
- *
- * @param tableNamePattern table name pattern
- * @return decorated table name pattern
- */
- String decorate(String tableNamePattern);
-}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/DatabaseMetaDataDialectHandlerFacade.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/DatabaseMetaDataDialectHandlerFacade.java
new file mode 100644
index 0000000..bb1cb05
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/DatabaseMetaDataDialectHandlerFacade.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Optional;
+import java.util.Properties;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.DatabaseMetaDataDialectHandler;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
+import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
+
+/**
+ * Database meta data dialect handler facade.
+ */
+public final class DatabaseMetaDataDialectHandlerFacade {
+
+ static {
+ ShardingSphereServiceLoader.register(DatabaseMetaDataDialectHandler.class);
+ }
+
+ /**
+ * Get schema.
+ *
+ * @param connection connection
+ * @param databaseType database type
+ * @return schema
+ */
+ public static String getSchema(final Connection connection, final DatabaseType databaseType) {
+ return findDatabaseSpecialHandler(databaseType).map(handler -> handler.getSchema(connection)).orElse(getSchema(connection));
+ }
+
+ private static String getSchema(final Connection connection) {
+ try {
+ return connection.getSchema();
+ } catch (final SQLException ex) {
+ return null;
+ }
+ }
+
+ /**
+ * Get table name pattern.
+ *
+ * @param tableNamePattern table name pattern
+ * @param databaseType database type
+ * @return table name pattern
+ */
+ public static String getTableNamePattern(final String tableNamePattern, final DatabaseType databaseType) {
+ return findDatabaseSpecialHandler(databaseType).map(handler -> handler.decorate(tableNamePattern)).orElse(tableNamePattern);
+ }
+
+ private static Optional<DatabaseMetaDataDialectHandler> findDatabaseSpecialHandler(final DatabaseType databaseType) {
+ try {
+ return Optional.of(TypedSPIRegistry.getRegisteredService(DatabaseMetaDataDialectHandler.class, databaseType.getName(), new Properties()));
+ } catch (final ServiceProviderNotFoundException ignored) {
+ return Optional.empty();
+ }
+ }
+}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectHandler.java
similarity index 82%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandler.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectHandler.java
index 1018c35..cdeeb30 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectHandler.java
@@ -17,21 +17,20 @@
package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler;
-
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Optional;
import java.util.Properties;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.DatabaseMetaDataDialectHandler;
/**
- * JDBC schema handler of Oracle.
+ * Database meta data dialect handler of Oracle.
*/
@Getter
@Setter
-public final class OracleJDBCSchemaHandler implements JDBCSchemaHandler {
+public final class OracleDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
private Properties props;
@@ -45,6 +44,11 @@ public final class OracleJDBCSchemaHandler implements JDBCSchemaHandler {
}
@Override
+ public String decorate(final String tableNamePattern) {
+ return tableNamePattern.toUpperCase();
+ }
+
+ @Override
public String getType() {
return "Oracle";
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleTableNamePatternHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleTableNamePatternHandler.java
deleted file mode 100644
index 1a6b032..0000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleTableNamePatternHandler.java
+++ /dev/null
@@ -1,43 +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.
- */
-
-package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl;
-
-import java.util.Properties;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.TableNamePatternHandler;
-
-/**
- * Table name pattern handler of Oracle.
- */
-@Getter
-@Setter
-public final class OracleTableNamePatternHandler implements TableNamePatternHandler {
-
- private Properties props;
-
- @Override
- public String decorate(final String tableNamePattern) {
- return tableNamePattern.toUpperCase();
- }
-
- @Override
- public String getType() {
- return "Oracle";
- }
-}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/model/table/PhysicalTableMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/model/table/PhysicalTableMetaDataLoader.java
index fbef74a..a592587 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/model/table/PhysicalTableMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/model/physical/model/table/PhysicalTableMetaDataLoader.java
@@ -17,17 +17,13 @@
package org.apache.shardingsphere.infra.metadata.model.physical.model.table;
-import java.util.Properties;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.MetaDataConnectionAdapter;
-import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.TableNamePatternHandler;
+import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl.DatabaseMetaDataDialectHandlerFacade;
import org.apache.shardingsphere.infra.metadata.model.physical.model.column.PhysicalColumnMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.model.physical.model.index.PhysicalIndexMetaDataLoader;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -40,11 +36,7 @@ import java.util.Optional;
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PhysicalTableMetaDataLoader {
-
- static {
- ShardingSphereServiceLoader.register(TableNamePatternHandler.class);
- }
-
+
/**
* Load table meta data.
*
@@ -56,7 +48,7 @@ public final class PhysicalTableMetaDataLoader {
*/
public static Optional<PhysicalTableMetaData> load(final DataSource dataSource, final String tableNamePattern, final DatabaseType databaseType) throws SQLException {
try (MetaDataConnectionAdapter connectionAdapter = new MetaDataConnectionAdapter(databaseType, dataSource.getConnection())) {
- String tableName = decorateTableNamePattern(tableNamePattern, databaseType);
+ String tableName = DatabaseMetaDataDialectHandlerFacade.getTableNamePattern(tableNamePattern, databaseType);
return isTableExist(connectionAdapter, tableName)
? Optional.of(new PhysicalTableMetaData(
PhysicalColumnMetaDataLoader.load(connectionAdapter, tableName, databaseType), PhysicalIndexMetaDataLoader.load(connectionAdapter, tableName)))
@@ -69,17 +61,4 @@ public final class PhysicalTableMetaDataLoader {
return resultSet.next();
}
}
-
- private static String decorateTableNamePattern(final String tableNamePattern, final DatabaseType databaseType) {
- Optional<TableNamePatternHandler> tableNamePatternHandler = findTableNamePatternHandler(databaseType);
- return tableNamePatternHandler.map(handler -> handler.decorate(tableNamePattern)).orElse(tableNamePattern);
- }
-
- private static Optional<TableNamePatternHandler> findTableNamePatternHandler(final DatabaseType databaseType) {
- try {
- return Optional.of(TypedSPIRegistry.getRegisteredService(TableNamePatternHandler.class, databaseType.getName(), new Properties()));
- } catch (final ServiceProviderNotFoundException ignored) {
- return Optional.empty();
- }
- }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.TableNamePatternHandler b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.DatabaseMetaDataDialectHandler
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.TableNamePatternHandler
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.DatabaseMetaDataDialectHandler
index 24fdaa9..1bb44fd 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.TableNamePatternHandler
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.DatabaseMetaDataDialectHandler
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl.OracleTableNamePatternHandler
+org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl.OracleDatabaseMetaDataDialectHandler
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler
deleted file mode 100644
index 2978f9e..0000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler
+++ /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.infra.metadata.model.physical.jdbc.handler.impl.OracleJDBCSchemaHandler
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/OracleTableNamePatternHandlerTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/OracleTableNamePatternHandlerTest.java
deleted file mode 100644
index 09c0346..0000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/OracleTableNamePatternHandlerTest.java
+++ /dev/null
@@ -1,64 +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.
- */
-
-package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler;
-
-import java.util.Optional;
-import java.util.Properties;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.type.DatabaseTypes;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-@RunWith(MockitoJUnitRunner.class)
-public final class OracleTableNamePatternHandlerTest {
-
- private static final String TABLE_NAME_PATTERN = "t_order_0";
-
- private final DatabaseType oracleDatabaseType = DatabaseTypes.getTrunkDatabaseType("Oracle");
-
- private final DatabaseType mysqlDatabaseType = DatabaseTypes.getTrunkDatabaseType("MySQL");
-
- @Test
- public void assertDecorateTableNamePattern() {
- ShardingSphereServiceLoader.register(TableNamePatternHandler.class);
- Optional<TableNamePatternHandler> oracleTableNamePatternHandler = findTableNamePatternHandler(oracleDatabaseType);
- assertThat(oracleTableNamePatternHandler.isPresent(), is(true));
- Optional<TableNamePatternHandler> mysqlTableNamePatternHandler = findTableNamePatternHandler(mysqlDatabaseType);
- assertThat(mysqlTableNamePatternHandler.isPresent(), is(false));
- String oracleResult = oracleTableNamePatternHandler.map(handler -> handler.decorate(TABLE_NAME_PATTERN)).orElse(TABLE_NAME_PATTERN);
- assertEquals(oracleResult, "T_ORDER_0");
- String mysqlResult = mysqlTableNamePatternHandler.map(handler -> handler.decorate(TABLE_NAME_PATTERN)).orElse(TABLE_NAME_PATTERN);
- assertEquals(mysqlResult, TABLE_NAME_PATTERN);
- }
-
- private Optional<TableNamePatternHandler> findTableNamePatternHandler(final DatabaseType databaseType) {
- try {
- return Optional.of(TypedSPIRegistry.getRegisteredService(TableNamePatternHandler.class, databaseType.getName(), new Properties()));
- } catch (final ServiceProviderNotFoundException ignored) {
- return Optional.empty();
- }
- }
-}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandlerTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectFacadeTest.java
similarity index 63%
rename from shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandlerTest.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectFacadeTest.java
index 8b3fe52..b4d5529 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleJDBCSchemaHandlerTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/model/physical/jdbc/handler/impl/OracleDatabaseMetaDataDialectFacadeTest.java
@@ -17,43 +17,49 @@
package org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.impl;
-import org.apache.shardingsphere.infra.metadata.model.physical.jdbc.handler.JDBCSchemaHandler;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
-import org.junit.Before;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.type.DatabaseTypes;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class OracleJDBCSchemaHandlerTest {
-
+public final class OracleDatabaseMetaDataDialectFacadeTest {
+
private static final String USER_NAME = "root";
-
+
+ private static final String TABLE_NAME_PATTERN = "t_order_0";
+
+ private final DatabaseType oracleDatabaseType = DatabaseTypes.getTrunkDatabaseType("Oracle");
+
+ private final DatabaseType mysqlDatabaseType = DatabaseTypes.getTrunkDatabaseType("MySQL");
+
@Mock
private Connection connection;
-
+
@Mock
private DatabaseMetaData databaseMetaData;
-
- @Before
- public void before() {
- ShardingSphereServiceLoader.register(JDBCSchemaHandler.class);
- }
-
+
@Test
public void assertGetSchema() throws SQLException {
when(connection.getMetaData()).thenReturn(databaseMetaData);
when(databaseMetaData.getUserName()).thenReturn(USER_NAME);
- assertThat(TypedSPIRegistry.getRegisteredService(JDBCSchemaHandler.class).getSchema(connection), is(USER_NAME.toUpperCase()));
+ assertThat(DatabaseMetaDataDialectHandlerFacade.getSchema(connection, oracleDatabaseType), is(USER_NAME.toUpperCase()));
+ }
+
+ @Test
+ public void assertGetTableNamePattern() {
+ assertThat(DatabaseMetaDataDialectHandlerFacade.getTableNamePattern(TABLE_NAME_PATTERN, oracleDatabaseType), is(TABLE_NAME_PATTERN.toUpperCase()));
+ assertThat(DatabaseMetaDataDialectHandlerFacade.getTableNamePattern(TABLE_NAME_PATTERN, mysqlDatabaseType), is(TABLE_NAME_PATTERN));
}
}