This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a2e32a49a11 Refactor for code format (#26645)
a2e32a49a11 is described below
commit a2e32a49a113a2870828dc1dfd32fb36f57b112f
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 28 01:00:53 2023 +0800
Refactor for code format (#26645)
---
.../token/generator/EncryptPredicateRightValueTokenGenerator.java | 3 +--
.../org/apache/shardingsphere/sharding/auditor/ShardingSQLAuditor.java | 2 +-
.../shardingsphere/data/pipeline/core/job/AbstractPipelineJob.java | 2 +-
.../shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java | 2 +-
.../backend/hbase/checker/HeterogeneousSelectStatementChecker.java | 2 +-
.../src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
index 81b058db0e8..1f07925f47c 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
@@ -78,8 +78,7 @@ public final class EncryptPredicateRightValueTokenGenerator
Collection<SQLToken> result = new LinkedHashSet<>();
String schemaName =
sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() ->
DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(),
databaseName));
for (EncryptCondition each : encryptConditions) {
- Optional<EncryptTable> encryptTable =
encryptRule.findEncryptTable(each.getTableName());
- encryptTable.ifPresent(table ->
result.add(generateSQLToken(schemaName, table, each)));
+
encryptRule.findEncryptTable(each.getTableName()).ifPresent(optional ->
result.add(generateSQLToken(schemaName, optional, each)));
}
return result;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/auditor/ShardingSQLAuditor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/auditor/ShardingSQLAuditor.java
index 2467be2ecca..c8f70755041 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/auditor/ShardingSQLAuditor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/auditor/ShardingSQLAuditor.java
@@ -57,7 +57,7 @@ public final class ShardingSQLAuditor implements
SQLAuditor<ShardingRule> {
Collection<String> tableNames =
sqlStatementContext.getTablesContext().getTableNames();
Collection<ShardingAuditStrategyConfiguration> result = new
ArrayList<>(tableNames.size());
for (String each : tableNames) {
- rule.findTableRule(each).ifPresent(tableRule ->
result.add(rule.getAuditStrategyConfiguration(tableRule)));
+ rule.findTableRule(each).ifPresent(optional ->
result.add(rule.getAuditStrategyConfiguration(optional)));
}
return result;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJob.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJob.java
index d760f1f8cbd..d0ff42f4373 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJob.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJob.java
@@ -153,7 +153,7 @@ public abstract class AbstractPipelineJob implements
PipelineJob {
each.stop();
}
Optional<ElasticJobListener> pipelineJobListener =
ElasticJobServiceLoader.getCachedTypedServiceInstance(ElasticJobListener.class,
PipelineElasticJobListener.class.getName());
- pipelineJobListener.ifPresent(jobListener ->
awaitJobStopped((PipelineElasticJobListener) jobListener, jobId,
TimeUnit.SECONDS.toMillis(2)));
+ pipelineJobListener.ifPresent(optional ->
awaitJobStopped((PipelineElasticJobListener) optional, jobId,
TimeUnit.SECONDS.toMillis(2)));
if (null != jobBootstrap.get()) {
jobBootstrap.get().shutdown();
}
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
index ad3f1b24177..9ac1956ee6c 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
@@ -83,7 +83,7 @@ public final class CDCSchemaTableUtils {
for (Entry<String, ShardingSphereSchema> entry :
database.getSchemas().entrySet()) {
if (!systemSchemas.contains(entry.getKey())) {
entry.getValue().getAllTableNames().stream().filter(tableName
-> tableName.equals(table.getTable())).findFirst()
- .ifPresent(tableName ->
result.computeIfAbsent(entry.getKey(), ignored -> new
HashSet<>()).add(tableName));
+ .ifPresent(optional ->
result.computeIfAbsent(entry.getKey(), ignored -> new
HashSet<>()).add(optional));
}
}
return result;
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/checker/HeterogeneousSelectStatementChecker.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/checker/HeterogeneousSelectStatementChecker.java
index 57ccb500084..75cbf311744 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/checker/HeterogeneousSelectStatementChecker.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/checker/HeterogeneousSelectStatementChecker.java
@@ -73,7 +73,7 @@ public final class HeterogeneousSelectStatementChecker
extends CommonHeterogeneo
Preconditions.checkArgument(!limitSegment.get().getOffset().isPresent(), "Do
not supported offset segment.");
Optional<PaginationValueSegment> paginationSegment =
selectStatement.getLimit().flatMap(LimitSegment::getRowCount);
Long maxScanLimitSize =
HBaseContext.getInstance().getProps().<Long>getValue(HBasePropertyKey.MAX_SCAN_LIMIT_SIZE);
- paginationSegment.ifPresent(valueSegment ->
Preconditions.checkArgument(((NumberLiteralLimitValueSegment)
valueSegment).getValue() <= maxScanLimitSize, "Row count must less than
5000."));
+ paginationSegment.ifPresent(optional ->
Preconditions.checkArgument(((NumberLiteralLimitValueSegment)
optional).getValue() <= maxScanLimitSize, "Row count must less than 5000."));
}
}
diff --git
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
index 38b67e1ef0b..0604d7675a0 100644
---
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
+++
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
@@ -54,7 +54,7 @@ public final class Bootstrap {
List<String> addresses = bootstrapArgs.getAddresses();
new BootstrapInitializer().init(yamlConfig, port,
bootstrapArgs.isForce());
Optional.ofNullable((Integer)
yamlConfig.getServerConfiguration().getProps().get(ConfigurationPropertyKey.CDC_SERVER_PORT.getKey()))
- .ifPresent(cdcPort -> new CDCServer(addresses,
cdcPort).start());
+ .ifPresent(optional -> new CDCServer(addresses,
optional).start());
ProxySSLContext.init();
ShardingSphereProxy shardingSphereProxy = new ShardingSphereProxy();
bootstrapArgs.getSocketPath().ifPresent(shardingSphereProxy::start);
