This is an automated email from the ASF dual-hosted git repository.
panjuan 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 447ae9185dd Remove useless final in for each statements (#28271)
447ae9185dd is described below
commit 447ae9185ddc03c8a165e9485feb6ce6a326f7cc
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 27 15:54:55 2023 +0800
Remove useless final in for each statements (#28271)
---
.../encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java | 2 +-
.../org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java | 2 +-
.../handler/query/ShowShardingTableReferenceRuleExecutor.java | 2 +-
.../shardingsphere/single/datanode/SingleTableDataNodeLoader.java | 2 +-
.../handler/distsql/ral/updatable/ImportMetaDataUpdater.java | 2 +-
.../shardingsphere/test/e2e/env/DataSetEnvironmentManager.java | 6 +++---
.../parser/internal/asserts/statement/comment/CommentAssert.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
index 87914d10412..b8313c24810 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
@@ -85,7 +85,7 @@ class EncryptTokenGenerateBuilderTest {
private Field findField(final Class<?> clazz, final String fieldName,
final Class<?> fieldType) {
Class<?> searchClass = clazz;
while (null != searchClass && !Object.class.equals(searchClass)) {
- for (final Field each : searchClass.getDeclaredFields()) {
+ for (Field each : searchClass.getDeclaredFields()) {
if (fieldName.equals(each.getName()) &&
fieldType.equals(each.getType())) {
return each;
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index a4889b2c5a2..a75c4e5b115 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -759,7 +759,7 @@ class ShardingRuleTest {
private void assertGetDataNodes(final Collection<DataNode> dataNodes,
final String tableNamePrefix) {
int dataSourceNameSuffix = 0;
int tableNameSuffix = 0;
- for (final DataNode each : dataNodes) {
+ for (DataNode each : dataNodes) {
assertThat(each.getDataSourceName(), is("ds_" +
dataSourceNameSuffix));
assertThat(each.getTableName(), is(tableNamePrefix +
tableNameSuffix));
if (++tableNameSuffix == (dataNodes.size() / 2)) {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
index de239d3fae6..12e35a2a413 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
@@ -43,7 +43,7 @@ public final class ShowShardingTableReferenceRuleExecutor
implements RQLExecutor
return Collections.emptyList();
}
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- for (final ShardingTableReferenceRuleConfiguration referenceRule :
((ShardingRuleConfiguration)
rule.get().getConfiguration()).getBindingTableGroups()) {
+ for (ShardingTableReferenceRuleConfiguration referenceRule :
((ShardingRuleConfiguration)
rule.get().getConfiguration()).getBindingTableGroups()) {
if (null == sqlStatement.getRuleName() ||
referenceRule.getName().equalsIgnoreCase(sqlStatement.getRuleName())) {
result.add(new
LocalDataQueryResultRow(referenceRule.getName(), referenceRule.getReference()));
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
index 4b4c75bdc5e..b32e7275d7f 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
@@ -127,7 +127,7 @@ public final class SingleTableDataNodeLoader {
private static Collection<DataNode> loadSpecifiedDataNode(final
Collection<DataNode> dataNodes, final Collection<String>
featureRequiredSingleTables,
final
Map<String, Map<String, Collection<String>>> configuredTableMap) {
- for (final DataNode each : dataNodes) {
+ for (DataNode each : dataNodes) {
if (featureRequiredSingleTables.contains(each.getTableName())) {
return getSingleDataNodeCollection(each);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
index 30370d3eda8..3dc8526d89f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
@@ -78,7 +78,7 @@ public final class ImportMetaDataUpdater implements
RALUpdater<ImportMetaDataSta
}
private void importDatabase(final ExportedMetaData exportedMetaData) {
- for (final String each : exportedMetaData.getDatabases().values()) {
+ for (String each : exportedMetaData.getDatabases().values()) {
YamlProxyDatabaseConfiguration yamlDatabaseConfig =
YamlEngine.unmarshal(each, YamlProxyDatabaseConfiguration.class);
databaseConfigImportExecutor.importDatabaseConfiguration(yamlDatabaseConfig);
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index bde8b7a3987..7db3b79bf13 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -98,7 +98,7 @@ public final class DataSetEnvironmentManager {
fillDataTasks.add(new
InsertTask(dataSourceMap.get(dataNode.getDataSourceName()), insertSQL,
sqlValueGroups));
}
final List<Future<Void>> futures =
EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(fillDataTasks);
- for (final Future<Void> future : futures) {
+ for (Future<Void> future : futures) {
future.get();
}
}
@@ -146,8 +146,8 @@ public final class DataSetEnvironmentManager {
for (Entry<String, Collection<String>> entry :
getDataNodeMap().entrySet()) {
deleteTasks.add(new DeleteTask(dataSourceMap.get(entry.getKey()),
entry.getValue()));
}
- final List<Future<Void>> futures =
EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(deleteTasks);
- for (final Future<Void> future : futures) {
+ List<Future<Void>> futures =
EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(deleteTasks);
+ for (Future<Void> future : futures) {
future.get();
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
index 645fbd305f6..9bd7d9aeef3 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
@@ -63,7 +63,7 @@ public final class CommentAssert {
assertTrue(actual instanceof AbstractSQLStatement,
assertContext.getText("Comment should exist."));
assertThat(assertContext.getText("Comments size assertion error: "),
((AbstractSQLStatement) actual).getCommentSegments().size(),
is(expected.getComments().size()));
Iterator<CommentSegment> actualIterator = ((AbstractSQLStatement)
actual).getCommentSegments().iterator();
- for (final ExpectedComment each : expected.getComments()) {
+ for (ExpectedComment each : expected.getComments()) {
assertThat(assertContext.getText("Comments assertion error: "),
actualIterator.next().getText(), is(each.getText()));
}
}
