This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 e6abced228b Remove useless static variables (#18553)
e6abced228b is described below
commit e6abced228b9eeee42b1bdab6f81a3841d0a3d67
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 23 23:29:34 2022 +0800
Remove useless static variables (#18553)
* Remove useless static variables
* Remove useless static variables
* Fix checkstyle
---
...licationDatabaseDiscoveryProviderAlgorithm.java | 2 +-
.../ReadQueryLoadBalanceAlgorithmFixture.java | 4 +-
.../fixture/KeyGenerateAlgorithmFixture.java | 10 ++-
.../sharding/fixture/ShardingAlgorithmFixture.java | 4 +-
.../dql/groupby/GroupByMemoryMergedResult.java | 4 +-
.../query/ShardingTableRuleQueryResultSet.java | 2 +-
.../UnusedShardingAlgorithmsQueryResultSet.java | 72 ++++++++++------------
...terDefaultShardingStrategyStatementUpdater.java | 4 +-
...ateDefaultShardingStrategyStatementUpdater.java | 4 +-
.../DropShardingKeyGeneratorStatementUpdater.java | 34 +++++-----
.../keygen/CosIdKeyGenerateAlgorithm.java | 6 +-
.../keygen/CosIdSnowflakeKeyGenerateAlgorithm.java | 4 +-
.../interval/CosIdIntervalShardingAlgorithm.java | 10 ++-
.../CosIdSnowflakeIntervalShardingAlgorithm.java | 4 +-
.../sharding/mod/CosIdModShardingAlgorithm.java | 6 +-
.../keygen/CosIdKeyGenerateAlgorithmTest.java | 5 +-
.../mod/CosIdModShardingAlgorithmTest.java | 2 +-
.../type/AlterIndexStatementSchemaRefresher.java | 4 +-
.../type/AlterSchemaStatementSchemaRefresher.java | 4 +-
.../type/AlterTableStatementSchemaRefresher.java | 4 +-
.../type/AlterViewStatementSchemaRefresher.java | 4 +-
.../type/CreateIndexStatementSchemaRefresher.java | 4 +-
.../type/CreateSchemaStatementSchemaRefresher.java | 4 +-
.../type/CreateTableStatementSchemaRefresher.java | 4 +-
.../type/CreateViewStatementSchemaRefresher.java | 4 +-
.../type/DropIndexStatementSchemaRefresher.java | 4 +-
.../type/DropSchemaStatementSchemaRefresher.java | 4 +-
.../type/DropTableStatementSchemaRefresher.java | 4 +-
.../type/DropViewStatementSchemaRefresher.java | 4 +-
.../type/RenameTableStatementSchemaRefresher.java | 4 +-
...rdingSpherePipelineDataSourceConfiguration.java | 8 +--
.../TrafficLoadBalanceAlgorithmFixture.java | 10 ++-
32 files changed, 95 insertions(+), 152 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvi
[...]
index 5e312384fb2..3fe2fe0f70b 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
@@ -84,7 +84,7 @@ public final class
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm impl
}
}, executorService);
}
-
+
@Override
public boolean isPrimaryInstance(final DataSource dataSource) throws
SQLException {
return !getReplicationInstances(dataSource).isEmpty() &&
isNotReadonlyInstance(dataSource);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/fixture/ReadQueryLoadBalanceAlgorithmFixture.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/fixture/ReadQueryLoadBalanceAlgorithmFixture.java
index 9c4e997499e..2686e261743 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/fixture/ReadQueryLoadBalanceAlgorithmFixture.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/fixture/ReadQueryLoadBalanceAlgorithmFixture.java
@@ -24,8 +24,6 @@ import java.util.Properties;
public final class ReadQueryLoadBalanceAlgorithmFixture implements
ReadQueryLoadBalanceAlgorithm {
- public static final String TYPE = "FIXTURE";
-
@Override
public String getDataSource(final String name, final String
writeDataSourceName, final List<String> readDataSourceNames) {
return null;
@@ -42,6 +40,6 @@ public final class ReadQueryLoadBalanceAlgorithmFixture
implements ReadQueryLoad
@Override
public String getType() {
- return TYPE;
+ return "FIXTURE";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/KeyGenerateAlgorithmFixture.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/KeyGenerateAlgorithmFixture.java
index 0bff4f883da..96868af751a 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/KeyGenerateAlgorithmFixture.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/KeyGenerateAlgorithmFixture.java
@@ -23,11 +23,8 @@ import java.util.Properties;
public final class KeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm
{
- public static final String TYPE = "FIXTURE";
-
@Override
- public Comparable<?> generateKey() {
- return null;
+ public void init(final Properties props) {
}
@Override
@@ -36,11 +33,12 @@ public final class KeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm {
}
@Override
- public void init(final Properties props) {
+ public Comparable<?> generateKey() {
+ return null;
}
@Override
public String getType() {
- return TYPE;
+ return "FIXTURE";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAlgorithmFixture.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAlgorithmFixture.java
index 2d6f6286a06..11d1080cae9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAlgorithmFixture.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAlgorithmFixture.java
@@ -23,8 +23,6 @@ import java.util.Properties;
public final class ShardingAlgorithmFixture implements ShardingAlgorithm {
- public static final String TYPE = "FIXTURE";
-
@Override
public Properties getProps() {
return new Properties();
@@ -36,6 +34,6 @@ public final class ShardingAlgorithmFixture implements
ShardingAlgorithm {
@Override
public String getType() {
- return TYPE;
+ return "FIXTURE";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
index c9064f80172..fdcef2b4008 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
@@ -126,7 +126,7 @@ public final class GroupByMemoryMergedResult extends
MemoryMergedResult<Sharding
}
return result;
}
-
+
private boolean getValueCaseSensitiveFromTables(final QueryResult
queryResult,
final
SelectStatementContext selectStatementContext, final ShardingSphereSchema
schema, final int columnIndex) throws SQLException {
for (SimpleTableSegment each : selectStatementContext.getAllTables()) {
@@ -140,7 +140,7 @@ public final class GroupByMemoryMergedResult extends
MemoryMergedResult<Sharding
}
return false;
}
-
+
private List<MemoryQueryResultRow> getMemoryResultSetRows(final
SelectStatementContext selectStatementContext,
final
Map<GroupByValue, MemoryQueryResultRow> dataMap, final List<Boolean>
valueCaseSensitive) {
if (dataMap.isEmpty()) {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
index 4a9c806b5ac..09b7f0d8255 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
@@ -62,7 +62,7 @@ public final class ShardingTableRuleQueryResultSet implements
DistSQLResultSet {
ShardingRuleConfiguration config = (ShardingRuleConfiguration)
rule.get().getConfiguration();
String tableName = ((ShowShardingTableRulesStatement)
sqlStatement).getTableName();
if (Objects.isNull(tableName)) {
- tables = config.getTables().iterator();
+ tables = config.getTables().iterator();
autoTables = config.getAutoTables().iterator();
} else {
tables = config.getTables().stream().filter(each ->
tableName.equalsIgnoreCase(each.getLogicTable())).collect(Collectors.toList()).iterator();
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
index c35a49a1ff9..3bbdbb5c571 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
@@ -46,14 +46,6 @@ import java.util.Properties;
*/
public final class UnusedShardingAlgorithmsQueryResultSet implements
DistSQLResultSet {
- private static final String TYPE =
ShowUnusedShardingAlgorithmsStatement.class.getName();
-
- private static final String NAME = "name";
-
- private static final String COLUMN_TYPE = "type";
-
- private static final String PROPS = "props";
-
private Iterator<Entry<String, ShardingSphereAlgorithmConfiguration>> data
= Collections.emptyIterator();
@Override
@@ -62,38 +54,6 @@ public final class UnusedShardingAlgorithmsQueryResultSet
implements DistSQLResu
rule.ifPresent(optional ->
getUnusedShardingAlgorithms((ShardingRuleConfiguration)
optional.getConfiguration()));
}
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList(NAME, COLUMN_TYPE, PROPS);
- }
-
- @Override
- public boolean next() {
- return data.hasNext();
- }
-
- @Override
- public Collection<Object> getRowData() {
- return buildTableRowData(data.next());
- }
-
- private Collection<Object> buildTableRowData(final Entry<String,
ShardingSphereAlgorithmConfiguration> data) {
- Collection<Object> result = new LinkedList<>();
- result.add(data.getKey());
- result.add(data.getValue().getType());
- result.add(buildProps(data.getValue().getProps()));
- return result;
- }
-
- private Object buildProps(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
- }
-
- @Override
- public String getType() {
- return TYPE;
- }
-
private void getUnusedShardingAlgorithms(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> inUsedAlgorithms =
getUsedShardingAlgorithms(shardingRuleConfig);
Map<String, ShardingSphereAlgorithmConfiguration> map = new
HashMap<>();
@@ -126,4 +86,36 @@ public final class UnusedShardingAlgorithmsQueryResultSet
implements DistSQLResu
}
return result;
}
+
+ @Override
+ public Collection<String> getColumnNames() {
+ return Arrays.asList("name", "type", "props");
+ }
+
+ @Override
+ public boolean next() {
+ return data.hasNext();
+ }
+
+ @Override
+ public Collection<Object> getRowData() {
+ return buildTableRowData(data.next());
+ }
+
+ private Collection<Object> buildTableRowData(final Entry<String,
ShardingSphereAlgorithmConfiguration> data) {
+ Collection<Object> result = new LinkedList<>();
+ result.add(data.getKey());
+ result.add(data.getValue().getType());
+ result.add(buildProps(data.getValue().getProps()));
+ return result;
+ }
+
+ private Object buildProps(final Properties props) {
+ return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ }
+
+ @Override
+ public String getType() {
+ return ShowUnusedShardingAlgorithmsStatement.class.getName();
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
index 524294147de..b8404a0eadd 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java
@@ -40,8 +40,6 @@ import java.util.Optional;
*/
public final class AlterDefaultShardingStrategyStatementUpdater implements
RuleDefinitionAlterUpdater<AlterDefaultShardingStrategyStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
AlterDefaultShardingStrategyStatement.class.getName();
-
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final AlterDefaultShardingStrategyStatement
sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws
DistSQLException {
@@ -143,6 +141,6 @@ public final class
AlterDefaultShardingStrategyStatementUpdater implements RuleD
@Override
public String getType() {
- return TYPE;
+ return AlterDefaultShardingStrategyStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
index ba304cc7282..4b4ec516f1e 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java
@@ -41,8 +41,6 @@ import java.util.Optional;
*/
public final class CreateDefaultShardingStrategyStatementUpdater implements
RuleDefinitionCreateUpdater<CreateDefaultShardingStrategyStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
CreateDefaultShardingStrategyStatement.class.getName();
-
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final CreateDefaultShardingStrategyStatement
sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws
DistSQLException {
@@ -141,6 +139,6 @@ public final class
CreateDefaultShardingStrategyStatementUpdater implements Rule
@Override
public String getType() {
- return TYPE;
+ return CreateDefaultShardingStrategyStatement.class.getName();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
index 430b0b96c67..b1f17152e1f 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
@@ -38,8 +38,6 @@ import java.util.stream.Collectors;
*/
public final class DropShardingKeyGeneratorStatementUpdater implements
RuleDefinitionDropUpdater<DropShardingKeyGeneratorStatement,
ShardingRuleConfiguration> {
- private static final String TYPE =
DropShardingKeyGeneratorStatement.class.getName();
-
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingKeyGeneratorStatement
sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws
DistSQLException {
@@ -67,22 +65,6 @@ public final class DropShardingKeyGeneratorStatementUpdater
implements RuleDefin
DistSQLException.predictionThrow(inUsedNames.isEmpty(), () -> new
KeyGeneratorInUsedException("Sharding", databaseName, inUsedNames));
}
- @Override
- public boolean updateCurrentRuleConfiguration(final
DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
-
currentRuleConfig.getKeyGenerators().keySet().removeIf(sqlStatement.getKeyGeneratorNames()::contains);
- return false;
- }
-
- @Override
- public Class<ShardingRuleConfiguration> getRuleConfigurationClass() {
- return ShardingRuleConfiguration.class;
- }
-
- @Override
- public String getType() {
- return TYPE;
- }
-
private Collection<String> getUsedKeyGenerators(final
ShardingRuleConfiguration shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
shardingRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getKeyGenerateStrategy())).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
@@ -94,8 +76,24 @@ public final class DropShardingKeyGeneratorStatementUpdater
implements RuleDefin
return result;
}
+ @Override
+ public boolean updateCurrentRuleConfiguration(final
DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
+
currentRuleConfig.getKeyGenerators().keySet().removeIf(sqlStatement.getKeyGeneratorNames()::contains);
+ return false;
+ }
+
@Override
public boolean hasAnyOneToBeDropped(final
DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration
currentRuleConfig) {
return null != currentRuleConfig &&
!getIdenticalData(currentRuleConfig.getKeyGenerators().keySet(),
sqlStatement.getKeyGeneratorNames()).isEmpty();
}
+
+ @Override
+ public Class<ShardingRuleConfiguration> getRuleConfigurationClass() {
+ return ShardingRuleConfiguration.class;
+ }
+
+ @Override
+ public String getType() {
+ return DropShardingKeyGeneratorStatement.class.getName();
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
index 51367d9cd27..9aec6fdf284 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
@@ -31,9 +31,7 @@ import java.util.Properties;
*/
public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
- public static final String TYPE = CosId.COSID.toUpperCase();
-
- public static final String AS_STRING_KEY = "as-string";
+ private static final String AS_STRING_KEY = "as-string";
@Getter
private Properties props;
@@ -60,6 +58,6 @@ public final class CosIdKeyGenerateAlgorithm implements
KeyGenerateAlgorithm {
@Override
public String getType() {
- return TYPE;
+ return CosId.COSID.toUpperCase();
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
index 2bfa8ce58dd..b2ce6e730ac 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
@@ -37,8 +37,6 @@ import java.util.Properties;
*/
public final class CosIdSnowflakeKeyGenerateAlgorithm implements
KeyGenerateAlgorithm, InstanceAwareAlgorithm {
- public static final String TYPE = CosIdAlgorithmConstants.TYPE_PREFIX +
"SNOWFLAKE";
-
public static final long DEFAULT_EPOCH;
public static final String AS_STRING_KEY = "as-string";
@@ -102,6 +100,6 @@ public final class CosIdSnowflakeKeyGenerateAlgorithm
implements KeyGenerateAlgo
@Override
public String getType() {
- return TYPE;
+ return CosIdAlgorithmConstants.TYPE_PREFIX + "SNOWFLAKE";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
index c364ef424a3..828d1dcd83b 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
@@ -31,13 +31,11 @@ import java.util.Properties;
*/
public final class CosIdIntervalShardingAlgorithm extends
AbstractCosIdIntervalShardingAlgorithm<Comparable<?>> {
- public static final String TYPE = CosIdAlgorithmConstants.TYPE_PREFIX +
"INTERVAL";
+ private static final String DATE_TIME_PATTERN_KEY = "datetime-pattern";
- public static final String DATE_TIME_PATTERN_KEY = "datetime-pattern";
+ private static final String TIMESTAMP_SECOND_UNIT = "SECOND";
- public static final String TIMESTAMP_SECOND_UNIT = "SECOND";
-
- public static final String TIMESTAMP_UNIT_KEY = "ts-unit";
+ private static final String TIMESTAMP_UNIT_KEY = "ts-unit";
private boolean isSecondTs;
@@ -77,6 +75,6 @@ public final class CosIdIntervalShardingAlgorithm extends
AbstractCosIdIntervalS
@Override
public String getType() {
- return TYPE;
+ return CosIdAlgorithmConstants.TYPE_PREFIX + "INTERVAL";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
index 79500175115..062f1d75571 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
@@ -33,8 +33,6 @@ import java.util.Properties;
*/
public final class CosIdSnowflakeIntervalShardingAlgorithm extends
AbstractCosIdIntervalShardingAlgorithm<Comparable<?>> {
- public static final String TYPE = CosIdAlgorithmConstants.TYPE_PREFIX +
"INTERVAL_SNOWFLAKE";
-
public static final String EPOCH_KEY = "epoch";
private SnowflakeIdStateParser snowflakeIdStateParser;
@@ -70,6 +68,6 @@ public final class CosIdSnowflakeIntervalShardingAlgorithm
extends AbstractCosId
@Override
public String getType() {
- return TYPE;
+ return CosIdAlgorithmConstants.TYPE_PREFIX + "INTERVAL_SNOWFLAKE";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
index fc48498dccc..f56c176f195 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
@@ -33,9 +33,7 @@ import java.util.Properties;
*/
public final class CosIdModShardingAlgorithm<T extends Number & Comparable<T>>
implements StandardShardingAlgorithm<T> {
- public static final String TYPE = CosIdAlgorithmConstants.TYPE_PREFIX +
"MOD";
-
- public static final String MODULO_KEY = "mod";
+ private static final String MODULO_KEY = "mod";
@Getter
private Properties props;
@@ -68,6 +66,6 @@ public final class CosIdModShardingAlgorithm<T extends Number
& Comparable<T>> i
@Override
public String getType() {
- return TYPE;
+ return CosIdAlgorithmConstants.TYPE_PREFIX + "MOD";
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithmTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithmTest.java
index fc0f8b87c70..816cfdf43d9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithmTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.cosid.algorithm.keygen;
-import java.util.Properties;
import me.ahoo.cosid.IdGenerator;
import me.ahoo.cosid.StringIdGenerator;
import me.ahoo.cosid.converter.PrefixIdConverter;
@@ -33,6 +32,8 @@ import
org.apache.shardingsphere.sharding.factory.KeyGenerateAlgorithmFactory;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import org.junit.Test;
+import java.util.Properties;
+
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.startsWith;
@@ -88,7 +89,7 @@ public final class CosIdKeyGenerateAlgorithmTest {
private Properties createAsStringProperties(final String idName) {
Properties result = new Properties();
result.setProperty(CosIdAlgorithmConstants.ID_NAME_KEY, idName);
- result.setProperty(CosIdKeyGenerateAlgorithm.AS_STRING_KEY,
Boolean.TRUE.toString());
+ result.setProperty("as-string", Boolean.TRUE.toString());
return result;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithmTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithmTest.java
index ec4196dc491..b2316515165 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithmTest.java
@@ -59,7 +59,7 @@ public final class CosIdModShardingAlgorithmTest {
private static Properties createProperties() {
Properties result = new Properties();
result.setProperty(CosIdAlgorithmConstants.LOGIC_NAME_PREFIX_KEY,
LOGIC_NAME_PREFIX);
- result.put(CosIdModShardingAlgorithm.MODULO_KEY, DIVISOR);
+ result.put("mod", DIVISOR);
return result;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
index 8c626210779..1a20108d98b 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterIndexStatementSchemaRefresher.java
@@ -42,8 +42,6 @@ import java.util.Optional;
*/
public final class AlterIndexStatementSchemaRefresher implements
MetaDataRefresher<AlterIndexStatement> {
- private static final String TYPE = AlterIndexStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -75,6 +73,6 @@ public final class AlterIndexStatementSchemaRefresher
implements MetaDataRefresh
@Override
public String getType() {
- return TYPE;
+ return AlterIndexStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterSchemaStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterSchemaStatementSchemaRefresher.java
index 837f4d91db2..93f24857c1e 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterSchemaStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterSchemaStatementSchemaRefresher.java
@@ -42,8 +42,6 @@ import java.util.Optional;
*/
public final class AlterSchemaStatementSchemaRefresher implements
MetaDataRefresher<AlterSchemaStatement> {
- private static final String TYPE = AlterSchemaStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -106,6 +104,6 @@ public final class AlterSchemaStatementSchemaRefresher
implements MetaDataRefres
@Override
public String getType() {
- return TYPE;
+ return AlterSchemaStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterTableStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterTableStatementSchemaRefresher.java
index 2d5a963b6cc..dfbd46682c5 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterTableStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterTableStatementSchemaRefresher.java
@@ -44,8 +44,6 @@ import java.util.Optional;
*/
public final class AlterTableStatementSchemaRefresher implements
MetaDataRefresher<AlterTableStatement> {
- private static final String TYPE = AlterTableStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -97,6 +95,6 @@ public final class AlterTableStatementSchemaRefresher
implements MetaDataRefresh
@Override
public String getType() {
- return TYPE;
+ return AlterTableStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterViewStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterViewStatementSchemaRefresher.java
index 7e6e1f8e327..b8439803643 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterViewStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/AlterViewStatementSchemaRefresher.java
@@ -46,8 +46,6 @@ import java.util.Optional;
*/
public final class AlterViewStatementSchemaRefresher implements
MetaDataRefresher<AlterViewStatement> {
- private static final String TYPE = AlterViewStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -100,6 +98,6 @@ public final class AlterViewStatementSchemaRefresher
implements MetaDataRefreshe
@Override
public String getType() {
- return TYPE;
+ return AlterViewStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateIndexStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateIndexStatementSchemaRefresher.java
index 860ebaec475..e724778d367 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateIndexStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateIndexStatementSchemaRefresher.java
@@ -39,8 +39,6 @@ import java.util.Optional;
*/
public final class CreateIndexStatementSchemaRefresher implements
MetaDataRefresher<CreateIndexStatement> {
- private static final String TYPE = CreateIndexStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -60,6 +58,6 @@ public final class CreateIndexStatementSchemaRefresher
implements MetaDataRefres
@Override
public String getType() {
- return TYPE;
+ return CreateIndexStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateSchemaStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateSchemaStatementSchemaRefresher.java
index c8624481fab..b60b787ba59 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateSchemaStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateSchemaStatementSchemaRefresher.java
@@ -42,8 +42,6 @@ import java.util.Optional;
*/
public final class CreateSchemaStatementSchemaRefresher implements
MetaDataRefresher<CreateSchemaStatement> {
- private static final String TYPE = CreateSchemaStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -63,6 +61,6 @@ public final class CreateSchemaStatementSchemaRefresher
implements MetaDataRefre
@Override
public String getType() {
- return TYPE;
+ return CreateSchemaStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateTableStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateTableStatementSchemaRefresher.java
index 7e98bddad15..4c5c5dc9646 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateTableStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateTableStatementSchemaRefresher.java
@@ -44,8 +44,6 @@ import java.util.Optional;
*/
public final class CreateTableStatementSchemaRefresher implements
MetaDataRefresher<CreateTableStatement> {
- private static final String TYPE = CreateTableStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -77,6 +75,6 @@ public final class CreateTableStatementSchemaRefresher
implements MetaDataRefres
@Override
public String getType() {
- return TYPE;
+ return CreateTableStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateViewStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateViewStatementSchemaRefresher.java
index f7913b2f2db..2398d7aa03f 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateViewStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/CreateViewStatementSchemaRefresher.java
@@ -44,8 +44,6 @@ import java.util.Optional;
*/
public final class CreateViewStatementSchemaRefresher implements
MetaDataRefresher<CreateViewStatement> {
- private static final String TYPE = CreateViewStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -77,6 +75,6 @@ public final class CreateViewStatementSchemaRefresher
implements MetaDataRefresh
@Override
public String getType() {
- return TYPE;
+ return CreateViewStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropIndexStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropIndexStatementSchemaRefresher.java
index 9fcf7f1ec0e..44d56e44290 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropIndexStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropIndexStatementSchemaRefresher.java
@@ -44,8 +44,6 @@ import java.util.Optional;
*/
public final class DropIndexStatementSchemaRefresher implements
MetaDataRefresher<DropIndexStatement> {
- private static final String TYPE = DropIndexStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -82,6 +80,6 @@ public final class DropIndexStatementSchemaRefresher
implements MetaDataRefreshe
@Override
public String getType() {
- return TYPE;
+ return DropIndexStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropSchemaStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropSchemaStatementSchemaRefresher.java
index 9f3008dcad0..f600132577f 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropSchemaStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropSchemaStatementSchemaRefresher.java
@@ -41,8 +41,6 @@ import java.util.Optional;
*/
public final class DropSchemaStatementSchemaRefresher implements
MetaDataRefresher<DropSchemaStatement> {
- private static final String TYPE = DropSchemaStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -80,6 +78,6 @@ public final class DropSchemaStatementSchemaRefresher
implements MetaDataRefresh
@Override
public String getType() {
- return TYPE;
+ return DropSchemaStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropTableStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropTableStatementSchemaRefresher.java
index 22fa97d367f..e889953e562 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropTableStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropTableStatementSchemaRefresher.java
@@ -39,8 +39,6 @@ import java.util.Optional;
*/
public final class DropTableStatementSchemaRefresher implements
MetaDataRefresher<DropTableStatement> {
- private static final String TYPE = DropTableStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -68,6 +66,6 @@ public final class DropTableStatementSchemaRefresher
implements MetaDataRefreshe
@Override
public String getType() {
- return TYPE;
+ return DropTableStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropViewStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropViewStatementSchemaRefresher.java
index 6f0624b4c75..f25e4e22458 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropViewStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/DropViewStatementSchemaRefresher.java
@@ -38,8 +38,6 @@ import java.util.Optional;
*/
public final class DropViewStatementSchemaRefresher implements
MetaDataRefresher<DropViewStatement> {
- private static final String TYPE = DropViewStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -65,6 +63,6 @@ public final class DropViewStatementSchemaRefresher
implements MetaDataRefresher
@Override
public String getType() {
- return TYPE;
+ return DropViewStatement.class.getName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresher.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresher.java
index cf2c796939b..0949c61494d 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresher.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/RenameTableStatementSchemaRefresher.java
@@ -45,8 +45,6 @@ import java.util.Optional;
*/
public final class RenameTableStatementSchemaRefresher implements
MetaDataRefresher<RenameTableStatement> {
- private static final String TYPE = RenameTableStatement.class.getName();
-
@Override
public Optional<MetaDataRefreshedEvent> refresh(final
ShardingSphereDatabase database, final FederationDatabaseMetaData
federationDatabaseMetaData,
final Map<String,
OptimizerPlannerContext> optimizerPlanners,
@@ -95,6 +93,6 @@ public final class RenameTableStatementSchemaRefresher
implements MetaDataRefres
@Override
public String getType() {
- return TYPE;
+ return RenameTableStatement.class.getName();
}
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
index c942972efd8..5720b6dd30c 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
@@ -107,13 +107,13 @@ public final class
ShardingSpherePipelineDataSourceConfiguration implements Pipe
}
@Override
- public String getType() {
- return TYPE;
+ public Object getDataSourceConfiguration() {
+ return rootConfig;
}
@Override
- public Object getDataSourceConfiguration() {
- return rootConfig;
+ public String getType() {
+ return TYPE;
}
/**
diff --git
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-api/src/test/java/org/apache/shardingsphere/traffic/fixture/TrafficLoadBalanceAlgorithmFixture.java
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-api/src/test/java/org/apache/shardingsphere/traffic/fixture/TrafficLoadBalanceAlgorithmFixture.java
index ce96b99ca50..8ae08ebd967 100644
---
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-api/src/test/java/org/apache/shardingsphere/traffic/fixture/TrafficLoadBalanceAlgorithmFixture.java
+++
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-api/src/test/java/org/apache/shardingsphere/traffic/fixture/TrafficLoadBalanceAlgorithmFixture.java
@@ -25,7 +25,9 @@ import java.util.Properties;
public final class TrafficLoadBalanceAlgorithmFixture implements
TrafficLoadBalanceAlgorithm {
- public static final String TYPE = "FIXTURE";
+ @Override
+ public void init(final Properties props) {
+ }
@Override
public Properties getProps() {
@@ -37,12 +39,8 @@ public final class TrafficLoadBalanceAlgorithmFixture
implements TrafficLoadBala
return null;
}
- @Override
- public void init(final Properties props) {
- }
-
@Override
public String getType() {
- return TYPE;
+ return "FIXTURE";
}
}
