This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 0753da36ecd Refactor AbstractDataTypeLoader (#23718)
0753da36ecd is described below
commit 0753da36ecde8c4a650a1cc5435ad196a5974ee0
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 24 22:31:19 2023 +0800
Refactor AbstractDataTypeLoader (#23718)
---
.../schema/loader/common/AbstractDataTypeLoader.java | 12 +++---------
.../schema/loader/common/DefaultDataTypeLoader.java | 15 ---------------
.../loader/dialect/datatype/MySQLDataTypeLoader.java | 12 +++---------
.../loader/dialect/datatype/OracleDataTypeLoader.java | 12 +++---------
.../database/schema/loader/spi/DataTypeLoader.java | 4 ++--
.../schema/loader/dialect/DataTypeLoaderFixture.java | 15 ---------------
6 files changed, 11 insertions(+), 59 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/AbstractDataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/AbstractDataTypeLoader.java
index cc70ac04ff5..fd42c760a9b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/AbstractDataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/AbstractDataTypeLoader.java
@@ -30,16 +30,10 @@ import java.util.TreeMap;
*/
public abstract class AbstractDataTypeLoader implements DataTypeLoader {
- /**
- * Load data type.
- *
- * @param database database
- * @return data type map
- * @throws SQLException SQL exception
- */
- public Map<String, Integer> load(final DatabaseMetaData database) throws
SQLException {
+ @Override
+ public Map<String, Integer> load(final DatabaseMetaData databaseMetaData)
throws SQLException {
Map<String, Integer> result = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- try (ResultSet resultSet = database.getTypeInfo()) {
+ try (ResultSet resultSet = databaseMetaData.getTypeInfo()) {
while (resultSet.next()) {
result.put(resultSet.getString("TYPE_NAME"),
resultSet.getInt("DATA_TYPE"));
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/DefaultDataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/DefaultDataTypeLoader.java
index cb19ea2027f..be688d68a9c 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/DefaultDataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/DefaultDataTypeLoader.java
@@ -17,26 +17,11 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.Map;
-
/**
* Default data type loader.
*/
public final class DefaultDataTypeLoader extends AbstractDataTypeLoader {
- /**
- * Load data type.
- *
- * @param database database
- * @return data type map
- * @throws SQLException SQL exception
- */
- public Map<String, Integer> load(final DatabaseMetaData database) throws
SQLException {
- return super.load(database);
- }
-
@Override
public String getType() {
return "Default";
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/MySQLDataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/MySQLDataTypeLoader.java
index fd6208ec726..11053e42980 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/MySQLDataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/MySQLDataTypeLoader.java
@@ -29,15 +29,9 @@ import java.util.Map;
*/
public final class MySQLDataTypeLoader extends AbstractDataTypeLoader {
- /**
- * Load data type.
- *
- * @param database database
- * @return data type map
- * @throws SQLException SQL exception
- */
- public Map<String, Integer> load(final DatabaseMetaData database) throws
SQLException {
- Map<String, Integer> result = super.load(database);
+ @Override
+ public Map<String, Integer> load(final DatabaseMetaData databaseMetaData)
throws SQLException {
+ Map<String, Integer> result = super.load(databaseMetaData);
result.putIfAbsent("JSON", Types.LONGVARCHAR);
result.putIfAbsent("GEOMETRY", Types.BINARY);
result.putIfAbsent("GEOMETRYCOLLECTION", Types.BINARY);
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/OracleDataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/OracleDataTypeLoader.java
index ad8c5ffd66d..23df8c4d3d5 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/OracleDataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/datatype/OracleDataTypeLoader.java
@@ -29,15 +29,9 @@ import java.util.Map;
*/
public final class OracleDataTypeLoader extends AbstractDataTypeLoader {
- /**
- * Load data type.
- *
- * @param database database
- * @return data type map
- * @throws SQLException SQL exception
- */
- public Map<String, Integer> load(final DatabaseMetaData database) throws
SQLException {
- Map<String, Integer> result = super.load(database);
+ @Override
+ public Map<String, Integer> load(final DatabaseMetaData databaseMetaData)
throws SQLException {
+ Map<String, Integer> result = super.load(databaseMetaData);
result.putIfAbsent("NUMBER", Types.NUMERIC);
return result;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/spi/DataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/spi/DataTypeLoader.java
index caed517f309..defa47c9d44 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/spi/DataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/spi/DataTypeLoader.java
@@ -34,9 +34,9 @@ public interface DataTypeLoader extends TypedSPI, RequiredSPI
{
/**
* Load data type.
*
- * @param database database
+ * @param databaseMetaData database meta data
* @return data type map
* @throws SQLException SQL exception
*/
- Map<String, Integer> load(DatabaseMetaData database) throws SQLException;
+ Map<String, Integer> load(DatabaseMetaData databaseMetaData) throws
SQLException;
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/DataTypeLoaderFixture.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/DataTypeLoaderFixture.java
index 797a5027190..28d6a14240b 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/DataTypeLoaderFixture.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/DataTypeLoaderFixture.java
@@ -19,26 +19,11 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.loader.dialect;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.common.AbstractDataTypeLoader;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.Map;
-
/**
* Data type loader fixture.
*/
public final class DataTypeLoaderFixture extends AbstractDataTypeLoader {
- /**
- * Load data type.
- *
- * @param database database
- * @return data type map
- * @throws SQLException SQL exception
- */
- public Map<String, Integer> load(final DatabaseMetaData database) throws
SQLException {
- return super.load(database);
- }
-
@Override
public String getType() {
return "INFRA.FIXTURE";
