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 6df56965f5d Add final on parameters for default methods (#29564)
6df56965f5d is described below
commit 6df56965f5dd81c25efdd63561720b9b5fdf7366
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Dec 27 15:07:54 2023 +0800
Add final on parameters for default methods (#29564)
* Refactor AuthorityRuleTest
* Add final on parameters for default methods
---
.../shardingsphere/infra/instance/mode/ModeContextManager.java | 8 ++++----
.../core/metadata/database/DialectDatabaseMetaData.java | 2 +-
.../distsql/handler/ral/query/QueryableRALExecutor.java | 2 +-
.../shardingsphere/distsql/handler/ral/update/RALUpdater.java | 2 +-
.../apache/shardingsphere/distsql/handler/rul/RULExecutor.java | 2 +-
.../distsql/handler/update/RuleDefinitionAlterUpdater.java | 2 +-
.../distsql/handler/update/RuleDefinitionDropUpdater.java | 10 +++++-----
.../apache/shardingsphere/infra/spi/type/typed/TypedSPI.java | 2 +-
.../core/ingest/position/DialectIngestPositionManager.java | 2 +-
.../config/processor/JobConfigurationChangedProcessor.java | 2 +-
.../core/sqlbuilder/dialect/DialectPipelineSQLBuilder.java | 8 ++++----
.../service/config/database/DatabaseBasedPersistService.java | 8 ++++----
.../persist/service/config/global/GlobalPersistService.java | 2 +-
.../transaction/spi/ShardingSphereTransactionManager.java | 2 +-
.../executor/sysvar/MySQLSystemVariableValueProvider.java | 2 +-
.../proxy/frontend/command/CommandExecuteEngine.java | 2 +-
.../proxy/frontend/spi/DatabaseProtocolFrontendEngine.java | 2 +-
17 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
index c1ed3fc7ac6..05391d8b302 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
@@ -119,7 +119,7 @@ public interface ModeContextManager {
* @param toBeAlteredRuleConfig to be altered rule config
* @return meta data versions
*/
- default Collection<MetaDataVersion> alterRuleConfiguration(String
databaseName, RuleConfiguration toBeAlteredRuleConfig) {
+ default Collection<MetaDataVersion> alterRuleConfiguration(final String
databaseName, final RuleConfiguration toBeAlteredRuleConfig) {
return Collections.emptyList();
}
@@ -129,7 +129,7 @@ public interface ModeContextManager {
* @param databaseName database name
* @param toBeRemovedRuleConfig to be removed rule config
*/
- default void removeRuleConfigurationItem(String databaseName,
RuleConfiguration toBeRemovedRuleConfig) {
+ default void removeRuleConfigurationItem(final String databaseName, final
RuleConfiguration toBeRemovedRuleConfig) {
}
/**
@@ -138,7 +138,7 @@ public interface ModeContextManager {
* @param databaseName database name
* @param ruleName rule name
*/
- default void removeRuleConfiguration(String databaseName, String ruleName)
{
+ default void removeRuleConfiguration(final String databaseName, final
String ruleName) {
}
/**
@@ -154,7 +154,7 @@ public interface ModeContextManager {
*
* @param globalRuleConfig global rule config
*/
- default void alterGlobalRuleConfiguration(RuleConfiguration
globalRuleConfig) {
+ default void alterGlobalRuleConfiguration(final RuleConfiguration
globalRuleConfig) {
}
/**
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
index 4ec732cd5a7..4ac01ef64c0 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
@@ -65,7 +65,7 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
* @return is reserved word or not
*/
// TODO Reuse java.sql.DatabaseMetaData.getSQLKeywords
- default boolean isReservedWord(String identifier) {
+ default boolean isReservedWord(final String identifier) {
return false;
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
index 208d8fa2012..0460373aeee 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
@@ -46,7 +46,7 @@ public interface QueryableRALExecutor<T extends
QueryableRALStatement> extends T
* @param sqlStatement SQL statement
* @return query result rows
*/
- default Collection<LocalDataQueryResultRow> getRows(T sqlStatement) {
+ default Collection<LocalDataQueryResultRow> getRows(final T sqlStatement) {
return Collections.emptyList();
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
index eaf641309a8..88502e37490 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
@@ -38,7 +38,7 @@ public interface RALUpdater<T extends SQLStatement> extends
TypedSPI {
* @param sqlStatement updatable RAL statement
* @throws SQLException SQL exception
*/
- default void executeUpdate(String databaseName, T sqlStatement) throws
SQLException {
+ default void executeUpdate(final String databaseName, final T
sqlStatement) throws SQLException {
}
@Override
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
index 1260cae6b7e..031a837a596 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
@@ -46,7 +46,7 @@ public interface RULExecutor<T extends RULStatement> extends
TypedSPI {
* @param sqlStatement SQL statement
* @return query result rows
*/
- default Collection<LocalDataQueryResultRow> getRows(T sqlStatement) {
+ default Collection<LocalDataQueryResultRow> getRows(final T sqlStatement) {
return Collections.emptyList();
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
index 51b02475e17..3620d5ffab3 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
@@ -44,7 +44,7 @@ public interface RuleDefinitionAlterUpdater<T extends
SQLStatement, R extends Ru
* @param toBeAlteredRuleConfig new rule configuration to be renewed
* @return to be dropped rule configuration
*/
- default R buildToBeDroppedRuleConfiguration(R currentRuleConfig, R
toBeAlteredRuleConfig) {
+ default R buildToBeDroppedRuleConfiguration(final R currentRuleConfig,
final R toBeAlteredRuleConfig) {
return null;
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
index bf848d87f02..054143471b7 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
@@ -39,7 +39,7 @@ public interface RuleDefinitionDropUpdater<T extends
SQLStatement, R extends Rul
* @param sqlStatement SQL statement
* @return to be dropped rule configuration
*/
- default R buildToBeDroppedRuleConfiguration(R currentRuleConfig, T
sqlStatement) {
+ default R buildToBeDroppedRuleConfiguration(final R currentRuleConfig,
final T sqlStatement) {
return null;
}
@@ -50,7 +50,7 @@ public interface RuleDefinitionDropUpdater<T extends
SQLStatement, R extends Rul
* @param sqlStatement SQL statement
* @return to be altered rule configuration
*/
- default R buildToBeAlteredRuleConfiguration(R currentRuleConfig, T
sqlStatement) {
+ default R buildToBeAlteredRuleConfiguration(final R currentRuleConfig,
final T sqlStatement) {
return null;
}
@@ -70,7 +70,7 @@ public interface RuleDefinitionDropUpdater<T extends
SQLStatement, R extends Rul
* @param currentRuleConfig current rule configuration
* @return configuration exists or does not exist
*/
- default boolean isExistRuleConfig(R currentRuleConfig) {
+ default boolean isExistRuleConfig(final R currentRuleConfig) {
return null != currentRuleConfig;
}
@@ -81,7 +81,7 @@ public interface RuleDefinitionDropUpdater<T extends
SQLStatement, R extends Rul
* @param currentRuleConfig current rule configuration
* @return dropped data exists or does not exist
*/
- default boolean hasAnyOneToBeDropped(T sqlStatement, R currentRuleConfig) {
+ default boolean hasAnyOneToBeDropped(final T sqlStatement, final R
currentRuleConfig) {
return true;
}
@@ -92,7 +92,7 @@ public interface RuleDefinitionDropUpdater<T extends
SQLStatement, R extends Rul
* @param toBeDroppedRules collection
* @return identical data
*/
- default Collection<String> getIdenticalData(Collection<String>
currentRules, Collection<String> toBeDroppedRules) {
+ default Collection<String> getIdenticalData(final Collection<String>
currentRules, final Collection<String> toBeDroppedRules) {
return currentRules.stream().filter(each ->
toBeDroppedRules.stream().anyMatch(each::equalsIgnoreCase)).collect(Collectors.toSet());
}
}
diff --git
a/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPI.java
b/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPI.java
index a306505b101..c1fce252471 100644
---
a/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPI.java
+++
b/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPI.java
@@ -31,7 +31,7 @@ public interface TypedSPI {
*
* @param props properties to be initialized
*/
- default void init(Properties props) {
+ default void init(final Properties props) {
}
/**
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/DialectIngestPositionManager.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/DialectIngestPositionManager.java
index fa4d0cfe40c..02210c7ebdd 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/DialectIngestPositionManager.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/DialectIngestPositionManager.java
@@ -54,6 +54,6 @@ public interface DialectIngestPositionManager extends
DatabaseTypedSPI {
* @param slotNameSuffix slot name suffix
* @throws SQLException SQL exception
*/
- default void destroy(DataSource dataSource, final String slotNameSuffix)
throws SQLException {
+ default void destroy(final DataSource dataSource, final String
slotNameSuffix) throws SQLException {
}
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/config/processor/JobConfigurationChangedProcessor.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/config/processor/JobConfigurationChangedProcessor.java
index 88b3253cef3..75ef340e7c0 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/config/processor/JobConfigurationChangedProcessor.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/config/processor/JobConfigurationChangedProcessor.java
@@ -42,7 +42,7 @@ public interface JobConfigurationChangedProcessor<T extends
PipelineJobConfigura
*
* @param jobConfig pipeline job configuration
*/
- default void clean(JobConfiguration jobConfig) {
+ default void clean(final JobConfiguration jobConfig) {
}
@Override
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/dialect/DialectPipelineSQLBuilder.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/dialect/DialectPipelineSQLBuilder.java
index cd85a842edc..c9716a717cb 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/dialect/DialectPipelineSQLBuilder.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/dialect/DialectPipelineSQLBuilder.java
@@ -36,7 +36,7 @@ public interface DialectPipelineSQLBuilder extends
DatabaseTypedSPI {
* @param schemaName schema name
* @return built SQL
*/
- default Optional<String> buildCreateSchemaSQL(String schemaName) {
+ default Optional<String> buildCreateSchemaSQL(final String schemaName) {
return Optional.empty();
}
@@ -46,7 +46,7 @@ public interface DialectPipelineSQLBuilder extends
DatabaseTypedSPI {
* @param dataRecord data record
* @return built SQL clause
*/
- default Optional<String> buildInsertOnDuplicateClause(DataRecord
dataRecord) {
+ default Optional<String> buildInsertOnDuplicateClause(final DataRecord
dataRecord) {
return Optional.empty();
}
@@ -64,7 +64,7 @@ public interface DialectPipelineSQLBuilder extends
DatabaseTypedSPI {
* @param qualifiedTableName qualified table name
* @return built SQL
*/
- default Optional<String> buildEstimatedCountSQL(String qualifiedTableName)
{
+ default Optional<String> buildEstimatedCountSQL(final String
qualifiedTableName) {
return Optional.empty();
}
@@ -75,7 +75,7 @@ public interface DialectPipelineSQLBuilder extends
DatabaseTypedSPI {
* @param columnName column name
* @return built SQL
*/
- default Optional<String> buildCRC32SQL(String qualifiedTableName, final
String columnName) {
+ default Optional<String> buildCRC32SQL(final String qualifiedTableName,
final String columnName) {
return Optional.empty();
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
index 82a6ebba11a..a7aa980cf96 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
@@ -54,7 +54,7 @@ public interface DatabaseBasedPersistService<T> {
* @param name name
* @return configurations
*/
- default T load(String databaseName, String name) {
+ default T load(final String databaseName, final String name) {
return null;
}
@@ -64,7 +64,7 @@ public interface DatabaseBasedPersistService<T> {
* @param databaseName database name
* @param ruleName rule name
*/
- default void delete(String databaseName, String ruleName) {
+ default void delete(final String databaseName, final String ruleName) {
}
/**
@@ -74,7 +74,7 @@ public interface DatabaseBasedPersistService<T> {
* @param configs configurations
* @return meta data versions
*/
- default Collection<MetaDataVersion> deleteConfig(String databaseName, T
configs) {
+ default Collection<MetaDataVersion> deleteConfig(final String
databaseName, final T configs) {
return Collections.emptyList();
}
@@ -85,7 +85,7 @@ public interface DatabaseBasedPersistService<T> {
* @param configs configurations
* @return meta data versions
*/
- default Collection<MetaDataVersion> persistConfig(String databaseName, T
configs) {
+ default Collection<MetaDataVersion> persistConfig(final String
databaseName, final T configs) {
return Collections.emptyList();
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
index 8b543b77a4e..858bf14445c 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
@@ -59,7 +59,7 @@ public interface GlobalPersistService<T> {
* @param ruleName rule name
* @return single rule configuration
*/
- default RuleConfiguration load(String ruleName) {
+ default RuleConfiguration load(final String ruleName) {
return null;
}
diff --git
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
index 69b10d5b0ea..1f56713c173 100644
---
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
+++
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
@@ -94,7 +94,7 @@ public interface ShardingSphereTransactionManager extends
TypedSPI, AutoCloseabl
* @param providerType transaction manager provider type
* @return contains provider type or not
*/
- default boolean containsProviderType(String providerType) {
+ default boolean containsProviderType(final String providerType) {
return true;
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/MySQLSystemVariableValueProvider.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/MySQLSystemVariableValueProvider.java
index 73ca2f8b1e6..cef7e8c8006 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/MySQLSystemVariableValueProvider.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/sysvar/MySQLSystemVariableValueProvider.java
@@ -35,7 +35,7 @@ public interface MySQLSystemVariableValueProvider {
* @param variable variable
* @return value of variable
*/
- default String get(Scope scope, ConnectionSession connectionSession,
MySQLSystemVariable variable) {
+ default String get(final Scope scope, final ConnectionSession
connectionSession, final MySQLSystemVariable variable) {
return variable.getDefaultValue();
}
}
diff --git
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
index 1fe00f25b07..bff908eb26a 100644
---
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
+++
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
@@ -78,7 +78,7 @@ public interface CommandExecuteEngine {
* @param connectionSession connection session
* @return other packet
*/
- default Optional<DatabasePacket> getOtherPacket(ConnectionSession
connectionSession) {
+ default Optional<DatabasePacket> getOtherPacket(final ConnectionSession
connectionSession) {
return Optional.empty();
}
diff --git
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
index 69dd7588e5f..41f09ee69dd 100644
---
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
+++
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
@@ -34,7 +34,7 @@ public interface DatabaseProtocolFrontendEngine extends
DatabaseTypedSPI {
*
* @param channel channel
*/
- default void initChannel(Channel channel) {
+ default void initChannel(final Channel channel) {
}
/**
