This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 c0f248afab1 Remove useless param of ColumnReviser (#24078)
c0f248afab1 is described below
commit c0f248afab16d24ce8c129d8ac18bd215177d167
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Feb 9 19:03:03 2023 +0800
Remove useless param of ColumnReviser (#24078)
---
.../metadata/reviser/EncryptColumnExistedReviser.java | 5 ++---
.../metadata/reviser/EncryptColumnNameReviser.java | 5 ++---
.../metadata/reviser/ShardingColumnGeneratedReviser.java | 5 ++---
.../decorator/reviser/column/ColumnDataTypeReviser.java | 9 ++-------
.../decorator/reviser/column/ColumnExistedReviser.java | 9 ++-------
.../decorator/reviser/column/ColumnGeneratedReviser.java | 8 ++------
.../decorator/reviser/column/ColumnNameReviser.java | 10 ++--------
.../decorator/reviser/column/ColumnReviseEngine.java | 16 ++++++++--------
.../schema/decorator/spi/MetaDataReviseEntry.java | 8 ++++----
9 files changed, 26 insertions(+), 49 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnExistedReviser.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnExistedReviser.java
index e7a5165dea5..6c5d82b3ea3 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnExistedReviser.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnExistedReviser.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.metadata.reviser;
-import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column.ColumnExistedReviser;
@@ -26,7 +25,7 @@ import java.util.Collection;
/**
* Encrypt column existed reviser.
*/
-public final class EncryptColumnExistedReviser implements
ColumnExistedReviser<EncryptRule> {
+public final class EncryptColumnExistedReviser implements ColumnExistedReviser
{
private final EncryptTable encryptTable;
@@ -44,7 +43,7 @@ public final class EncryptColumnExistedReviser implements
ColumnExistedReviser<E
}
@Override
- public boolean isExisted(final String originalName, final EncryptRule
rule) {
+ public boolean isExisted(final String originalName) {
return plainColumns.contains(originalName) ||
encryptTable.isCipherColumn(originalName) ||
!assistedQueryColumns.contains(originalName) &&
!likeQueryColumns.contains(originalName);
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnNameReviser.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnNameReviser.java
index 0300f56edf0..dab3b411bbe 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnNameReviser.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/reviser/EncryptColumnNameReviser.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.metadata.reviser;
-import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column.ColumnNameReviser;
@@ -26,7 +25,7 @@ import java.util.Collection;
/**
* Encrypt column name reviser.
*/
-public final class EncryptColumnNameReviser implements
ColumnNameReviser<EncryptRule> {
+public final class EncryptColumnNameReviser implements ColumnNameReviser {
private final EncryptTable encryptTable;
@@ -38,7 +37,7 @@ public final class EncryptColumnNameReviser implements
ColumnNameReviser<Encrypt
}
@Override
- public String revise(final String originalName, final String tableName,
final EncryptRule rule) {
+ public String revise(final String originalName) {
if (plainColumns.contains(originalName)) {
return encryptTable.getLogicColumnByPlainColumn(originalName);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/ShardingColumnGeneratedReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/ShardingColumnGeneratedReviser.java
index 0516aaa759f..f35955594e4 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/ShardingColumnGeneratedReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/ShardingColumnGeneratedReviser.java
@@ -20,19 +20,18 @@ package org.apache.shardingsphere.sharding.metadata.reviser;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column.ColumnGeneratedReviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
/**
* Sharding column generated reviser.
*/
@RequiredArgsConstructor
-public final class ShardingColumnGeneratedReviser implements
ColumnGeneratedReviser<ShardingRule> {
+public final class ShardingColumnGeneratedReviser implements
ColumnGeneratedReviser {
private final TableRule tableRule;
@Override
- public boolean revise(final ColumnMetaData originalMetaData, final
ShardingRule rule) {
+ public boolean revise(final ColumnMetaData originalMetaData) {
return
originalMetaData.getName().equalsIgnoreCase(tableRule.getGenerateKeyColumn().orElse(null));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
index 91ddd9afacd..64c62f3193e 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
@@ -18,27 +18,22 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import javax.sql.DataSource;
import java.util.Optional;
/**
* Column data type reviser.
- *
- * @param <T> type of rule
*/
-public interface ColumnDataTypeReviser<T extends ShardingSphereRule> {
+public interface ColumnDataTypeReviser {
/**
* Revise column data type.
*
* @param originalName original column name
- * @param tableName table name
- * @param rule rule
* @param databaseType database type
* @param dataSource data source
* @return revised data type
*/
- Optional<Integer> revise(String originalName, String tableName, T rule,
DatabaseType databaseType, DataSource dataSource);
+ Optional<Integer> revise(String originalName, DatabaseType databaseType,
DataSource dataSource);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnExistedReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnExistedReviser.java
index a44dc1a697d..491a520f547 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnExistedReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnExistedReviser.java
@@ -17,21 +17,16 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-
/**
* Column existed reviser.
- *
- * @param <T> type of rule
*/
-public interface ColumnExistedReviser<T extends ShardingSphereRule> {
+public interface ColumnExistedReviser {
/**
* Judge whether column existed.
*
* @param originalName original column name
- * @param rule rule
* @return column existed or not
*/
- boolean isExisted(String originalName, T rule);
+ boolean isExisted(String originalName);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnGeneratedReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnGeneratedReviser.java
index df9f8a59863..11ea2a50095 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnGeneratedReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnGeneratedReviser.java
@@ -18,21 +18,17 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
/**
* Column generated reviser.
- *
- * @param <T> type of rule
*/
-public interface ColumnGeneratedReviser<T extends ShardingSphereRule> {
+public interface ColumnGeneratedReviser {
/**
* Revise generated column.
*
* @param originalMetaData original column meta data
- * @param rule rule
* @return revised generated column
*/
- boolean revise(ColumnMetaData originalMetaData, T rule);
+ boolean revise(ColumnMetaData originalMetaData);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnNameReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnNameReviser.java
index 4fe89bcd8f6..9996d2b72cd 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnNameReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnNameReviser.java
@@ -17,22 +17,16 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-
/**
* Column name reviser.
- *
- * @param <T> type of rule
*/
-public interface ColumnNameReviser<T extends ShardingSphereRule> {
+public interface ColumnNameReviser {
/**
* Revise column name.
*
* @param originalName original column name
- * @param tableName table name
- * @param rule rule
* @return revised column name
*/
- String revise(String originalName, String tableName, T rule);
+ String revise(String originalName);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
index 5ac2ae49c2c..d856f0952a3 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
@@ -52,18 +52,18 @@ public final class ColumnReviseEngine<T extends
ShardingSphereRule> {
* @return revised column meta data
*/
public Collection<ColumnMetaData> revise(final String tableName, final
Collection<ColumnMetaData> originalMetaDataList) {
- Optional<? extends ColumnExistedReviser<T>> existedReviser =
reviseEntry.getColumnExistedReviser(rule, tableName);
- Optional<? extends ColumnNameReviser<T>> nameReviser =
reviseEntry.getColumnNameReviser(rule, tableName);
- Optional<? extends ColumnDataTypeReviser<T>> dataTypeReviser =
reviseEntry.getColumnDataTypeReviser(rule, tableName);
- Optional<? extends ColumnGeneratedReviser<T>> generatedReviser =
reviseEntry.getColumnGeneratedReviser(rule, tableName);
+ Optional<? extends ColumnExistedReviser> existedReviser =
reviseEntry.getColumnExistedReviser(rule, tableName);
+ Optional<? extends ColumnNameReviser> nameReviser =
reviseEntry.getColumnNameReviser(rule, tableName);
+ Optional<? extends ColumnDataTypeReviser> dataTypeReviser =
reviseEntry.getColumnDataTypeReviser(rule, tableName);
+ Optional<? extends ColumnGeneratedReviser> generatedReviser =
reviseEntry.getColumnGeneratedReviser(rule, tableName);
Collection<ColumnMetaData> result = new LinkedHashSet<>();
for (ColumnMetaData each : originalMetaDataList) {
- if (existedReviser.isPresent() &&
!existedReviser.get().isExisted(each.getName(), rule)) {
+ if (existedReviser.isPresent() &&
!existedReviser.get().isExisted(each.getName())) {
continue;
}
- String name = nameReviser.isPresent() ?
nameReviser.get().revise(each.getName(), tableName, rule) : each.getName();
- int dataType = dataTypeReviser.map(optional ->
optional.revise(each.getName(), tableName, rule, databaseType,
dataSource).orElseGet(each::getDataType)).orElseGet(each::getDataType);
- boolean generated = generatedReviser.map(optional ->
optional.revise(each, rule)).orElseGet(each::isGenerated);
+ String name = nameReviser.isPresent() ?
nameReviser.get().revise(each.getName()) : each.getName();
+ int dataType = dataTypeReviser.map(optional ->
optional.revise(each.getName(), databaseType,
dataSource).orElseGet(each::getDataType)).orElseGet(each::getDataType);
+ boolean generated = generatedReviser.map(optional ->
optional.revise(each)).orElseGet(each::isGenerated);
result.add(new ColumnMetaData(name, dataType, each.isPrimaryKey(),
generated, each.isCaseSensitive(), each.isVisible(), each.isUnsigned()));
}
return result;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/spi/MetaDataReviseEntry.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/spi/MetaDataReviseEntry.java
index 24d690eade2..338b76a1136 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/spi/MetaDataReviseEntry.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/spi/MetaDataReviseEntry.java
@@ -65,7 +65,7 @@ public interface MetaDataReviseEntry<T extends
ShardingSphereRule> extends Typed
* @param tableName table name
* @return column existed reviser
*/
- default Optional<? extends ColumnExistedReviser<T>>
getColumnExistedReviser(final T rule, final String tableName) {
+ default Optional<? extends ColumnExistedReviser>
getColumnExistedReviser(final T rule, final String tableName) {
return Optional.empty();
}
@@ -76,7 +76,7 @@ public interface MetaDataReviseEntry<T extends
ShardingSphereRule> extends Typed
* @param tableName table name
* @return column name reviser
*/
- default Optional<? extends ColumnNameReviser<T>>
getColumnNameReviser(final T rule, final String tableName) {
+ default Optional<? extends ColumnNameReviser> getColumnNameReviser(final T
rule, final String tableName) {
return Optional.empty();
}
@@ -87,7 +87,7 @@ public interface MetaDataReviseEntry<T extends
ShardingSphereRule> extends Typed
* @param tableName table name
* @return column data type reviser
*/
- default Optional<? extends ColumnDataTypeReviser<T>>
getColumnDataTypeReviser(final T rule, final String tableName) {
+ default Optional<? extends ColumnDataTypeReviser>
getColumnDataTypeReviser(final T rule, final String tableName) {
return Optional.empty();
}
@@ -98,7 +98,7 @@ public interface MetaDataReviseEntry<T extends
ShardingSphereRule> extends Typed
* @param tableName table name
* @return column generated reviser
*/
- default Optional<? extends ColumnGeneratedReviser<T>>
getColumnGeneratedReviser(final T rule, final String tableName) {
+ default Optional<? extends ColumnGeneratedReviser>
getColumnGeneratedReviser(final T rule, final String tableName) {
return Optional.empty();
}
