This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 789d4162420 Minor adjust to code style (#16884)
789d4162420 is described below
commit 789d41624204729fa512d8b668b00bbfa04a4ff1
Author: Guocheng Tang <[email protected]>
AuthorDate: Sun Apr 17 19:48:56 2022 +0800
Minor adjust to code style (#16884)
* Minor adjust to code style
* fix checkstyle
---
.../binder/segment/select/projection/engine/ProjectionEngine.java | 2 +-
.../infra/binder/statement/ddl/AlterIndexStatementContext.java | 2 +-
.../infra/binder/statement/ddl/CreateFunctionStatementContext.java | 2 +-
.../infra/binder/statement/ddl/CreateIndexStatementContext.java | 2 +-
.../infra/binder/statement/ddl/CreateProcedureStatementContext.java | 2 +-
.../infra/binder/statement/ddl/DropIndexStatementContext.java | 2 +-
.../shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java | 2 +-
.../registry/workerid/generator/ClusterWorkerIdGenerator.java | 2 +-
.../shardingsphere/mode/repository/standalone/file/FileRepository.java | 3 ++-
9 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
index 767350a74fe..a751f62ea2f 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionEngine.java
@@ -127,7 +127,7 @@ public final class ProjectionEngine {
private AggregationDistinctProjection createProjection(final
AggregationDistinctProjectionSegment projectionSegment) {
String innerExpression = projectionSegment.getInnerExpression();
- String alias =
projectionSegment.getAlias().orElse(DerivedColumn.AGGREGATION_DISTINCT_DERIVED.getDerivedColumnAlias(aggregationDistinctDerivedColumnCount++));
+ String alias = projectionSegment.getAlias().orElseGet(() ->
DerivedColumn.AGGREGATION_DISTINCT_DERIVED.getDerivedColumnAlias(aggregationDistinctDerivedColumnCount++));
AggregationDistinctProjection result = new
AggregationDistinctProjection(
projectionSegment.getStartIndex(),
projectionSegment.getStopIndex(), projectionSegment.getType(), innerExpression,
alias, projectionSegment.getDistinctExpression(), databaseType);
if (AggregationType.AVG == result.getType()) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
index 282eeea2005..2b7c0286f8c 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
@@ -49,7 +49,7 @@ public final class AlterIndexStatementContext extends
CommonSQLStatementContext<
@Override
public Collection<SimpleTableSegment> getAllTables() {
Optional<SimpleTableSegment> simpleTableSegment =
AlterIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
- return
simpleTableSegment.map(Collections::singletonList).orElse(Collections.emptyList());
+ return
simpleTableSegment.map(Collections::singletonList).orElseGet(Collections::emptyList);
}
@Override
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateFunctionStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateFunctionStatementContext.java
index f174cf2b4b4..e57bcaa9015 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateFunctionStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateFunctionStatementContext.java
@@ -41,7 +41,7 @@ public final class CreateFunctionStatementContext extends
CommonSQLStatementCont
public CreateFunctionStatementContext(final CreateFunctionStatement
sqlStatement) {
super(sqlStatement);
Optional<RoutineBodySegment> routineBodySegment =
CreateFunctionStatementHandler.getRoutineBodySegment(sqlStatement);
- Collection<SimpleTableSegment> tables =
routineBodySegment.map(bodySegment -> new
TableExtractor().extractExistTableFromRoutineBody(bodySegment)).orElse(Collections.emptyList());
+ Collection<SimpleTableSegment> tables =
routineBodySegment.map(bodySegment -> new
TableExtractor().extractExistTableFromRoutineBody(bodySegment)).orElseGet(Collections::emptyList);
tablesContext = new TablesContext(tables, getDatabaseType());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
index 882157db92d..5018e27352d 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
@@ -59,6 +59,6 @@ public final class CreateIndexStatementContext extends
CommonSQLStatementContext
return Collections.singletonList(getSqlStatement().getIndex());
}
return
CreateIndexStatementHandler.getGeneratedIndexStartIndex(getSqlStatement()).map(each
-> Collections.singletonList(new IndexSegment(each, each,
- new
IdentifierValue(IndexMetaDataUtil.getGeneratedLogicIndexName(getSqlStatement().getColumns()))))).orElse(Collections.emptyList());
+ new
IdentifierValue(IndexMetaDataUtil.getGeneratedLogicIndexName(getSqlStatement().getColumns()))))).orElseGet(Collections::emptyList);
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateProcedureStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateProcedureStatementContext.java
index 08b83483e76..0bd8edc91b3 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateProcedureStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateProcedureStatementContext.java
@@ -41,7 +41,7 @@ public final class CreateProcedureStatementContext extends
CommonSQLStatementCon
public CreateProcedureStatementContext(final CreateProcedureStatement
sqlStatement) {
super(sqlStatement);
Optional<RoutineBodySegment> routineBodySegment =
CreateProcedureStatementHandler.getRoutineBodySegment(sqlStatement);
- Collection<SimpleTableSegment> tables =
routineBodySegment.map(bodySegment -> new
TableExtractor().extractExistTableFromRoutineBody(bodySegment)).orElse(Collections.emptyList());
+ Collection<SimpleTableSegment> tables =
routineBodySegment.map(bodySegment -> new
TableExtractor().extractExistTableFromRoutineBody(bodySegment)).orElseGet(Collections::emptyList);
tablesContext = new TablesContext(tables, getDatabaseType());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
index 0a94ab46134..8495a2efe76 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
@@ -48,7 +48,7 @@ public final class DropIndexStatementContext extends
CommonSQLStatementContext<D
@Override
public Collection<SimpleTableSegment> getAllTables() {
Optional<SimpleTableSegment> simpleTableSegment =
DropIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
- return
simpleTableSegment.map(Collections::singletonList).orElse(Collections.emptyList());
+ return
simpleTableSegment.map(Collections::singletonList).orElseGet(Collections::emptyList);
}
@Override
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
index c056007d0c3..01f9f96b503 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
@@ -89,7 +89,7 @@ public class ShardingSphereAutoConfiguration implements
EnvironmentAware {
@Conditional(LocalRulesCondition.class)
@Autowired(required = false)
public DataSource shardingSphereDataSource(final
ObjectProvider<List<RuleConfiguration>> rules, final
ObjectProvider<ModeConfiguration> modeConfig) throws SQLException {
- Collection<RuleConfiguration> ruleConfigs =
Optional.ofNullable(rules.getIfAvailable()).orElse(Collections.emptyList());
+ Collection<RuleConfiguration> ruleConfigs =
Optional.ofNullable(rules.getIfAvailable()).orElseGet(Collections::emptyList);
return ShardingSphereDataSourceFactory.createDataSource(databaseName,
modeConfig.getIfAvailable(), dataSourceMap, ruleConfigs, props.getProps());
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGenerator.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGenerator.java
index 245d85be373..cc1b8c29b07 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGenerator.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGenerator.java
@@ -38,7 +38,7 @@ public final class ClusterWorkerIdGenerator implements
WorkerIdGenerator {
@Override
public long generate() {
- return
metaDataPersistService.getComputeNodePersistService().loadInstanceWorkerId(instanceDefinition.getInstanceId().getId()).orElseGet(()
-> reGenerate());
+ return
metaDataPersistService.getComputeNodePersistService().loadInstanceWorkerId(instanceDefinition.getInstanceId().getId()).orElseGet(this::reGenerate);
}
private Long reGenerate() {
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/s
[...]
index 17c69aedc53..a1046d743a2 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-repository/shardingsphere-standalone-mode-repository-provider/shardingsphere-standalone-mode-repository-file/src/main/java/org/apache/shardingsphere/mode/repository/standalone/file/FileRepository.java
@@ -49,7 +49,8 @@ public final class FileRepository implements
StandalonePersistRepository {
public void setProps(final Properties props) {
FileRepositoryProperties localRepositoryProperties = new
FileRepositoryProperties(props);
path = Optional.ofNullable(
-
Strings.emptyToNull(localRepositoryProperties.getValue(FileRepositoryPropertyKey.PATH))).orElse(Joiner.on("/").join(System.getProperty("user.home"),
DEFAULT_PERSIST_DIRECTORY));
+
Strings.emptyToNull(localRepositoryProperties.getValue(FileRepositoryPropertyKey.PATH)))
+ .orElseGet(() ->
Joiner.on("/").join(System.getProperty("user.home"),
DEFAULT_PERSIST_DIRECTORY));
}
@Override
