This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 a96e3fc637d Remove useless static of private methods (#25505)
a96e3fc637d is described below
commit a96e3fc637d4c90ee5d565c020a2bac42f35d41f
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 7 23:45:05 2023 +0800
Remove useless static of private methods (#25505)
* Reduce SQLFederationDeciderContext usage scope
* Remove useless static of private method
---
.../AbstractExecuteLatencyHistogramAdvice.java | 2 +-
.../proxy/ExecuteLatencyHistogramAdvice.java | 2 +-
...lterDefaultShadowAlgorithmStatementUpdater.java | 2 +-
.../parser/core/ShadowDistSQLStatementVisitor.java | 8 ++---
.../decider/ShardingSQLFederationDecider.java | 6 ++--
.../InsertClauseShardingConditionEngine.java | 2 +-
.../keygen/SnowflakeKeyGenerateAlgorithmTest.java | 2 +-
.../ShardingPaginationParameterRewriterTest.java | 4 +--
.../checker/ShardingRuleStatementCheckerTest.java | 2 +-
...AlterShardingTableRuleStatementUpdaterTest.java | 2 +-
.../cache/route/CachedShardingSQLRouterTest.java | 7 ++---
.../shardingsphere/infra/datanode/DataNode.java | 34 +++++++++-------------
.../pool/creator/DataSourceReflection.java | 2 +-
.../loader/common/SchemaMetaDataLoaderTest.java | 2 +-
.../lock/ProcessOperationLockRegistryTest.java | 2 +-
.../driver/jdbc/core/ShardingSphereSavepoint.java | 2 +-
.../jdbc/core/driver/DriverDataSourceCache.java | 4 +--
.../data/pipeline/cdc/api/impl/CDCJobAPI.java | 2 +-
.../pipeline/core/context/PipelineContextKey.java | 2 +-
.../memory/MultiplexMemoryPipelineChannelTest.java | 2 +-
.../mysql/ingest/MySQLIncrementalDumperTest.java | 4 +--
.../ingest/wal/decode/MppdbDecodingPlugin.java | 14 ++++-----
.../postgresql/ingest/PostgreSQLWALDumperTest.java | 2 +-
.../ingest/wal/WALEventConverterTest.java | 4 +--
.../single/decider/SingleSQLFederationDecider.java | 2 +-
.../single/route/SingleSQLRouter.java | 10 +++----
.../decider/SingleSQLFederationDeciderTest.java | 6 ++--
.../result/SQLFederationResultSetTest.java | 2 +-
.../sqlfederation/optimizer/SQLOptimizeEngine.java | 2 +-
.../segment/from/impl/JoinTableConverter.java | 4 +--
.../statement/select/SelectStatementConverter.java | 2 +-
.../metadata/filter/FilterableSchema.java | 2 +-
.../metadata/translatable/TranslatableSchema.java | 2 +-
.../transaction/rule/TransactionRuleTest.java | 10 +++----
.../watcher/ComputeNodeStateChangedWatcher.java | 4 +--
.../ProcessListChangedSubscriberTest.java | 2 +-
.../proxy/backend/connector/DatabaseConnector.java | 2 +-
.../proxy/backend/connector/ProxySQLExecutor.java | 2 +-
.../callback/ProxyJDBCExecutorCallback.java | 2 +-
.../header/update/UpdateResponseHeader.java | 2 +-
.../connector/DatabaseConnectorFactoryTest.java | 2 +-
.../data/DatabaseBackendHandlerFactoryTest.java | 4 +--
.../updatable/RefreshTableMetaDataUpdaterTest.java | 2 +-
.../rdl/rule/RuleDefinitionBackendHandlerTest.java | 2 +-
.../hbase/context/HBaseRegionWarmUpContext.java | 2 +-
.../admin/executor/ShowProcessListExecutor.java | 4 +--
.../admin/PostgreSQLAdminExecutorCreatorTest.java | 2 +-
.../version/ShardingSphereProxyVersionTest.java | 2 +-
.../OpenGaussCommandExecutorFactoryTest.java | 2 +-
.../bind/OpenGaussComBatchBindExecutorTest.java | 2 +-
.../err/OpenGaussErrorPacketFactoryTest.java | 2 +-
.../describe/PostgreSQLComDescribeExecutor.java | 2 +-
.../PostgreSQLCommandExecutorFactoryTest.java | 2 +-
.../visitor/statement/MySQLStatementVisitor.java | 2 +-
.../statement/OpenGaussStatementVisitor.java | 4 +--
.../statement/type/OracleDMLStatementVisitor.java | 7 ++---
.../metrics/cases/IntegrationTestCasesLoader.java | 4 +--
.../jaeger/cases/IntegrationTestCasesLoader.java | 4 +--
.../zipkin/cases/IntegrationTestCasesLoader.java | 4 +--
.../container/compose/NativeContainerComposer.java | 2 +-
.../framework/helper/PipelineCaseHelper.java | 5 +++-
.../test/e2e/cases/IntegrationTestCasesLoader.java | 4 +--
.../test/e2e/engine/type/dql/BaseDQLE2EIT.java | 4 +--
.../param/array/E2ETestParameterGenerator.java | 2 +-
.../ExternalSQLParserTestParameterLoader.java | 10 +++----
.../test/it/rewrite/engine/SQLRewriterIT.java | 2 +-
66 files changed, 123 insertions(+), 132 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/jdbc/AbstractExecuteLatencyHistogramAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/jdbc/AbstractExecuteLatencyHistogramAdvice.java
index 5c5759e5512..23cf2da75d8 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/jdbc/AbstractExecuteLatencyHistogramAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/jdbc/AbstractExecuteLatencyHistogramAdvice.java
@@ -38,7 +38,7 @@ public abstract class AbstractExecuteLatencyHistogramAdvice
implements InstanceM
private final MetricConfiguration config = new
MetricConfiguration("jdbc_statement_execute_latency_millis",
MetricCollectorType.HISTOGRAM,
"Statement execute latency millis histogram",
Collections.singletonMap("buckets", getBuckets()));
- private static Map<String, Object> getBuckets() {
+ private Map<String, Object> getBuckets() {
Map<String, Object> result = new HashMap<>(4, 1);
result.put("type", "exp");
result.put("start", 1);
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdvice.java
index ca876f45052..51dd5a4e491 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdvice.java
@@ -40,7 +40,7 @@ public final class ExecuteLatencyHistogramAdvice implements
InstanceMethodAdvice
private final MethodTimeRecorder methodTimeRecorder = new
MethodTimeRecorder(ExecuteLatencyHistogramAdvice.class);
- private static Map<String, Object> getBuckets() {
+ private Map<String, Object> getBuckets() {
Map<String, Object> result = new HashMap<>(4, 1);
result.put("type", "exp");
result.put("start", 1);
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java
index 7db65e77c9e..f29c4446b27 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java
@@ -76,7 +76,7 @@ public final class
AlterDefaultShadowAlgorithmStatementUpdater implements RuleDe
currentRuleConfig.getShadowAlgorithms().keySet(),
notExistedAlgorithms -> new MissingRequiredAlgorithmException("shadow",
databaseName, notExistedAlgorithms));
}
- private static void checkAlgorithmCompleteness(final AlgorithmSegment
algorithmSegment) {
+ private void checkAlgorithmCompleteness(final AlgorithmSegment
algorithmSegment) {
boolean isCompleteAlgorithm =
!Strings.isNullOrEmpty(algorithmSegment.getName()) &&
!algorithmSegment.getProps().isEmpty();
ShardingSpherePreconditions.checkState(isCompleteAlgorithm, () -> new
InvalidAlgorithmConfigurationException("shadow"));
}
diff --git
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index 3ca95e4f5c7..17a4daf50b8 100644
---
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -174,13 +174,13 @@ public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementB
return new
CountShadowRuleStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
}
- private static Collection<ShadowRuleSegment> autoCreateAlgorithmName(final
Collection<ShadowRuleSegment> shadowRuleSegments) {
+ private Collection<ShadowRuleSegment> autoCreateAlgorithmName(final
Collection<ShadowRuleSegment> shadowRuleSegments) {
Collection<ShadowRuleSegment> result = new LinkedList<>();
shadowRuleSegments.forEach(each -> buildShadowRuleSegment(result,
each));
return result;
}
- private static void buildShadowRuleSegment(final
Collection<ShadowRuleSegment> collection, final ShadowRuleSegment
shadowRuleSegment) {
+ private void buildShadowRuleSegment(final Collection<ShadowRuleSegment>
collection, final ShadowRuleSegment shadowRuleSegment) {
Map<String, Collection<ShadowAlgorithmSegment>> shadowTableRules = new
LinkedHashMap<>();
shadowRuleSegment.getShadowTableRules().forEach((key, value) -> {
int index = 0;
@@ -193,13 +193,13 @@ public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementB
collection.add(new ShadowRuleSegment(shadowRuleSegment.getRuleName(),
shadowRuleSegment.getSource(), shadowRuleSegment.getShadow(),
shadowTableRules));
}
- private static ShadowAlgorithmSegment buildShadowAlgorithmSegment(final
String ruleName, final String tableName, final int index, final
ShadowAlgorithmSegment shadowAlgorithmSegment) {
+ private ShadowAlgorithmSegment buildShadowAlgorithmSegment(final String
ruleName, final String tableName, final int index, final ShadowAlgorithmSegment
shadowAlgorithmSegment) {
String algorithmName = buildAlgorithmName(ruleName, tableName,
shadowAlgorithmSegment.getAlgorithmSegment().getName(), index);
AlgorithmSegment algorithmSegment = new
AlgorithmSegment(shadowAlgorithmSegment.getAlgorithmSegment().getName(),
shadowAlgorithmSegment.getAlgorithmSegment().getProps());
return new ShadowAlgorithmSegment(algorithmName, algorithmSegment);
}
- private static String buildAlgorithmName(final String ruleName, final
String tableName, final String algorithmType, final int index) {
+ private String buildAlgorithmName(final String ruleName, final String
tableName, final String algorithmType, final int index) {
return String.format("%s_%s_%s_%d", ruleName, tableName,
algorithmType, index).toLowerCase();
}
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
index cba99ad29d5..9f4123ba70a 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/decider/ShardingSQLFederationDecider.java
@@ -61,14 +61,14 @@ public final class ShardingSQLFederationDecider implements
SQLFederationDecider<
deciderContext.setUseSQLFederation(tableNames.size() > 1 &&
!allBindingTables);
}
- private static void addTableDataNodes(final SQLFederationDeciderContext
deciderContext, final ShardingRule rule, final Collection<String> tableNames) {
+ private void addTableDataNodes(final SQLFederationDeciderContext
deciderContext, final ShardingRule rule, final Collection<String> tableNames) {
for (String each : tableNames) {
rule.findTableRule(each).ifPresent(optional ->
deciderContext.getDataNodes().addAll(optional.getActualDataNodes()));
}
}
- private static ShardingConditions getMergedShardingConditions(final
SQLStatementContext<?> sqlStatementContext, final List<Object> parameters,
- final
ShardingSphereRuleMetaData globalRuleMetaData, final ShardingSphereDatabase
database, final ShardingRule rule) {
+ private ShardingConditions getMergedShardingConditions(final
SQLStatementContext<?> sqlStatementContext, final List<Object> parameters,
+ final
ShardingSphereRuleMetaData globalRuleMetaData, final ShardingSphereDatabase
database, final ShardingRule rule) {
List<ShardingCondition> shardingConditions = new
ShardingConditionEngine(
globalRuleMetaData, database,
rule).createShardingConditions(sqlStatementContext, parameters);
ShardingConditions result = new ShardingConditions(shardingConditions,
sqlStatementContext, rule);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
index fb552cc2a18..42911f1e3c2 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/InsertClauseShardingConditionEngine.java
@@ -103,7 +103,7 @@ public final class InsertClauseShardingConditionEngine {
}
}
- private static void appendMissingShardingConditions(final
List<ShardingCondition> shardingConditions, final String columnName, final
String tableName) {
+ private void appendMissingShardingConditions(final List<ShardingCondition>
shardingConditions, final String columnName, final String tableName) {
for (ShardingCondition each : shardingConditions) {
each.getValues().add(new ListShardingConditionValue<>(columnName,
tableName, Collections.singletonList(null)));
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
index 9287ffade15..4f480898fc7 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
@@ -165,7 +165,7 @@ class SnowflakeKeyGenerateAlgorithmTest {
assertThrows(SnowflakeClockMoveBackException.class, () ->
batchGenerate(algorithm));
}
- private static void batchGenerate(final KeyGenerateAlgorithm algorithm) {
+ private void batchGenerate(final KeyGenerateAlgorithm algorithm) {
for (int i = 0; i < DEFAULT_KEY_AMOUNT; i++) {
algorithm.generateKey();
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
index 511b93a2827..fa70ba8f860 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
@@ -74,7 +74,7 @@ class ShardingPaginationParameterRewriterTest {
addOffsetParametersFlag = false;
addRowCountParameterFlag = false;
StandardParameterBuilder standardParamBuilder =
mock(StandardParameterBuilder.class);
- doAnswer((Answer<Void>)
ShardingPaginationParameterRewriterTest::mockAddReplacedParameters).when(standardParamBuilder).addReplacedParameters(anyInt(),
anyLong());
+ doAnswer((Answer<Void>)
this::mockAddReplacedParameters).when(standardParamBuilder).addReplacedParameters(anyInt(),
anyLong());
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class);
PaginationContext pagination = mock(PaginationContext.class);
when(pagination.getOffsetParameterIndex()).thenReturn(Optional.of(TEST_OFFSET_PARAMETER_INDEX));
@@ -87,7 +87,7 @@ class ShardingPaginationParameterRewriterTest {
assertTrue(addRowCountParameterFlag);
}
- private static Void mockAddReplacedParameters(final InvocationOnMock
invocation) {
+ private Void mockAddReplacedParameters(final InvocationOnMock invocation) {
int index = invocation.getArgument(0);
long param = invocation.getArgument(1);
if (index == TEST_OFFSET_PARAMETER_INDEX && param ==
TEST_REVISED_OFFSET) {
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
index f9c922607f9..2560516f76d 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
@@ -298,7 +298,7 @@ class ShardingRuleStatementCheckerTest {
return result;
}
- private static Map<String, DataSource> createDataSource() {
+ private Map<String, DataSource> createDataSource() {
Map<String, DataSource> result = new HashMap<>(2, 1);
result.put("ds_0", new MockedDataSource());
result.put("ds_1", new MockedDataSource());
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
index 06fcb1b04f9..3fd30bfae6f 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
@@ -188,7 +188,7 @@ class AlterShardingTableRuleStatementUpdaterTest {
return result;
}
- private static Map<String, DataSource> createDataSource() {
+ private Map<String, DataSource> createDataSource() {
Map<String, DataSource> result = new HashMap<>(2, 1);
result.put("ds_0", new MockedDataSource());
result.put("ds_1", new MockedDataSource());
diff --git
a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
index b3a41d5273b..e0925719535 100644
---
a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
+++
b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.sharding.cache.route;
-import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
+import org.apache.shardingsphere.infra.session.query.QueryContext;
import
org.apache.shardingsphere.sharding.cache.api.ShardingCacheRuleConfiguration;
import
org.apache.shardingsphere.sharding.cache.checker.ShardingRouteCacheableCheckResult;
import
org.apache.shardingsphere.sharding.cache.checker.ShardingRouteCacheableChecker;
@@ -31,7 +31,6 @@ import
org.apache.shardingsphere.sharding.cache.route.cache.ShardingRouteCacheKe
import
org.apache.shardingsphere.sharding.cache.route.cache.ShardingRouteCacheValue;
import org.apache.shardingsphere.sharding.cache.rule.ShardingCacheRule;
import org.apache.shardingsphere.sharding.route.engine.ShardingSQLRouter;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -88,7 +87,7 @@ class CachedShardingSQLRouterTest {
assertRouteContextIsEmpty(actual);
}
- private static void assertRouteContextIsEmpty(final RouteContext actual) {
+ private void assertRouteContextIsEmpty(final RouteContext actual) {
assertTrue(actual.getRouteUnits().isEmpty());
assertTrue(actual.getOriginalDataNodes().isEmpty());
assertTrue(actual.getRouteStageContexts().isEmpty());
@@ -169,6 +168,6 @@ class CachedShardingSQLRouterTest {
@Test
void assertGetTypeClass() {
- assertThat(new CachedShardingSQLRouter().getTypeClass(),
CoreMatchers.<Class<ShardingCacheRule>>is(ShardingCacheRule.class));
+ assertThat(new CachedShardingSQLRouter().getTypeClass(),
is(ShardingCacheRule.class));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
index 0bb17be5203..17c5f49b26e 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
@@ -64,10 +64,23 @@ public final class DataNode {
tableName = segments.get(isIncludeInstance ? 2 : 1);
}
- private static boolean isValidDataNode(final String dataNodeStr, final
Integer tier) {
+ private boolean isValidDataNode(final String dataNodeStr, final Integer
tier) {
return dataNodeStr.contains(DELIMITER) && tier ==
Splitter.on(DELIMITER).omitEmptyStrings().splitToList(dataNodeStr).size();
}
+ private boolean isActualDataNodesIncludedDataSourceInstance(final String
actualDataNodes) {
+ return isValidDataNode(actualDataNodes, 3);
+ }
+
+ /**
+ * Format data node as string.
+ *
+ * @return formatted data node
+ */
+ public String format() {
+ return dataSourceName + DELIMITER + tableName;
+ }
+
@Override
public boolean equals(final Object object) {
if (this == object) {
@@ -86,23 +99,4 @@ public final class DataNode {
public int hashCode() {
return Objects.hashCode(dataSourceName.toUpperCase(),
tableName.toUpperCase(), null == schemaName ? null : schemaName.toUpperCase());
}
-
- /**
- * Format data node as string.
- *
- * @return formatted data node
- */
- public String format() {
- return dataSourceName + DELIMITER + tableName;
- }
-
- /**
- * Is Actual data nodes three tier structure.
- *
- * @param actualDataNodes data source map
- * @return boolean
- */
- public static boolean isActualDataNodesIncludedDataSourceInstance(final
String actualDataNodes) {
- return isValidDataNode(actualDataNodes, 3);
- }
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourceReflection.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourceReflection.java
index da7a45c66b5..db2ca27dbe8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourceReflection.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourceReflection.java
@@ -108,7 +108,7 @@ public final class DataSourceReflection {
return result;
}
- private static String getGetterFieldName(final Method method, final String
methodPrefix) {
+ private String getGetterFieldName(final Method method, final String
methodPrefix) {
return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL,
method.getName().substring(methodPrefix.length()));
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
index eca60b90ed3..3c0450e9ec2 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
@@ -91,7 +91,7 @@ class SchemaMetaDataLoaderTest {
assertThat(SchemaMetaDataLoader.loadSchemaTableNames(DefaultDatabase.LOGIC_NAME,
new MySQLDatabaseType(), dataSource), is(schemaTableNames));
}
- private static Map<String, Collection<String>> createSchemaTableNames() {
+ private Map<String, Collection<String>> createSchemaTableNames() {
Map<String, Collection<String>> result = new LinkedHashMap<>();
result.put("public", Collections.singletonList("tbl"));
result.put("schema_1", Collections.emptyList());
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistryTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistryTest.java
index 056a660afae..e81f02a5a0e 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistryTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistryTest.java
@@ -45,7 +45,7 @@ class ProcessOperationLockRegistryTest {
assertThat(currentMillis, lessThanOrEqualTo(startMillis + 5000L));
}
- private static void waitUntilReleaseReady(final String lockId) {
+ private void waitUntilReleaseReady(final String lockId) {
ProcessOperationLockRegistry.getInstance().waitUntilReleaseReady(lockId, new
ProcessOperationLockReleaseStrategy() {
private final AtomicBoolean firstTime = new AtomicBoolean(true);
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
index cf4613a987c..ae13d943b68 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
@@ -50,7 +50,7 @@ public final class ShardingSphereSavepoint implements
Savepoint {
return savepointName;
}
- private static String getUniqueId() {
+ private String getUniqueId() {
String uidStr = new UID().toString();
int uidLength = uidStr.length();
StringBuilder safeString = new StringBuilder(uidLength + 1);
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
index 30c3874b06d..a48bbceea9a 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/DriverDataSourceCache.java
@@ -42,11 +42,11 @@ public final class DriverDataSourceCache {
if (dataSourceMap.containsKey(url)) {
return dataSourceMap.get(url);
}
- return dataSourceMap.computeIfAbsent(url,
DriverDataSourceCache::createDataSource);
+ return dataSourceMap.computeIfAbsent(url, this::createDataSource);
}
@SuppressWarnings("unchecked")
- private static <T extends Throwable> DataSource createDataSource(final
String url) throws T {
+ private <T extends Throwable> DataSource createDataSource(final String
url) throws T {
try {
return
YamlShardingSphereDataSourceFactory.createDataSource(ShardingSphereDriverURLManager.getContent(url));
} catch (final IOException ex) {
diff --git
a/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
b/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
index 4089bdfbbf3..b5b87dc36cc 100644
---
a/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
+++
b/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
@@ -276,7 +276,7 @@ public final class CDCJobAPI extends
AbstractInventoryIncrementalJobAPIImpl {
return new TableNameSchemaNameMapping(tableNameSchemaMap);
}
- private static DumperConfiguration buildDumperConfiguration(final
CDCJobConfiguration jobConfig, final int jobShardingItem, final
TableNameSchemaNameMapping tableNameSchemaNameMapping) {
+ private DumperConfiguration buildDumperConfiguration(final
CDCJobConfiguration jobConfig, final int jobShardingItem, final
TableNameSchemaNameMapping tableNameSchemaNameMapping) {
JobDataNodeLine dataNodeLine =
jobConfig.getJobShardingDataNodes().get(jobShardingItem);
Map<ActualTableName, LogicTableName> tableNameMap = new
LinkedHashMap<>();
dataNodeLine.getEntries().forEach(each ->
each.getDataNodes().forEach(node -> tableNameMap.put(new
ActualTableName(node.getTableName()), new
LogicTableName(each.getLogicTableName()))));
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineContextKey.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineContextKey.java
index 43a81405c28..d3fe4bb174d 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineContextKey.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineContextKey.java
@@ -77,7 +77,7 @@ public final class PipelineContextKey {
return instanceType == that.instanceType &&
Objects.equals(filterDatabaseName(this), filterDatabaseName(that));
}
- private static String filterDatabaseName(final PipelineContextKey
contextKey) {
+ private String filterDatabaseName(final PipelineContextKey contextKey) {
return contextKey.getInstanceType() == InstanceType.PROXY ? "" :
contextKey.getDatabaseName();
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java
index 146cef07c70..ea055f92df7 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java
@@ -84,7 +84,7 @@ class MultiplexMemoryPipelineChannelTest {
}
}
- private static void fetch(final MultiplexMemoryPipelineChannel
memoryChannel, final CountDownLatch countDownLatch) {
+ private void fetch(final MultiplexMemoryPipelineChannel memoryChannel,
final CountDownLatch countDownLatch) {
int maxLoopCount = 10;
for (int j = 1; j <= maxLoopCount; j++) {
List<Record> records = memoryChannel.fetchRecords(100, 1,
TimeUnit.SECONDS);
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
index 3e07cc9e5b5..52f13528191 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
@@ -116,11 +116,11 @@ class MySQLIncrementalDumperTest {
}
}
- private static Map<String, PipelineColumnMetaData>
mockOrderColumnsMetaDataMap() {
+ private Map<String, PipelineColumnMetaData> mockOrderColumnsMetaDataMap() {
return
mockOrderColumnsMetaDataList().stream().collect(Collectors.toMap(PipelineColumnMetaData::getName,
Function.identity()));
}
- private static List<PipelineColumnMetaData> mockOrderColumnsMetaDataList()
{
+ private List<PipelineColumnMetaData> mockOrderColumnsMetaDataList() {
List<PipelineColumnMetaData> result = new LinkedList<>();
result.add(new PipelineColumnMetaData(1, "order_id", Types.INTEGER,
"INT", false, true, true));
result.add(new PipelineColumnMetaData(1, "user_id", Types.INTEGER,
"INT", false, false, false));
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/MppdbDecodingPlugin.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/MppdbDecodingPlugin.java
index 5b6b85ba9b3..7a787084f58 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/MppdbDecodingPlugin.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/MppdbDecodingPlugin.java
@@ -224,7 +224,7 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
}
}
- private static PGobject decodeInterval(final String data) {
+ private PGobject decodeInterval(final String data) {
try {
return new PGInterval(decodeString(data));
} catch (final SQLException ignored) {
@@ -232,7 +232,7 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
}
}
- private static PGobject decodePgObject(final String data, final String
type) {
+ private PGobject decodePgObject(final String data, final String type) {
try {
PGobject result = new PGobject();
result.setType(type);
@@ -243,7 +243,7 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
}
}
- private static PGobject decodeBytea(final String data) {
+ private PGobject decodeBytea(final String data) {
try {
PGobject result = new PGobject();
result.setType("bytea");
@@ -255,12 +255,12 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
}
}
- private static String decodeMoney(final String data) {
+ private String decodeMoney(final String data) {
String result = decodeString(data);
return '$' == result.charAt(0) ? result.substring(1) : result;
}
- private static String decodeString(final String data) {
+ private String decodeString(final String data) {
if (data.length() > 1) {
int begin = '\'' == data.charAt(0) ? 1 : 0;
int end = data.length() + (data.charAt(data.length() - 1) == '\''
? -1 : 0);
@@ -269,7 +269,7 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
return data;
}
- private static byte[] decodeHex(final String hexString) {
+ private byte[] decodeHex(final String hexString) {
int dataLength = hexString.length();
Preconditions.checkArgument(0 == (dataLength & 1), "Illegal hex data
`%s`", hexString);
if (0 == dataLength) {
@@ -282,7 +282,7 @@ public final class MppdbDecodingPlugin implements
DecodingPlugin {
return result;
}
- private static byte decodeHexByte(final String hexString, final int index)
{
+ private byte decodeHexByte(final String hexString, final int index) {
int firstHexChar = Character.digit(hexString.charAt(index), 16);
int secondHexChar = Character.digit(hexString.charAt(index + 1), 16);
Preconditions.checkArgument(-1 != firstHexChar && -1 != secondHexChar,
"Illegal hex byte `%s` in index `%d`", hexString, index);
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
index 1f2f673ff7e..36689a5d87d 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
@@ -92,7 +92,7 @@ class PostgreSQLWALDumperTest {
walDumper = new PostgreSQLWALDumper(dumperConfig, position, channel,
new
StandardPipelineTableMetaDataLoader(dataSourceManager.getDataSource(dumperConfig.getDataSourceConfig())));
}
- private static void createTable(final String jdbcUrl, final String
username, final String password) {
+ private void createTable(final String jdbcUrl, final String username,
final String password) {
String sql = "CREATE TABLE t_order_0 (order_id INT NOT NULL, user_id
INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id))";
try (
Connection connection = DriverManager.getConnection(jdbcUrl,
username, password);
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java
index 76bb483b469..68d1a84be29 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java
@@ -115,11 +115,11 @@ class WALEventConverterTest {
}
}
- private static Map<String, PipelineColumnMetaData>
mockOrderColumnsMetaDataMap() {
+ private Map<String, PipelineColumnMetaData> mockOrderColumnsMetaDataMap() {
return
mockOrderColumnsMetaDataList().stream().collect(Collectors.toMap(PipelineColumnMetaData::getName,
Function.identity()));
}
- private static List<PipelineColumnMetaData> mockOrderColumnsMetaDataList()
{
+ private List<PipelineColumnMetaData> mockOrderColumnsMetaDataList() {
List<PipelineColumnMetaData> result = new LinkedList<>();
result.add(new PipelineColumnMetaData(1, "order_id", Types.INTEGER,
"INT", false, true, true));
result.add(new PipelineColumnMetaData(1, "user_id", Types.INTEGER,
"INT", false, false, false));
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
index 4a5766b3b5d..22a7f45db57 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
@@ -82,7 +82,7 @@ public final class SingleSQLFederationDecider implements
SQLFederationDecider<Si
}
private Collection<QualifiedTable> getSingleTableNames(final
SQLStatementContext<?> sqlStatementContext,
- final
ShardingSphereDatabase database, final SingleRule rule) {
+ final
ShardingSphereDatabase database, final SingleRule rule) {
DatabaseType databaseType = sqlStatementContext.getDatabaseType();
Collection<QualifiedTable> result = getQualifiedTables(database,
databaseType, sqlStatementContext.getTablesContext().getTables());
if (result.isEmpty() && sqlStatementContext instanceof IndexAvailable)
{
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
index b7da349bb89..26f5815972d 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
@@ -92,8 +92,8 @@ public final class SingleSQLRouter implements
SQLRouter<SingleRule> {
return result;
}
- private static Collection<QualifiedTable> getSingleTableNames(final
SQLStatementContext<?> sqlStatementContext,
- final
ShardingSphereDatabase database, final SingleRule rule, final RouteContext
routeContext) {
+ private Collection<QualifiedTable> getSingleTableNames(final
SQLStatementContext<?> sqlStatementContext,
+ final
ShardingSphereDatabase database, final SingleRule rule, final RouteContext
routeContext) {
DatabaseType databaseType = sqlStatementContext.getDatabaseType();
Collection<QualifiedTable> result = getQualifiedTables(database,
databaseType, sqlStatementContext.getTablesContext().getTables());
if (result.isEmpty() && sqlStatementContext instanceof IndexAvailable)
{
@@ -102,7 +102,7 @@ public final class SingleSQLRouter implements
SQLRouter<SingleRule> {
return routeContext.getRouteUnits().isEmpty() &&
sqlStatementContext.getSqlStatement() instanceof CreateTableStatement ? result
: rule.getSingleTableNames(result);
}
- private static Collection<QualifiedTable> getQualifiedTables(final
ShardingSphereDatabase database, final DatabaseType databaseType, final
Collection<SimpleTableSegment> tableSegments) {
+ private Collection<QualifiedTable> getQualifiedTables(final
ShardingSphereDatabase database, final DatabaseType databaseType, final
Collection<SimpleTableSegment> tableSegments) {
Collection<QualifiedTable> result = new LinkedList<>();
String schemaName =
DatabaseTypeEngine.getDefaultSchemaName(databaseType, database.getName());
for (SimpleTableSegment each : tableSegments) {
@@ -112,8 +112,8 @@ public final class SingleSQLRouter implements
SQLRouter<SingleRule> {
return result;
}
- private static void validateSameDataSource(final SQLStatementContext<?>
sqlStatementContext, final SingleRule rule,
- final ConfigurationProperties
props, final Collection<QualifiedTable> singleTableNames, final RouteContext
routeContext) {
+ private void validateSameDataSource(final SQLStatementContext<?>
sqlStatementContext, final SingleRule rule,
+ final ConfigurationProperties props,
final Collection<QualifiedTable> singleTableNames, final RouteContext
routeContext) {
String sqlFederationType =
props.getValue(ConfigurationPropertyKey.SQL_FEDERATION_TYPE);
boolean allTablesInSameDataSource = "NONE".equals(sqlFederationType)
? rule.isAllTablesInSameDataSource(routeContext,
singleTableNames)
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
index 7bfaed53a26..6da43c6f676 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDeciderTest.java
@@ -114,7 +114,7 @@ class SingleSQLFederationDeciderTest {
assertTrue(actual.isUseSQLFederation());
}
- private static SingleRule createSingleRule(final
Collection<QualifiedTable> qualifiedTables) {
+ private SingleRule createSingleRule(final Collection<QualifiedTable>
qualifiedTables) {
SingleRule result = mock(SingleRule.class);
when(result.getSingleTableNames(any())).thenReturn(qualifiedTables);
when(result.findSingleTableDataNode(DefaultDatabase.LOGIC_NAME,
"t_order")).thenReturn(Optional.of(new DataNode("ds_0", "t_order")));
@@ -122,13 +122,13 @@ class SingleSQLFederationDeciderTest {
return result;
}
- private static SelectStatementContext createStatementContext() {
+ private SelectStatementContext createStatementContext() {
SelectStatementContext result = mock(SelectStatementContext.class,
RETURNS_DEEP_STUBS);
when(result.getDatabaseType()).thenReturn(new MySQLDatabaseType());
return result;
}
- private static ShardingSphereDatabase createDatabase() {
+ private ShardingSphereDatabase createDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class);
when(result.getName()).thenReturn(DefaultDatabase.LOGIC_NAME);
when(result.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(mock(ShardingSphereSchema.class));
diff --git
a/kernel/sql-federation/executor/advanced/src/test/java/org/apache/shardingsphere/sqlfederation/advanced/result/SQLFederationResultSetTest.java
b/kernel/sql-federation/executor/advanced/src/test/java/org/apache/shardingsphere/sqlfederation/advanced/result/SQLFederationResultSetTest.java
index c8d7f92ba97..235f7e0ecb4 100644
---
a/kernel/sql-federation/executor/advanced/src/test/java/org/apache/shardingsphere/sqlfederation/advanced/result/SQLFederationResultSetTest.java
+++
b/kernel/sql-federation/executor/advanced/src/test/java/org/apache/shardingsphere/sqlfederation/advanced/result/SQLFederationResultSetTest.java
@@ -71,7 +71,7 @@ class SQLFederationResultSetTest {
federationResultSet = new SQLFederationResultSet(enumerator,
mock(ShardingSphereSchema.class), mock(FilterableSchema.class),
createSelectStatementContext(), mock(RelDataType.class));
}
- private static SelectStatementContext createSelectStatementContext() {
+ private SelectStatementContext createSelectStatementContext() {
SelectStatementContext result = mock(SelectStatementContext.class,
RETURNS_DEEP_STUBS);
List<Projection> projections = Arrays.asList(new ColumnProjection("o",
"order_id", null), new ColumnProjection("o", "user_id", null), new
ColumnProjection("o", "status", null),
new ColumnProjection("i", "item_id", null));
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/SQLOptimizeEngine.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/SQLOptimizeEngine.java
index 6f151c7106d..47897d24814 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/SQLOptimizeEngine.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/SQLOptimizeEngine.java
@@ -54,7 +54,7 @@ public final class SQLOptimizeEngine {
return new SQLOptimizeContext(bestPlan, validatedNodeType);
}
- private static RelNode optimizeWithRBO(final RelNode logicPlan, final
RelOptPlanner hepPlanner) {
+ private RelNode optimizeWithRBO(final RelNode logicPlan, final
RelOptPlanner hepPlanner) {
hepPlanner.setRoot(logicPlan);
return hepPlanner.findBestExp();
}
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/from/impl/JoinTableConverter.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/from/impl/JoinTableConverter.java
index ef7dbd1728c..e8b33197f45 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/from/impl/JoinTableConverter.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/from/impl/JoinTableConverter.java
@@ -50,14 +50,14 @@ public final class JoinTableConverter implements
SQLSegmentConverter<JoinTableSe
return Optional.of(new SqlJoin(SqlParserPos.ZERO, left,
SqlLiteral.createBoolean(segment.isNatural(), SqlParserPos.ZERO), joinType,
right, conditionType, condition.orElse(null)));
}
- private static SqlLiteral convertConditionType(final JoinTableSegment
segment) {
+ private SqlLiteral convertConditionType(final JoinTableSegment segment) {
if (!segment.getUsing().isEmpty()) {
return JoinConditionType.USING.symbol(SqlParserPos.ZERO);
}
return null != segment.getCondition() ?
JoinConditionType.ON.symbol(SqlParserPos.ZERO) :
JoinConditionType.NONE.symbol(SqlParserPos.ZERO);
}
- private static Optional<SqlNode> convertJoinCondition(final
JoinTableSegment segment) {
+ private Optional<SqlNode> convertJoinCondition(final JoinTableSegment
segment) {
if (null != segment.getCondition()) {
return new ExpressionConverter().convert(segment.getCondition());
}
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/statement/select/SelectStatementConverter.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/statement/select/SelectStatementConverter.java
index 10253d018e2..14991178116 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/statement/select/SelectStatementConverter.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/statement/select/SelectStatementConverter.java
@@ -60,7 +60,7 @@ public final class SelectStatementConverter implements
SQLStatementConverter<Sel
return orderBy.isEmpty() ? sqlCombine : new
SqlOrderBy(SqlParserPos.ZERO, sqlCombine, orderBy, null, null);
}
- private static SqlSelect convertSelect(final SelectStatement
selectStatement) {
+ private SqlSelect convertSelect(final SelectStatement selectStatement) {
SqlNodeList distinct = new
DistinctConverter().convert(selectStatement.getProjections()).orElse(null);
SqlNodeList projection = new
ProjectionsConverter().convert(selectStatement.getProjections()).orElseThrow(IllegalStateException::new);
SqlNode from = new
TableConverter().convert(selectStatement.getFrom()).orElse(null);
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/filter/FilterableSchema.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/filter/FilterableSchema.java
index ce7384b1e98..7738945d0c9 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/filter/FilterableSchema.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/filter/FilterableSchema.java
@@ -64,7 +64,7 @@ public final class FilterableSchema extends AbstractSchema {
return result;
}
- private static ViewTable getViewTable(final ShardingSphereSchema schema,
final DatabaseType protocolType, final ShardingSphereTable table, final
JavaTypeFactory javaTypeFactory) {
+ private ViewTable getViewTable(final ShardingSphereSchema schema, final
DatabaseType protocolType, final ShardingSphereTable table, final
JavaTypeFactory javaTypeFactory) {
RelDataType relDataType =
SQLFederationDataTypeUtils.createRelDataType(table, protocolType,
javaTypeFactory);
ShardingSphereView view = schema.getView(table.getName());
return new ViewTable(javaTypeFactory.getJavaClass(relDataType),
RelDataTypeImpl.proto(relDataType), view.getViewDefinition(),
Collections.emptyList(), Collections.emptyList());
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableSchema.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableSchema.java
index 049882d7bef..0795889639d 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableSchema.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableSchema.java
@@ -64,7 +64,7 @@ public final class TranslatableSchema extends AbstractSchema {
return result;
}
- private static ViewTable getViewTable(final ShardingSphereSchema schema,
final ShardingSphereTable table, final DatabaseType protocolType, final
JavaTypeFactory javaTypeFactory) {
+ private ViewTable getViewTable(final ShardingSphereSchema schema, final
ShardingSphereTable table, final DatabaseType protocolType, final
JavaTypeFactory javaTypeFactory) {
RelDataType relDataType =
SQLFederationDataTypeUtils.createRelDataType(table, protocolType,
javaTypeFactory);
ShardingSphereView view = schema.getView(table.getName());
return new ViewTable(javaTypeFactory.getJavaClass(relDataType),
RelDataTypeImpl.proto(relDataType), view.getViewDefinition(),
Collections.emptyList(), Collections.emptyList());
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
index 4720583b081..48ee9af0569 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java
@@ -91,7 +91,7 @@ class TransactionRuleTest {
assertThat(actual.getResource().getTransactionManager(TransactionType.XA),
instanceOf(ShardingSphereTransactionManagerFixture.class));
}
- private static ShardingSphereDatabase createDatabase() {
+ private ShardingSphereDatabase createDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class);
ShardingSphereResourceMetaData resourceMetaData =
createResourceMetaData();
when(result.getResourceMetaData()).thenReturn(resourceMetaData);
@@ -99,7 +99,7 @@ class TransactionRuleTest {
return result;
}
- private static ShardingSphereResourceMetaData createResourceMetaData() {
+ private ShardingSphereResourceMetaData createResourceMetaData() {
ShardingSphereResourceMetaData result =
mock(ShardingSphereResourceMetaData.class);
Map<String, DataSource> dataSourceMap = new LinkedHashMap<>(2, 1);
dataSourceMap.put("ds_0", new MockedDataSource());
@@ -112,7 +112,7 @@ class TransactionRuleTest {
return result;
}
- private static ShardingSphereDatabase createAddDatabase() {
+ private ShardingSphereDatabase createAddDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class);
ShardingSphereResourceMetaData resourceMetaData =
createAddResourceMetaData();
when(result.getResourceMetaData()).thenReturn(resourceMetaData);
@@ -120,7 +120,7 @@ class TransactionRuleTest {
return result;
}
- private static ShardingSphereResourceMetaData createAddResourceMetaData() {
+ private ShardingSphereResourceMetaData createAddResourceMetaData() {
ShardingSphereResourceMetaData result =
mock(ShardingSphereResourceMetaData.class);
Map<String, DataSource> dataSourceMap = new LinkedHashMap<>(2, 1);
dataSourceMap.put("ds_0", new MockedDataSource());
@@ -133,7 +133,7 @@ class TransactionRuleTest {
return result;
}
- private static TransactionRuleConfiguration
createTransactionRuleConfiguration() {
+ private TransactionRuleConfiguration createTransactionRuleConfiguration() {
TransactionRuleConfiguration result =
mock(TransactionRuleConfiguration.class);
when(result.getDefaultType()).thenReturn("XA");
when(result.getProviderType()).thenReturn("Atomikos");
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
index 3c2d145c4e9..bcaa8b1cd77 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
@@ -122,7 +122,7 @@ public final class ComputeNodeStateChangedWatcher
implements GovernanceWatcher<G
return Optional.empty();
}
- private static Matcher getShowProcessListTriggerMatcher(final
DataChangedEvent event) {
+ private Matcher getShowProcessListTriggerMatcher(final DataChangedEvent
event) {
return Pattern.compile(ComputeNode.getShowProcessListTriggerNodePath()
+ "/([\\S]+):([\\S]+)$", Pattern.CASE_INSENSITIVE).matcher(event.getKey());
}
@@ -140,7 +140,7 @@ public final class ComputeNodeStateChangedWatcher
implements GovernanceWatcher<G
return Optional.empty();
}
- private static Matcher getKillProcessTriggerMatcher(final DataChangedEvent
event) {
+ private Matcher getKillProcessTriggerMatcher(final DataChangedEvent event)
{
Pattern pattern =
Pattern.compile(ComputeNode.getKillProcessTriggerNodePath() +
"/([\\S]+):([\\S]+)$", Pattern.CASE_INSENSITIVE);
return pattern.matcher(event.getKey());
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
index 801a050d120..8123bdcbefb 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
@@ -161,7 +161,7 @@ class ProcessListChangedSubscriberTest {
assertThat(currentMillis, lessThanOrEqualTo(startMillis + 5000L));
}
- private static void waitUntilReleaseReady(final String lockId) {
+ private void waitUntilReleaseReady(final String lockId) {
ProcessOperationLockRegistry.getInstance().waitUntilReleaseReady(lockId, new
ProcessOperationLockReleaseStrategy() {
private final AtomicBoolean firstTime = new AtomicBoolean(true);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
index 22e875c0d9f..b5109a1329d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
@@ -229,7 +229,7 @@ public final class DatabaseConnector implements
DatabaseBackendHandler {
return executionContexts.stream().anyMatch(each ->
isWriteDMLStatement(each.getSqlStatementContext().getSqlStatement()));
}
- private static boolean isWriteDMLStatement(final SQLStatement
sqlStatement) {
+ private boolean isWriteDMLStatement(final SQLStatement sqlStatement) {
return sqlStatement instanceof DMLStatement && !(sqlStatement
instanceof SelectStatement);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
index fcf24be6758..c420775470b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
@@ -140,7 +140,7 @@ public final class ProxySQLExecutor {
return sqlStatement instanceof PostgreSQLStatement || sqlStatement
instanceof OpenGaussStatement;
}
- private static String getTableName(final ExecutionContext
executionContext) {
+ private String getTableName(final ExecutionContext executionContext) {
return executionContext.getSqlStatementContext() instanceof
TableAvailable && !((TableAvailable)
executionContext.getSqlStatementContext()).getAllTables().isEmpty()
? ((TableAvailable)
executionContext.getSqlStatementContext()).getAllTables().iterator().next().getTableName().getIdentifier().getValue()
: "unknown_table";
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index 13f5c2c6661..687e44c836f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -112,7 +112,7 @@ public abstract class ProxyJDBCExecutorCallback extends
JDBCExecutorCallback<Exe
return
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases().values().iterator().next().getProtocolType();
}
- private static Optional<DatabaseType> findConfiguredDatabaseType() {
+ private Optional<DatabaseType> findConfiguredDatabaseType() {
String configuredDatabaseType = ProxyContext.getInstance()
.getContextManager().getMetaDataContexts().getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
return configuredDatabaseType.isEmpty() ? Optional.empty() :
Optional.of(DatabaseTypeEngine.getTrunkDatabaseType(configuredDatabaseType));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
index 52c7d2d22b2..aa524faa90d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
@@ -76,7 +76,7 @@ public final class UpdateResponseHeader implements
ResponseHeader {
return lastInsertIds.isEmpty() ? 0 : getMinLastInsertId(lastInsertIds);
}
- private static long getMinLastInsertId(final List<Long> lastInsertIds) {
+ private long getMinLastInsertId(final List<Long> lastInsertIds) {
Collections.sort(lastInsertIds);
return lastInsertIds.iterator().next();
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
index 76e953d7eac..584ca758d67 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorFactoryTest.java
@@ -83,7 +83,7 @@ class DatabaseConnectorFactoryTest {
return result;
}
- private static ShardingSphereDatabase mockDatabase() {
+ private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.containsDataSource()).thenReturn(true);
when(result.isComplete()).thenReturn(true);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
index 87f749eec22..a467da6f533 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseBackendHandlerFactoryTest.java
@@ -80,7 +80,7 @@ class DatabaseBackendHandlerFactoryTest {
assertThat(actual, instanceOf(DatabaseConnector.class));
}
- private static SQLStatementContext<SQLStatement> mockSQLStatementContext()
{
+ private SQLStatementContext<SQLStatement> mockSQLStatementContext() {
SQLStatementContext<SQLStatement> result =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(result.getSqlStatement()).thenReturn(mock(SQLStatement.class));
when(result.getTablesContext().getSchemaNames()).thenReturn(Collections.emptyList());
@@ -97,7 +97,7 @@ class DatabaseBackendHandlerFactoryTest {
return result;
}
- private static ConnectionSession mockConnectionSession() {
+ private ConnectionSession mockConnectionSession() {
ConnectionSession result = mock(ConnectionSession.class);
when(result.getDatabaseName()).thenReturn("foo_db");
when(result.getDatabaseConnectionManager()).thenReturn(mock(ProxyDatabaseConnectionManager.class));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java
index f385382f4f8..5301ac26b0c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java
@@ -93,7 +93,7 @@ class RefreshTableMetaDataUpdaterTest {
assertThat(actual, instanceOf(UpdateResponseHeader.class));
}
- private static ConnectionSession mockConnectionSession(final String
databaseName) {
+ private ConnectionSession mockConnectionSession(final String databaseName)
{
ConnectionSession result = mock(ConnectionSession.class);
when(result.getDatabaseName()).thenReturn(databaseName);
return result;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
index dbde0d6f411..8fbb2e484c0 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
@@ -67,7 +67,7 @@ class RuleDefinitionBackendHandlerTest {
return result;
}
- private static ShardingSphereDatabase mockDatabase() {
+ private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
ShardingSphereRuleMetaData ruleMetaData =
mock(ShardingSphereRuleMetaData.class, RETURNS_DEEP_STUBS);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.emptyList());
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/context/HBaseRegionWarmUpContext.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/context/HBaseRegionWarmUpContext.java
index 80cc8f7d7c0..db96f40bc46 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/context/HBaseRegionWarmUpContext.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/context/HBaseRegionWarmUpContext.java
@@ -104,7 +104,7 @@ public final class HBaseRegionWarmUpContext {
}
}
- private static void warmUpRegion(final RegionLocator regionLocator) throws
IOException {
+ private void warmUpRegion(final RegionLocator regionLocator) throws
IOException {
regionLocator.getAllRegionLocations();
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
index f8e2d3e88c5..0d2cab7f4bc 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
@@ -81,11 +81,11 @@ public final class ShowProcessListExecutor implements
DatabaseAdminQueryExecutor
if (null == processes || processes.isEmpty()) {
return new RawMemoryQueryResult(queryResultMetaData,
Collections.emptyList());
}
- List<MemoryQueryResultDataRow> rows =
processes.stream().map(ShowProcessListExecutor::getMemoryQueryResultDataRow).collect(Collectors.toList());
+ List<MemoryQueryResultDataRow> rows =
processes.stream().map(this::getMemoryQueryResultDataRow).collect(Collectors.toList());
return new RawMemoryQueryResult(queryResultMetaData, rows);
}
- private static MemoryQueryResultDataRow getMemoryQueryResultDataRow(final
Process process) {
+ private MemoryQueryResultDataRow getMemoryQueryResultDataRow(final Process
process) {
List<Object> rowValues = new ArrayList<>(8);
rowValues.add(process.getId());
rowValues.add(process.getUsername());
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
index 7e47b590c9e..f110d7c0314 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
@@ -130,7 +130,7 @@ class PostgreSQLAdminExecutorCreatorTest {
assertFalse(actual.isPresent());
}
- private static SQLStatement parseSQL(final String sql) {
+ private SQLStatement parseSQL(final String sql) {
CacheOption cacheOption = new CacheOption(0, 0);
SQLParserRule sqlParserRule = new SQLParserRule(new
SQLParserRuleConfiguration(false, cacheOption, cacheOption));
return sqlParserRule.getSQLParserEngine("PostgreSQL").parse(sql,
false);
diff --git
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
index 51c09f4c3ae..caee9fc6182 100644
---
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
+++
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersionTest.java
@@ -84,7 +84,7 @@ class ShardingSphereProxyVersionTest {
return result;
}
- private static DataSource createDataSource(final String
databaseProductName, final String databaseProductVersion) throws SQLException {
+ private DataSource createDataSource(final String databaseProductName,
final String databaseProductVersion) throws SQLException {
DataSource result = mock(DataSource.class);
Connection connection = mock(Connection.class);
DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class);
diff --git
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecutorFactoryTest.java
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecutorFactoryTest.java
index d7ff40530ea..424424b4adc 100644
---
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecutorFactoryTest.java
+++
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecutorFactoryTest.java
@@ -150,7 +150,7 @@ class OpenGaussCommandExecutorFactoryTest {
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private static List<CommandExecutor>
getExecutorsFromAggregatedCommandExecutor(final
PostgreSQLAggregatedCommandExecutor executor) {
+ private List<CommandExecutor>
getExecutorsFromAggregatedCommandExecutor(final
PostgreSQLAggregatedCommandExecutor executor) {
return (List<CommandExecutor>)
Plugins.getMemberAccessor().get(PostgreSQLAggregatedCommandExecutor.class.getDeclaredField("executors"),
executor);
}
}
diff --git
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
index 1e6e2f86406..90305e367dd 100644
---
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
+++
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
@@ -132,7 +132,7 @@ class OpenGaussComBatchBindExecutorTest {
return result;
}
- private static ShardingSphereDatabase mockDatabase() {
+ private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResourceMetaData().getAllInstanceDataSourceNames()).thenReturn(Collections.singletonList("foo_ds"));
when(result.getResourceMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("foo_ds",
new OpenGaussDatabaseType()));
diff --git
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/err/OpenGaussErrorPacketFactoryTest.java
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/err/OpenGaussErrorPacketFactoryTest.java
index bfa90c0c386..f38c50e9d8a 100644
---
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/err/OpenGaussErrorPacketFactoryTest.java
+++
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/err/OpenGaussErrorPacketFactoryTest.java
@@ -83,7 +83,7 @@ class OpenGaussErrorPacketFactoryTest {
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private static Map<Character, String> getFieldsInPacket(final
OpenGaussErrorResponsePacket packet) {
+ private Map<Character, String> getFieldsInPacket(final
OpenGaussErrorResponsePacket packet) {
return (Map<Character, String>)
Plugins.getMemberAccessor().get(OpenGaussErrorResponsePacket.class.getDeclaredField("fields"),
packet);
}
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
index aa7922f145f..01214502b51 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
@@ -172,7 +172,7 @@ public final class PostgreSQLComDescribeExecutor implements
CommandExecutor {
return database.getSchema(schemaName).getTable(logicTableName);
}
- private static List<String> getColumnNamesOfInsertStatement(final
InsertStatement insertStatement, final ShardingSphereTable table) {
+ private List<String> getColumnNamesOfInsertStatement(final InsertStatement
insertStatement, final ShardingSphereTable table) {
return insertStatement.getColumns().isEmpty() ? table.getColumnNames()
: insertStatement.getColumns().stream().map(each ->
each.getIdentifier().getValue()).collect(Collectors.toList());
}
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecutorFactoryTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecutorFactoryTest.java
index a0f9bf67b8d..0241c9f93e4 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecutorFactoryTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecutorFactoryTest.java
@@ -153,7 +153,7 @@ class PostgreSQLCommandExecutorFactoryTest {
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private static List<CommandExecutor>
getExecutorsFromAggregatedCommandExecutor(final
PostgreSQLAggregatedCommandExecutor executor) {
+ private List<CommandExecutor>
getExecutorsFromAggregatedCommandExecutor(final
PostgreSQLAggregatedCommandExecutor executor) {
return (List<CommandExecutor>)
Plugins.getMemberAccessor().get(PostgreSQLAggregatedCommandExecutor.class.getDeclaredField("executors"),
executor);
}
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index fd721e2e0bb..c84321eb2dd 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -1720,7 +1720,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
return JoinType.COMMA.name();
}
- private static String getNaturalJoinType(final NaturalJoinTypeContext ctx)
{
+ private String getNaturalJoinType(final NaturalJoinTypeContext ctx) {
if (null != ctx.LEFT()) {
return JoinType.LEFT.name();
} else if (null != ctx.RIGHT()) {
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
index f3f3ce461d0..1539dd150c6 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
@@ -1185,14 +1185,14 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
return JoinType.COMMA.name();
}
- private static String getOutJoinType(final OuterJoinTypeContext ctx) {
+ private String getOutJoinType(final OuterJoinTypeContext ctx) {
if (null != ctx.FULL()) {
return JoinType.FULL.name();
}
return null != ctx.LEFT() ? JoinType.LEFT.name() :
JoinType.RIGHT.name();
}
- private static String getNaturalJoinType(final NaturalJoinTypeContext ctx)
{
+ private String getNaturalJoinType(final NaturalJoinTypeContext ctx) {
if (null != ctx.INNER()) {
return JoinType.INNER.name();
}
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
index cd5ec52b9ba..89485425ab0 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
@@ -871,11 +871,8 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
return JoinType.RIGHT.name();
}
- private static String getInnerCrossJoinType(final
InnerCrossJoinClauseContext ctx) {
- if (null != ctx.CROSS()) {
- return JoinType.CROSS.name();
- }
- return JoinType.INNER.name();
+ private String getInnerCrossJoinType(final InnerCrossJoinClauseContext
ctx) {
+ return null == ctx.CROSS() ? JoinType.INNER.name() :
JoinType.CROSS.name();
}
private void visitSelectJoinSpecification(final
SelectJoinSpecificationContext ctx, final JoinTableSegment joinTableSource) {
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCasesLoader.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCasesLoader.java
index d7e08f2771e..599ea80f54e 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCasesLoader.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCasesLoader.java
@@ -79,7 +79,7 @@ public final class IntegrationTestCasesLoader {
return integrationTestCases;
}
- private static Collection<File> getFiles(final URL url) throws
IOException, URISyntaxException {
+ private Collection<File> getFiles(final URL url) throws IOException,
URISyntaxException {
Collection<File> result = new LinkedList<>();
Files.walkFileTree(Paths.get(url.toURI()), new
SimpleFileVisitor<Path>() {
@@ -94,7 +94,7 @@ public final class IntegrationTestCasesLoader {
return result;
}
- private static IntegrationTestCases unmarshal(final String
integrateCasesFile) throws IOException, JAXBException {
+ private IntegrationTestCases unmarshal(final String integrateCasesFile)
throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
return (IntegrationTestCases)
JAXBContext.newInstance(IntegrationTestCases.class).createUnmarshaller().unmarshal(reader);
}
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCasesLoader.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCasesLoader.java
index aa45a77cf7e..2141ae657bc 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCasesLoader.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCasesLoader.java
@@ -79,7 +79,7 @@ public final class IntegrationTestCasesLoader {
return integrationTestCases;
}
- private static Collection<File> getFiles(final URL url) throws
IOException, URISyntaxException {
+ private Collection<File> getFiles(final URL url) throws IOException,
URISyntaxException {
Collection<File> result = new LinkedList<>();
Files.walkFileTree(Paths.get(url.toURI()), new
SimpleFileVisitor<Path>() {
@@ -94,7 +94,7 @@ public final class IntegrationTestCasesLoader {
return result;
}
- private static IntegrationTestCases unmarshal(final String
integrateCasesFile) throws IOException, JAXBException {
+ private IntegrationTestCases unmarshal(final String integrateCasesFile)
throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
return (IntegrationTestCases)
JAXBContext.newInstance(IntegrationTestCases.class).createUnmarshaller().unmarshal(reader);
}
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCasesLoader.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCasesLoader.java
index 35668ffde9a..3bfbf853df0 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCasesLoader.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCasesLoader.java
@@ -78,7 +78,7 @@ public final class IntegrationTestCasesLoader {
return integrationTestCases;
}
- private static Collection<File> getFiles(final URL url) throws
IOException, URISyntaxException {
+ private Collection<File> getFiles(final URL url) throws IOException,
URISyntaxException {
Collection<File> result = new LinkedList<>();
Files.walkFileTree(Paths.get(url.toURI()), new
SimpleFileVisitor<Path>() {
@@ -93,7 +93,7 @@ public final class IntegrationTestCasesLoader {
return result;
}
- private static IntegrationTestCases unmarshal(final String
integrateCasesFile) throws IOException, JAXBException {
+ private IntegrationTestCases unmarshal(final String integrateCasesFile)
throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
return (IntegrationTestCases)
JAXBContext.newInstance(IntegrationTestCases.class).createUnmarshaller().unmarshal(reader);
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
index 2fca8cec79b..02301148f1f 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/NativeContainerComposer.java
@@ -82,7 +82,7 @@ public final class NativeContainerComposer extends
BaseContainerComposer {
}
}
- private static List<String> getFirstColumnValueFromResult(final ResultSet
resultSet) throws SQLException {
+ private List<String> getFirstColumnValueFromResult(final ResultSet
resultSet) throws SQLException {
List<String> result = new LinkedList<>();
while (resultSet.next()) {
result.add(resultSet.getString(1));
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
index 937e8c7b279..c6b9cf1ec82 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
@@ -18,6 +18,8 @@
package org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper;
import com.google.common.base.Strings;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -41,6 +43,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
public final class PipelineCaseHelper {
@@ -80,7 +83,7 @@ public final class PipelineCaseHelper {
Object orderId = keyGenerateAlgorithm.generateKey();
int randomUnsignedInt = generateInt(0, 100);
LocalDateTime now = LocalDateTime.now();
- Object[] addObjs = {orderId, generateInt(0, 100),
generateString(6) + "", randomInt, randomInt, randomInt,
+ Object[] addObjs = {orderId, generateInt(0, 100),
generateString(6), randomInt, randomInt, randomInt,
randomUnsignedInt, randomUnsignedInt,
randomUnsignedInt, randomUnsignedInt, generateFloat(), generateDouble(),
BigDecimal.valueOf(generateDouble()), now, now,
now.toLocalDate(), now.toLocalTime(), Year.now().getValue(), "1", "t", "e",
"s", "t", generateString(2),
emojiText, generateString(1), "1", "2",
generateJsonString(32, false)};
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
index c42fd4fe257..db5a3f301c0 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCasesLoader.java
@@ -86,7 +86,7 @@ public final class IntegrationTestCasesLoader {
return result;
}
- private static Collection<File> getFiles(final URL url, final
SQLCommandType sqlCommandType) throws IOException, URISyntaxException {
+ private Collection<File> getFiles(final URL url, final SQLCommandType
sqlCommandType) throws IOException, URISyntaxException {
Collection<File> result = new LinkedList<>();
Files.walkFileTree(Paths.get(url.toURI()), new
SimpleFileVisitor<Path>() {
@@ -105,7 +105,7 @@ public final class IntegrationTestCasesLoader {
return unmarshal(file.getPath()).getTestCases().stream().map(each ->
new IntegrationTestCaseContext(each,
file.getParent())).collect(Collectors.toList());
}
- private static IntegrationTestCases unmarshal(final String
integrateCasesFile) throws IOException, JAXBException {
+ private IntegrationTestCases unmarshal(final String integrateCasesFile)
throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
return (IntegrationTestCases)
JAXBContext.newInstance(IntegrationTestCases.class).createUnmarshaller().unmarshal(reader);
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
index d8d72a2d59d..7f5a2c525fb 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
@@ -163,8 +163,8 @@ public abstract class BaseDQLE2EIT {
return getExpectedRowAndRemoveMayNotExistRow(actual,
notAssertionColumns, actualMetaData, expected, rowCount);
}
- private static boolean isMoveToNextExpectedRow(final ResultSet actual,
final Collection<String> notAssertionColumns, final ResultSetMetaData
actualMetaData,
- final List<DataSetRow>
expected, final int rowCount) throws SQLException {
+ private boolean isMoveToNextExpectedRow(final ResultSet actual, final
Collection<String> notAssertionColumns, final ResultSetMetaData actualMetaData,
+ final List<DataSetRow> expected,
final int rowCount) throws SQLException {
int columnIndex = 1;
for (String each : expected.get(rowCount).splitValues("|")) {
String columnLabel = actualMetaData.getColumnLabel(columnIndex);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
index af244a2f786..dd58d80575d 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java
@@ -176,7 +176,7 @@ public final class E2ETestParameterGenerator {
.map(each -> new CaseTestParameter(testCaseContext, adapter,
each, envMode, databaseType, sqlCommandType)).collect(Collectors.toList());
}
- private static Collection<DatabaseType> getDatabaseTypes(final String
databaseTypes) {
+ private Collection<DatabaseType> getDatabaseTypes(final String
databaseTypes) {
String candidates = Strings.isNullOrEmpty(databaseTypes) ?
"H2,MySQL,Oracle,SQLServer,PostgreSQL,openGauss" : databaseTypes;
return
Splitter.on(',').trimResults().splitToList(candidates).stream().map(each ->
TypedSPILoader.getService(DatabaseType.class,
each)).collect(Collectors.toList());
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalSQLParserTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalSQLParserTestParameterLoader.java
index 39450ec4522..59be173c54d 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalSQLParserTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/ExternalSQLParserTestParameterLoader.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.it.sql.parser.external.loader;
-import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserTestParameter;
import org.apache.shardingsphere.test.loader.AbstractTestParameterLoader;
import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
@@ -28,7 +27,6 @@ import java.util.LinkedList;
/**
* External SQL parser test parameter loader.
*/
-@Slf4j
public final class ExternalSQLParserTestParameterLoader extends
AbstractTestParameterLoader<ExternalSQLParserTestParameter> {
public ExternalSQLParserTestParameterLoader(final
TestParameterLoadStrategy loadStrategy) {
@@ -73,22 +71,22 @@ public final class ExternalSQLParserTestParameterLoader
extends AbstractTestPara
return result;
}
- private static boolean isInProcedure(final boolean inProcedure, final
String statementLines) {
+ private boolean isInProcedure(final boolean inProcedure, final String
statementLines) {
if (statementLines.contains("{") && statementLines.contains("}")) {
return inProcedure;
}
return (statementLines.contains("{") || statementLines.contains("}")
|| statementLines.contains("$$")) != inProcedure;
}
- private static String getStatement(final String completedSQL, final String
rawSQLLine, final boolean inProcedure) {
+ private String getStatement(final String completedSQL, final String
rawSQLLine, final boolean inProcedure) {
return (rawSQLLine.isEmpty() || isComment(rawSQLLine)) && !inProcedure
? "" : completedSQL + rawSQLLine + " ";
}
- private static boolean isComment(final String statement) {
+ private boolean isComment(final String statement) {
return statement.startsWith("#") || statement.startsWith("/") ||
statement.startsWith("--") || statement.startsWith(":") ||
statement.startsWith("\\");
}
- private static int searchInResultContent(final int resultIndex, final
String[] resultLines, final String completedSQL, final int statementLines) {
+ private int searchInResultContent(final int resultIndex, final String[]
resultLines, final String completedSQL, final int statementLines) {
int index = resultIndex;
while (index < resultLines.length &&
!completedSQL.startsWith(resultLines[index].trim())) {
index++;
diff --git
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
index bb32604b51e..5625b58b83f 100644
---
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
+++
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
@@ -151,7 +151,7 @@ public abstract class SQLRewriterIT {
return new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), mock(ConfigurationProperties.class));
}
- private static Map<String, DatabaseType> createStorageTypes(final
DatabaseConfiguration databaseConfig, final DatabaseType databaseType) {
+ private Map<String, DatabaseType> createStorageTypes(final
DatabaseConfiguration databaseConfig, final DatabaseType databaseType) {
Map<String, DatabaseType> result = new
LinkedHashMap<>(databaseConfig.getDataSources().size(), 1);
for (Entry<String, DataSource> entry :
databaseConfig.getDataSources().entrySet()) {
result.put(entry.getKey(), databaseType);
