You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/10/12 13:23:00 UTC
[shardingsphere] branch master updated: Rename JDBCSchemaLoader
(#7765)
This is an automated email from the ASF dual-hosted git repository.
kimmking 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 3c1294a Rename JDBCSchemaLoader (#7765)
3c1294a is described below
commit 3c1294a842e0d9aa6aafca8604b4f23812e70cf5
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Oct 12 21:22:33 2020 +0800
Rename JDBCSchemaLoader (#7765)
* Rename JDBCSchemaLoader
* Rename JDBCSchemaLoader
* Register JDBCSchemaLoader
* Fix test case
---
.../{ => jdbc}/MetaDataConnectionAdapter.java | 19 ++++++++++++-------
.../loader/JDBCSchemaLoader.java} | 6 +++---
.../loader/impl/OracleJDBCSchemaLoader.java} | 8 ++++----
.../database/schema/SchemaMetaDataLoader.java | 2 +-
.../metadata/database/table/TableMetaDataLoader.java | 2 +-
.../infra/spi/typed/TypedSPIRegistry.java | 2 +-
...ra.metadata.database.jdbc.loader.JDBCSchemaLoader} | 2 +-
.../{ => jdbc}/MetaDataConnectionAdapterTest.java | 2 +-
8 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapter.java
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapter.java
index b0bd9e4..9a6c2af 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapter.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapter.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database;
+package org.apache.shardingsphere.infra.metadata.database.jdbc;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.metadata.database.loader.SchemaLoader;
+import org.apache.shardingsphere.infra.metadata.database.jdbc.loader.JDBCSchemaLoader;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
@@ -49,6 +50,10 @@ import java.util.concurrent.Executor;
@RequiredArgsConstructor
public final class MetaDataConnectionAdapter implements Connection {
+ static {
+ ShardingSphereServiceLoader.register(JDBCSchemaLoader.class);
+ }
+
private final DatabaseType databaseType;
private final Connection connection;
@@ -69,9 +74,9 @@ public final class MetaDataConnectionAdapter implements Connection {
@Override
public String getSchema() {
- Optional<SchemaLoader> schemaLoader = findSchemaLoader();
- if (schemaLoader.isPresent()) {
- return schemaLoader.get().getSchema(connection);
+ Optional<JDBCSchemaLoader> jdbcSchemaLoader = findJDBCSchemaLoader();
+ if (jdbcSchemaLoader.isPresent()) {
+ return jdbcSchemaLoader.get().getSchema(connection);
}
try {
return connection.getSchema();
@@ -80,9 +85,9 @@ public final class MetaDataConnectionAdapter implements Connection {
}
}
- private Optional<SchemaLoader> findSchemaLoader() {
+ private Optional<JDBCSchemaLoader> findJDBCSchemaLoader() {
try {
- return Optional.of(TypedSPIRegistry.getRegisteredService(SchemaLoader.class, databaseType.getName(), new Properties()));
+ return Optional.of(TypedSPIRegistry.getRegisteredService(JDBCSchemaLoader.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/database/loader/SchemaLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/JDBCSchemaLoader.java
similarity index 87%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/loader/SchemaLoader.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/JDBCSchemaLoader.java
index ae6d058..3de7db1 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/loader/SchemaLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/JDBCSchemaLoader.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.loader;
+package org.apache.shardingsphere.infra.metadata.database.jdbc.loader;
import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
import java.sql.Connection;
/**
- * Schema loader.
+ * JDBC schema loader.
*/
-public interface SchemaLoader extends TypedSPI {
+public interface JDBCSchemaLoader extends TypedSPI {
/**
* Get schema.
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/loader/impl/OracleSchemaLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/impl/OracleJDBCSchemaLoader.java
similarity index 83%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/loader/impl/OracleSchemaLoader.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/impl/OracleJDBCSchemaLoader.java
index f84d97f..6639bb8 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/loader/impl/OracleSchemaLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/jdbc/loader/impl/OracleJDBCSchemaLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.loader.impl;
+package org.apache.shardingsphere.infra.metadata.database.jdbc.loader.impl;
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.infra.metadata.database.loader.SchemaLoader;
+import org.apache.shardingsphere.infra.metadata.database.jdbc.loader.JDBCSchemaLoader;
import java.sql.Connection;
import java.sql.SQLException;
@@ -27,11 +27,11 @@ import java.util.Optional;
import java.util.Properties;
/**
- * Schema loader of Oracle.
+ * JDBC schema loader of Oracle.
*/
@Getter
@Setter
-public final class OracleSchemaLoader implements SchemaLoader {
+public final class OracleJDBCSchemaLoader implements JDBCSchemaLoader {
private Properties props;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
index b66f5e7..9734343 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaMetaDataLoader.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.metadata.database.MetaDataConnectionAdapter;
+import org.apache.shardingsphere.infra.metadata.database.jdbc.MetaDataConnectionAdapter;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
index f915a9f..4dd5ca4 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/database/table/TableMetaDataLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.metadata.database.table;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.metadata.database.MetaDataConnectionAdapter;
+import org.apache.shardingsphere.infra.metadata.database.jdbc.MetaDataConnectionAdapter;
import org.apache.shardingsphere.infra.metadata.database.column.ColumnMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.database.index.IndexMetaDataLoader;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/spi/typed/TypedSPIRegistry.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/spi/typed/TypedSPIRegistry.java
index 2e893d0..f01782c 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/spi/typed/TypedSPIRegistry.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/spi/typed/TypedSPIRegistry.java
@@ -41,7 +41,7 @@ public final class TypedSPIRegistry {
* @return registered service
*/
public static <T extends TypedSPI> T getRegisteredService(final Class<T> typedSPIClass, final String type, final Properties props) {
- Optional<T> serviceInstance = ShardingSphereServiceLoader.newServiceInstances(typedSPIClass).stream().filter(each -> type.equalsIgnoreCase(each.getType())).findFirst();
+ Optional<T> serviceInstance = ShardingSphereServiceLoader.newServiceInstances(typedSPIClass).stream().filter(each -> each.getType().equalsIgnoreCase(type)).findFirst();
if (serviceInstance.isPresent()) {
T result = serviceInstance.get();
result.setProps(props);
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.loader.SchemaLoader b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.jdbc.loader.JDBCSchemaLoader
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.loader.SchemaLoader
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.jdbc.loader.JDBCSchemaLoader
index 39d5b20..e1eb254 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.loader.SchemaLoader
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.jdbc.loader.JDBCSchemaLoader
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.metadata.database.loader.impl.OracleSchemaLoader
+org.apache.shardingsphere.infra.metadata.database.jdbc.loader.impl.OracleJDBCSchemaLoader
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapterTest.java
similarity index 97%
rename from shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapterTest.java
index ac8e209..a4eb428 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/MetaDataConnectionAdapterTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/jdbc/MetaDataConnectionAdapterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database;
+package org.apache.shardingsphere.infra.metadata.database.jdbc;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypes;