This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1760143bea5 Unify variable name for ifPresent (#23699)
1760143bea5 is described below
commit 1760143bea55d2c4c794d8a8fd81750f5e3db69d
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 22 12:53:54 2023 +0800
Unify variable name for ifPresent (#23699)
* Remove useless param in ExecuteProcessEngine
* Refactor AdapterModeEnum and AdapterType
* Unify variable name for ifPresent
---
.../shardingsphere/infra/binder/segment/table/TablesContext.java | 2 +-
.../infra/binder/statement/dml/DeleteStatementContext.java | 2 +-
.../driver/jdbc/core/statement/ShardingSpherePreparedStatement.java | 2 +-
.../driver/jdbc/core/statement/ShardingSphereStatement.java | 4 ++--
.../core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java | 2 +-
.../pipeline/core/execute/ShardingSphereDataScheduleCollector.java | 4 ++--
.../data/pipeline/core/metadata/generator/PipelineDDLGenerator.java | 2 +-
.../org/apache/shardingsphere/mode/metadata/MetaDataContexts.java | 2 +-
.../sql/parser/sql/common/extractor/TableExtractor.java | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/table/TablesContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/table/TablesContext.java
index a759e4f3e7d..80cb971f168 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/table/TablesContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/table/TablesContext.java
@@ -79,7 +79,7 @@ public final class TablesContext {
SimpleTableSegment simpleTableSegment = (SimpleTableSegment)
each;
tables.add(simpleTableSegment);
tableNames.add(simpleTableSegment.getTableName().getIdentifier().getValue());
- simpleTableSegment.getOwner().ifPresent(owner ->
schemaNames.add(owner.getIdentifier().getValue()));
+ simpleTableSegment.getOwner().ifPresent(optional ->
schemaNames.add(optional.getIdentifier().getValue()));
findDatabaseName(simpleTableSegment,
databaseType).ifPresent(databaseNames::add);
}
if (each instanceof SubqueryTableSegment) {
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContext.java
index 4252cdb0fdd..6953b8c00c4 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContext.java
@@ -62,7 +62,7 @@ public final class DeleteStatementContext extends
CommonSQLStatementContext<Dele
private Collection<SimpleTableSegment> filterAliasDeleteTable(final
Collection<SimpleTableSegment> tableSegments) {
Map<String, SimpleTableSegment> aliasTableSegmentMap = new
HashMap<>(tableSegments.size(), 1f);
for (SimpleTableSegment each : tableSegments) {
- each.getAlias().ifPresent(alias ->
aliasTableSegmentMap.putIfAbsent(alias, each));
+ each.getAlias().ifPresent(optional ->
aliasTableSegmentMap.putIfAbsent(optional, each));
}
Collection<SimpleTableSegment> result = new LinkedList<>();
for (SimpleTableSegment each : tableSegments) {
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 4ddef94167b..b4581757752 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -551,7 +551,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
connection.getDatabaseName(),
metaDataContexts.getMetaData().getDatabases(), null);
ExecutionContext result =
kernelProcessor.generateExecutionContext(queryContext,
metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()),
metaDataContexts.getMetaData().getGlobalRuleMetaData(),
metaDataContexts.getMetaData().getProps(), connection.getConnectionContext());
- findGeneratedKey(result).ifPresent(generatedKey ->
generatedValues.addAll(generatedKey.getGeneratedValues()));
+ findGeneratedKey(result).ifPresent(optional ->
generatedValues.addAll(optional.getGeneratedValues()));
return result;
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 76c2a898167..bbbbcf988dc 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -484,8 +484,8 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
return;
}
if (sqlStatementContext instanceof TableAvailable) {
- ((TableAvailable)
sqlStatementContext).getTablesContext().getDatabaseName().ifPresent(databaseName
-> {
- if (!databaseName.equals(connectionDatabaseName)) {
+ ((TableAvailable)
sqlStatementContext).getTablesContext().getDatabaseName().ifPresent(optional ->
{
+ if (!optional.equals(connectionDatabaseName)) {
throw new JDBCTransactionAcrossDatabasesException();
}
});
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java
index 08c44b08593..e85cdc1fa9a 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractInventoryIncrementalJobAPIImpl.java
@@ -98,7 +98,7 @@ public abstract class AbstractInventoryIncrementalJobAPIImpl
extends AbstractPip
JobConfigurationPOJO jobConfigPOJO = getElasticJobConfigPOJO(jobId);
return IntStream.range(0,
jobConfig.getJobShardingCount()).boxed().collect(LinkedHashMap::new, (map,
each) -> {
Optional<InventoryIncrementalJobItemProgress> jobItemProgress =
getJobItemProgress(jobId, each);
- jobItemProgress.ifPresent(progress ->
progress.setActive(!jobConfigPOJO.isDisabled()));
+ jobItemProgress.ifPresent(optional ->
optional.setActive(!jobConfigPOJO.isDisabled()));
map.put(each, jobItemProgress.orElse(null));
}, LinkedHashMap::putAll);
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
index c6c958472f0..7b57425feba 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataScheduleCollector.java
@@ -112,8 +112,8 @@ public final class ShardingSphereDataScheduleCollector {
} catch (final SQLException ex) {
log.error("Collect data failed!", ex);
}
- tableData.ifPresent(shardingSphereTableData ->
changedShardingSphereData.getDatabaseData().computeIfAbsent(databaseName.toLowerCase(),
key -> new ShardingSphereDatabaseData())
- .getSchemaData().computeIfAbsent(schemaName, key -> new
ShardingSphereSchemaData()).getTableData().put(table.getName().toLowerCase(),
shardingSphereTableData));
+ tableData.ifPresent(optional ->
changedShardingSphereData.getDatabaseData().computeIfAbsent(databaseName.toLowerCase(),
key -> new ShardingSphereDatabaseData())
+ .getSchemaData().computeIfAbsent(schemaName, key -> new
ShardingSphereSchemaData()).getTableData().put(table.getName().toLowerCase(),
optional));
}
private void compareUpdateAndSendEvent(final ShardingSphereData
shardingSphereData, final ShardingSphereData changedShardingSphereData, final
Map<String, ShardingSphereDatabase> databases) {
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
index 2d20bcbfad4..c30cce1fba1 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
@@ -77,7 +77,7 @@ public final class PipelineDDLGenerator {
StringBuilder result = new StringBuilder();
for (String each :
TypedSPIRegistry.getRegisteredService(CreateTableSQLGenerator.class,
databaseType.getType()).generate(sourceDataSource, schemaName,
sourceTableName)) {
Optional<String> queryContext = decorate(databaseType,
sourceDataSource, schemaName, targetTableName, parserEngine, each);
- queryContext.ifPresent(ddlSQL ->
result.append(ddlSQL).append(DELIMITER).append(System.lineSeparator()));
+ queryContext.ifPresent(optional ->
result.append(optional).append(DELIMITER).append(System.lineSeparator()));
}
log.info("generateLogicDDL, databaseType={}, schemaName={},
sourceTableName={}, targetTableName={}, cost {} ms",
databaseType.getType(), schemaName, sourceTableName,
targetTableName, System.currentTimeMillis() - startTimeMillis);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index 13c730276e3..cdca2631bd1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -61,7 +61,7 @@ public final class MetaDataContexts implements AutoCloseable {
.orElseGet(ShardingSphereData::new);
Optional<ShardingSphereData> loadedShardingSphereData =
Optional.ofNullable(persistService.getShardingSphereDataPersistService())
.flatMap(shardingSphereDataPersistService ->
shardingSphereDataPersistService.load(metaData));
- loadedShardingSphereData.ifPresent(sphereData ->
useLoadedToReplaceInit(result, sphereData));
+ loadedShardingSphereData.ifPresent(optional ->
useLoadedToReplaceInit(result, optional));
return result;
}
diff --git
a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
index 534b2ee5e92..62082b3c077 100644
---
a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
+++
b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
@@ -225,7 +225,7 @@ public final class TableExtractor {
extractTablesFromExpression(each);
}
}
-
InsertStatementHandler.getOnDuplicateKeyColumnsSegment(insertStatement).ifPresent(each
-> extractTablesFromAssignmentItems(each.getColumns()));
+
InsertStatementHandler.getOnDuplicateKeyColumnsSegment(insertStatement).ifPresent(optional
-> extractTablesFromAssignmentItems(optional.getColumns()));
if (insertStatement.getInsertSelect().isPresent()) {
extractTablesFromSelect(insertStatement.getInsertSelect().get().getSelect());
}
