This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 44e5d3c29c9 Bump Checkstyle to version `14.0.0` (#39654)
44e5d3c29c9 is described below
commit 44e5d3c29c981e42f4f3f86c2242f67404beee99
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 30 21:30:26 2026 +0800
Bump Checkstyle to version `14.0.0` (#39654)
Pin the required Checkstyle job to JDK 21 while keeping Java 8 source
compatibility for normal builds.
Remove the obsolete JavadocStyle module, resolve violations exposed by
Checkstyle 14, and document the local final exception required by
Checkstyle.
---
.github/workflows/required-check.yml | 4 ++++
CODE_OF_CONDUCT.md | 2 +-
.../protocol/mysql/payload/MySQLPacketPayloadTest.java | 12 ++++++------
.../bind/protocol/util/PostgreSQLBinaryTimestampUtils.java | 2 +-
docs/community/content/involved/conduct/code.cn.md | 2 +-
docs/community/content/involved/conduct/code.en.md | 2 +-
.../rewriter/EncryptAssignmentParameterRewriter.java | 2 +-
...ptInsertOnDuplicateKeyUpdateValueParameterRewriter.java | 3 +--
.../rewriter/EncryptInsertValueParameterRewriter.java | 2 +-
.../assignment/EncryptInsertAssignmentTokenGenerator.java | 2 +-
.../insert/EncryptInsertOnUpdateTokenGenerator.java | 2 +-
.../insert/EncryptInsertValuesTokenGenerator.java | 2 +-
.../generator/impl/ShardingInsertValuesTokenGenerator.java | 2 +-
.../reviser/schema/SchemaMetaDataReviseEngineTest.java | 4 ++--
.../pool/creator/DataSourcePoolReflectionTest.java | 4 ++--
.../database/DatabaseRuleDefinitionExecuteEngineTest.java | 12 ++++++------
.../infra/rewrite/engine/RouteSQLRewriteEngine.java | 2 +-
.../pipeline/core/job/service/PipelineJobManagerTest.java | 2 +-
.../ingest/incremental/client/MySQLBinlogClientTest.java | 2 +-
.../incremental/dumper/OpenGaussIncrementalDumperTest.java | 2 +-
.../sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java | 2 +-
.../shardingsphere/data/pipeline/cdc/CDCJobTest.java | 4 ++--
.../data/pipeline/cdc/api/CDCJobAPITest.java | 2 +-
.../task/ConsistencyCheckTasksRunnerTest.java | 14 +++++++-------
.../sqlfederation/engine/SQLFederationEngineTest.java | 6 +++---
.../implementor/EnumerableScanImplementorTest.java | 2 +-
.../metadata/manager/resource/StorageUnitManagerTest.java | 6 +++---
pom.xml | 2 +-
.../proxy/backend/connector/ProxySQLExecutorTest.java | 2 +-
.../backend/handler/ProxyBackendHandlerFactoryTest.java | 4 ++--
.../type/BeginTransactionProxyBackendHandlerTest.java | 6 +++---
.../tcl/local/type/CommitProxyBackendHandlerTest.java | 4 ++--
.../type/ReleaseSavepointProxyBackendHandlerTest.java | 6 +++---
.../type/RollbackSavepointProxyBackendHandlerTest.java | 6 +++---
.../local/type/SetAutoCommitProxyBackendHandlerTest.java | 8 ++++----
.../local/type/SetSavepointProxyBackendHandlerTest.java | 6 +++---
.../proxy/backend/util/MetaDataImportExecutorTest.java | 2 +-
.../admin/executor/MySQLSetVariableAdminExecutorTest.java | 2 +-
.../executor/PostgreSQLResetVariableAdminExecutorTest.java | 2 +-
.../executor/PostgreSQLSetVariableAdminExecutorTest.java | 2 +-
.../authentication/MySQLAuthenticationEngineTest.java | 2 +-
src/resources/checkstyle.xml | 1 -
.../test/it/rewriter/engine/SQLRewriterIT.java | 6 +++---
43 files changed, 83 insertions(+), 81 deletions(-)
diff --git a/.github/workflows/required-check.yml
b/.github/workflows/required-check.yml
index 4d21ed3d513..cfee96e41da 100644
--- a/.github/workflows/required-check.yml
+++ b/.github/workflows/required-check.yml
@@ -42,6 +42,10 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/[email protected]
+ - uses: actions/[email protected]
+ with:
+ distribution: 'temurin'
+ java-version: '21'
- name: Run CheckStyle
run: ./mvnw checkstyle:check -Pcheck -T1C
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 156fa68cba6..233f0a95597 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -52,7 +52,7 @@ The following code of conduct is based on full compliance
with the [Apache Softw
- In `equals` and `==` conditional expressions, constants on the left,
variables on the right; in conditional expressions like greater than or less
than, variables on the left, constants on the right.
- Avoid using `this` modifier except for assignment statements where
constructor parameters have the same name as global variables.
- For parameters, use `final` only on method parameters, constructor
parameters and `catch` parameters.
-- Local variables should not be set as `final`, including ordinary local
declarations, loop variables, enhanced `for` variables and try-with-resources
resources.
+- Local variables should not be set as `final`, including ordinary local
declarations, loop variables, enhanced `for` variables and try-with-resources
resources, unless required by Checkstyle.
- Lambda parameters should not be marked as `final` unless required by
surrounding code style or tooling.
- Try to design classes as `final` except for abstract classes used for
inheritance.
- Nested loops should be extracted into methods.
diff --git
a/database/protocol/dialect/mysql/src/test/java/org/apache/shardingsphere/database/protocol/mysql/payload/MySQLPacketPayloadTest.java
b/database/protocol/dialect/mysql/src/test/java/org/apache/shardingsphere/database/protocol/mysql/payload/MySQLPacketPayloadTest.java
index 91bf9453104..cb0c7e555f1 100644
---
a/database/protocol/dialect/mysql/src/test/java/org/apache/shardingsphere/database/protocol/mysql/payload/MySQLPacketPayloadTest.java
+++
b/database/protocol/dialect/mysql/src/test/java/org/apache/shardingsphere/database/protocol/mysql/payload/MySQLPacketPayloadTest.java
@@ -163,23 +163,23 @@ class MySQLPacketPayloadTest {
@Test
void assertWriteIntLenencWithTwoBytes() {
- new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) (Math.pow(2D, 16D)) - 1L);
+ new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) Math.pow(2D, 16D) - 1L);
verify(byteBuf).writeByte(0xfc);
- verify(byteBuf).writeShortLE((int) (Math.pow(2D, 16D)) - 1);
+ verify(byteBuf).writeShortLE((int) Math.pow(2D, 16D) - 1);
}
@Test
void assertWriteIntLenencWithThreeBytes() {
- new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) (Math.pow(2D, 24D)) - 1L);
+ new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) Math.pow(2D, 24D) - 1L);
verify(byteBuf).writeByte(0xfd);
- verify(byteBuf).writeMediumLE((int) (Math.pow(2D, 24D)) - 1);
+ verify(byteBuf).writeMediumLE((int) Math.pow(2D, 24D) - 1);
}
@Test
void assertWriteIntLenencWithFourBytes() {
- new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) (Math.pow(2D, 25D)) - 1L);
+ new MySQLPacketPayload(byteBuf,
StandardCharsets.UTF_8).writeIntLenenc((long) Math.pow(2D, 25D) - 1L);
verify(byteBuf).writeByte(0xfe);
- verify(byteBuf).writeLongLE((int) (Math.pow(2D, 25D)) - 1L);
+ verify(byteBuf).writeLongLE((int) Math.pow(2D, 25D) - 1L);
}
@Test
diff --git
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/PostgreSQLBinaryTimestampUtils.java
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/PostgreSQLBinaryTimestampUtils.java
index 6193c6c4454..4a563ae4a4e 100644
---
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/PostgreSQLBinaryTimestampUtils.java
+++
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/PostgreSQLBinaryTimestampUtils.java
@@ -41,7 +41,7 @@ public final class PostgreSQLBinaryTimestampUtils {
* @return PostgreSQL time
*/
public static long toPostgreSQLTime(final Timestamp timestamp) {
- long millis = timestamp.getTime() - (timestamp.getNanos() / 1000000L)
+ (TimeZone.getDefault().getRawOffset());
+ long millis = timestamp.getTime() - (timestamp.getNanos() / 1000000L)
+ TimeZone.getDefault().getRawOffset();
long nanos = timestamp.getNanos() / 1000L;
long pgSeconds = convertJavaEpochToPgEpoch(millis / 1000L);
if (nanos >= 1000000L) {
diff --git a/docs/community/content/involved/conduct/code.cn.md
b/docs/community/content/involved/conduct/code.cn.md
index e244f12afc3..2ee32d2d0bb 100644
--- a/docs/community/content/involved/conduct/code.cn.md
+++ b/docs/community/content/involved/conduct/code.cn.md
@@ -56,7 +56,7 @@ chapter = true
- `equals` 和 `==` 条件表达式中，常量在左，变量在右；大于小于等条件表达式中，变量在左，常量在右。
- 除了构造器入参与全局变量名称相同的赋值语句外，避免使用 `this` 修饰符。
- 对参数使用 `final` 时，仅用于方法入参、构造器入参以及 `catch` 参数。
- - 局部变量不应设置为 `final`，包括普通局部变量声明、循环变量、增强 `for` 变量和 try-with-resources 资源变量。
+ - 局部变量不应设置为 `final`，包括普通局部变量声明、循环变量、增强 `for` 变量和 try-with-resources
资源变量，Checkstyle 明确要求的情况除外。
- Lambda 参数不应标记为 `final`，除非周边代码风格或工具明确要求。
- 除了用于继承的抽象类之外，尽量将类设计为 `final`。
- 嵌套循环尽量提成方法。
diff --git a/docs/community/content/involved/conduct/code.en.md
b/docs/community/content/involved/conduct/code.en.md
index f5aaff1d5ac..5a86c7c3a57 100644
--- a/docs/community/content/involved/conduct/code.en.md
+++ b/docs/community/content/involved/conduct/code.en.md
@@ -56,7 +56,7 @@ The following code of conduct is based on full compliance
with the [Apache Softw
- In `equals` and `==` conditional expressions, constants on the left,
variables on the right; in conditional expressions like greater than or less
than, variables on the left, constants on the right.
- Avoid using `this` modifier except for assignment statements where
constructor parameters have the same name as global variables.
- For parameters, use `final` only on method parameters, constructor
parameters and `catch` parameters.
-- Local variables should not be set as `final`, including ordinary local
declarations, loop variables, enhanced `for` variables and try-with-resources
resources.
+- Local variables should not be set as `final`, including ordinary local
declarations, loop variables, enhanced `for` variables and try-with-resources
resources, unless required by Checkstyle.
- Lambda parameters should not be marked as `final` unless required by
surrounding code style or tooling.
- Try to design classes as `final` except for abstract classes used for
inheritance.
- Nested loops should be extracted into methods.
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
index e931e193dcc..bcc31e653af 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
@@ -59,7 +59,7 @@ public final class EncryptAssignmentParameterRewriter
implements ParameterRewrit
return true;
}
if (sqlStatementContext instanceof InsertStatementContext) {
- return (((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getSetAssignment().isPresent();
+ return ((InsertStatementContext)
sqlStatementContext).getSqlStatement().getSetAssignment().isPresent();
}
return false;
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
index d3002a7353b..162d6599d41 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
@@ -47,8 +47,7 @@ public final class
EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
@Override
public boolean isNeedRewrite(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext
- && (((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getOnDuplicateKeyColumns().isPresent();
+ return sqlStatementContext instanceof InsertStatementContext &&
((InsertStatementContext)
sqlStatementContext).getSqlStatement().getOnDuplicateKeyColumns().isPresent();
}
@Override
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
index 60a22389a2a..6f2eebdfda7 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
@@ -50,7 +50,7 @@ public final class EncryptInsertValueParameterRewriter
implements ParameterRewri
@Override
public boolean isNeedRewrite(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext &&
!(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getSetAssignment().isPresent()
+ return sqlStatementContext instanceof InsertStatementContext &&
!((InsertStatementContext)
sqlStatementContext).getSqlStatement().getSetAssignment().isPresent()
&& null == ((InsertStatementContext)
sqlStatementContext).getInsertSelectContext();
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/assignment/EncryptInsertAssignmentTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/assignment/EncryptInsertAssignmentTokenGenerator.java
index 8ec4e031741..4e04adab180 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/assignment/EncryptInsertAssignmentTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/assignment/EncryptInsertAssignmentTokenGenerator.java
@@ -44,7 +44,7 @@ public final class EncryptInsertAssignmentTokenGenerator
implements CollectionSQ
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext &&
(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getSetAssignment().isPresent()
+ return sqlStatementContext instanceof InsertStatementContext &&
((InsertStatementContext)
sqlStatementContext).getSqlStatement().getSetAssignment().isPresent()
&&
containsEncryptTable(sqlStatementContext.getTablesContext().getSimpleTables());
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
index 8a7e2d56c74..75d89e2ba63 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
@@ -67,7 +67,7 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext &&
(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getOnDuplicateKeyColumns().isPresent();
+ return sqlStatementContext instanceof InsertStatementContext &&
((InsertStatementContext)
sqlStatementContext).getSqlStatement().getOnDuplicateKeyColumns().isPresent();
}
@Override
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
index 608d10986de..c6b453496eb 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
@@ -79,7 +79,7 @@ public final class EncryptInsertValuesTokenGenerator
implements OptionalSQLToken
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext &&
!(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getValues().isEmpty();
+ return sqlStatementContext instanceof InsertStatementContext &&
!((InsertStatementContext)
sqlStatementContext).getSqlStatement().getValues().isEmpty();
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
index 966213346ad..d642915ec07 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
@@ -48,7 +48,7 @@ public final class ShardingInsertValuesTokenGenerator
implements OptionalSQLToke
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof InsertStatementContext &&
!(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getValues().isEmpty();
+ return sqlStatementContext instanceof InsertStatementContext &&
!((InsertStatementContext)
sqlStatementContext).getSqlStatement().getValues().isEmpty();
}
@Override
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
index d9b04bde2c8..08cec6eda49 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
@@ -99,8 +99,8 @@ class SchemaMetaDataReviseEngineTest {
SchemaMetaData schemaMetaData = new SchemaMetaData("foo_schema",
Collections.singleton(actualTableMetaData));
ShardingSphereTable candidateTable = new ShardingSphereTable(
"logic_tbl", Collections.emptyList(),
Collections.singleton(new ShardingSphereIndex("logic_idx",
Collections.singleton("foo_col"), true)), Collections.emptyList());
- ShardingSphereSchema candidateSchema = new
ShardingSphereSchema("foo_schema", mock(),
Collections.singleton(candidateTable), Collections.emptyList());
- ShardingSphereSchema ignoredCandidateSchema = new
ShardingSphereSchema("bar_schema", mock(),
Collections.singleton(candidateTable), Collections.emptyList());
+ final ShardingSphereSchema candidateSchema = new
ShardingSphereSchema("foo_schema", mock(),
Collections.singleton(candidateTable), Collections.emptyList());
+ final ShardingSphereSchema ignoredCandidateSchema = new
ShardingSphereSchema("bar_schema", mock(),
Collections.singleton(candidateTable), Collections.emptyList());
FixtureGlobalRule rule = new FixtureGlobalRule();
MetaDataReviseEntry<FixtureGlobalRule> reviseEntry =
mock(MetaDataReviseEntry.class);
IndexReviser<FixtureGlobalRule> indexReviser =
mock(IndexReviser.class);
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflectionTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflectionTest.java
index 96c93830b07..2ff7b4d46d8 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflectionTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflectionTest.java
@@ -133,8 +133,6 @@ class DataSourcePoolReflectionTest {
void
assertAddDefaultDataSourcePoolPropertiesWithDefaultQueryProperties(final String
name, final Properties jdbcUrlProperties,
final Properties queryProperties, final Properties defaultQueryProps, final
Properties expectedJdbcUrlProps) {
DataSourcePoolReflectionFixture dataSource = new
DataSourcePoolReflectionFixture();
- DataSourcePoolMetaData metaData = mockDataSourcePoolMetaData();
- DatabaseType databaseType = mock(DatabaseType.class);
ConnectionProperties connectionProperties =
mock(ConnectionProperties.class);
dataSource.setUrl("jdbc:mock://127.0.0.1/foo_ds");
dataSource.setJdbcUrlProperties(jdbcUrlProperties);
@@ -142,6 +140,8 @@ class DataSourcePoolReflectionTest {
ConnectionPropertiesParser connectionPropertiesParser =
mock(ConnectionPropertiesParser.class);
when(connectionPropertiesParser.parse("jdbc:mock://127.0.0.1/foo_ds",
null, null)).thenReturn(connectionProperties);
DialectDefaultQueryPropertiesProvider defaultQueryPropsProvider =
mock(DialectDefaultQueryPropertiesProvider.class);
+ DataSourcePoolMetaData metaData = mockDataSourcePoolMetaData();
+ DatabaseType databaseType = mock(DatabaseType.class);
try (
MockedStatic<TypedSPILoader> typedSPILoader =
mockStatic(TypedSPILoader.class);
MockedStatic<DatabaseTypedSPILoader> databaseTypedSPILoader =
mockStatic(DatabaseTypedSPILoader.class);
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngineTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngineTest.java
index c470fc479a8..ee502d5f6f7 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngineTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngineTest.java
@@ -47,10 +47,10 @@ class DatabaseRuleDefinitionExecuteEngineTest {
@MethodSource("assertExecuteUpdateWithRefreshRequiredArguments")
void assertExecuteUpdateWithRefreshRequired(final String name, final
boolean dropExecutor, final boolean currentRuleExists,
final boolean
hasAnyOneToBeDropped, final boolean expectedNullCurrentRuleConfig) {
- ContextManager contextManager = mock(ContextManager.class);
+ final ContextManager contextManager = mock(ContextManager.class);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
RuleMetaData ruleMetaData = mock(RuleMetaData.class);
- DatabaseRuleOperator operator = mock(DatabaseRuleOperator.class);
+ final DatabaseRuleOperator operator = mock(DatabaseRuleOperator.class);
ShardingSphereRule rule = mock(ShardingSphereRule.class);
DatabaseRuleDropExecutor dropExecutorInstance = dropExecutor ?
mock(DatabaseRuleDropExecutor.class) : null;
DatabaseRuleDefinitionExecutor executor = null == dropExecutorInstance
? mock(DatabaseRuleDefinitionExecutor.class) : dropExecutorInstance;
@@ -77,8 +77,8 @@ class DatabaseRuleDefinitionExecuteEngineTest {
@Test
void assertExecuteUpdateWithoutCurrentRuleForDropExecutor() {
- DatabaseRuleDefinitionStatement sqlStatement =
mock(DatabaseRuleDefinitionStatement.class);
- ContextManager contextManager = mock(ContextManager.class);
+ final DatabaseRuleDefinitionStatement sqlStatement =
mock(DatabaseRuleDefinitionStatement.class);
+ final ContextManager contextManager = mock(ContextManager.class);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
RuleMetaData ruleMetaData = mock(RuleMetaData.class);
DatabaseRuleDropExecutor executor =
mock(DatabaseRuleDropExecutor.class);
@@ -95,8 +95,8 @@ class DatabaseRuleDefinitionExecuteEngineTest {
@Test
void assertExecuteUpdateWithoutDroppedDataForDropExecutor() {
- DatabaseRuleDefinitionStatement sqlStatement =
mock(DatabaseRuleDefinitionStatement.class);
- ContextManager contextManager = mock(ContextManager.class);
+ final DatabaseRuleDefinitionStatement sqlStatement =
mock(DatabaseRuleDefinitionStatement.class);
+ final ContextManager contextManager = mock(ContextManager.class);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
RuleMetaData ruleMetaData = mock(RuleMetaData.class);
ShardingSphereRule rule = mock(ShardingSphereRule.class);
diff --git
a/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
index e55270db323..2b341663a0a 100644
---
a/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
+++
b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
@@ -141,7 +141,7 @@ public final class RouteSQLRewriteEngine {
Collection<String> sql = new LinkedList<>();
List<Object> params = new LinkedList<>();
boolean containsDollarMarker =
sqlRewriteContext.getSqlStatementContext() instanceof SelectStatementContext
- && ((SelectStatementContext)
(sqlRewriteContext.getSqlStatementContext())).isContainsDollarParameterMarker();
+ && ((SelectStatementContext)
sqlRewriteContext.getSqlStatementContext()).isContainsDollarParameterMarker();
for (RouteUnit each : routeUnits) {
sql.add(SQLUtils.trimSemicolon(new
SQLBuilderEngine(sqlRewriteContext, each).buildSQL()));
if (containsDollarMarker && !params.isEmpty()) {
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManagerTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManagerTest.java
index f5aedce9051..362e487e88b 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManagerTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManagerTest.java
@@ -49,7 +49,7 @@ class PipelineJobManagerTest {
@Test
@SuppressWarnings({"rawtypes", "unchecked"})
void assertGetJobInfosSkipsMissingJobConfiguration() {
- PipelineContextKey contextKey = new
PipelineContextKey(InstanceType.PROXY);
+ final PipelineContextKey contextKey = new
PipelineContextKey(InstanceType.PROXY);
JobStatisticsAPI jobStatisticsAPI = mock(JobStatisticsAPI.class);
when(jobStatisticsAPI.getAllJobsBriefInfo()).thenReturn(Arrays.asList(createJobBriefInfo("j0101p0000_active"),
createJobBriefInfo("j0101p0000_missing")));
PipelineJobType jobType = mock(PipelineJobType.class);
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
index 4ede21770ae..ed2e762ad1d 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
@@ -349,7 +349,7 @@ class MySQLBinlogClientTest {
@Test
void assertMySQLCommandResponseHandlerBranches() throws Exception {
- AtomicReference<ChannelInitializer<SocketChannel>> initializer = new
AtomicReference<>();
+ final AtomicReference<ChannelInitializer<SocketChannel>> initializer =
new AtomicReference<>();
SocketChannel socketChannel = mock(SocketChannel.class,
RETURNS_DEEP_STUBS);
when(socketChannel.pipeline()).thenReturn(pipeline);
when(channelFuture.channel()).thenReturn(channel);
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/dumper/OpenGaussIncrementalDumperTest.java
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/dumper/OpenGaussIncrementalDumperTest.java
index 90f16cf2cd2..387799e8ae6 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/dumper/OpenGaussIncrementalDumperTest.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/incremental/dumper/OpenGaussIncrementalDumperTest.java
@@ -110,7 +110,7 @@ class OpenGaussIncrementalDumperTest {
PipelineChannel channel = new MemoryPipelineChannel(10, records -> {
});
OpenGaussIncrementalDumper dumper = new
OpenGaussIncrementalDumper(createDumperContext(false), position, channel,
mock());
- AtomicReference<Boolean> running = getRunningState(dumper);
+ final AtomicReference<Boolean> running = getRunningState(dumper);
OpenGaussLogicalReplication logicalReplication =
mock(OpenGaussLogicalReplication.class);
Plugins.getMemberAccessor().set(OpenGaussIncrementalDumper.class.getDeclaredField("logicalReplication"),
dumper, logicalReplication);
IncrementalDumperContext dumperContext = getDumperContext(dumper);
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
index e6c1a92b8f6..367c6a9b2b0 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java
@@ -138,7 +138,7 @@ class PostgreSQLPipelineSQLBuilderTest {
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getDatabaseMajorVersion()).thenReturn(10);
when(connection.getMetaData().getDatabaseMinorVersion()).thenReturn(1);
- DataSource dataSource = new MockedDataSource(connection);
+ final DataSource dataSource = new MockedDataSource(connection);
Collection<Map<String, Object>> columns = new ArrayList<>(3);
Map<String, Object> arrayColumn = new HashMap<>(2, 1F);
arrayColumn.put("cltype", "int4[]");
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTest.java
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTest.java
index 44878e176cb..6453434abc4 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTest.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTest.java
@@ -187,9 +187,9 @@ class CDCJobTest {
void assertExecuteInventorySuccessAndSkipIncrementalWhenRunning() {
CDCJobConfiguration jobConfig = mockJobConfiguration(
Collections.singletonList(new
JobDataNodeLine(Collections.singletonList(new JobDataNodeEntry("logic_tbl",
Collections.singletonList(new DataNode("ds_0.tbl_0")))))));
- ShardingContext shardingContext = mockShardingContext("jobParam");
+ final ShardingContext shardingContext =
mockShardingContext("jobParam");
prepareJobTypeAndContext(jobConfig);
- PipelineProcessConfiguration processConfig = new
PipelineProcessConfiguration(new PipelineReadConfiguration(1, 1, 1, null),
+ final PipelineProcessConfiguration processConfig = new
PipelineProcessConfiguration(new PipelineReadConfiguration(1, 1, 1, null),
new PipelineWriteConfiguration(1, 1, new
AlgorithmConfiguration("RATE_LIMIT", new Properties())), new
AlgorithmConfiguration("MEMORY", new Properties()));
when(PipelineAPIFactory.getPipelineGovernanceFacade(CONTEXT_KEY)).thenReturn(mock(PipelineGovernanceFacade.class,
RETURNS_DEEP_STUBS));
when(PipelineDistributedBarrier.getInstance(CONTEXT_KEY)).thenReturn(mock(PipelineDistributedBarrier.class));
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/api/CDCJobAPITest.java
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/api/CDCJobAPITest.java
index 0444a0e10e5..6a09541a41d 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/api/CDCJobAPITest.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/api/CDCJobAPITest.java
@@ -429,7 +429,7 @@ class CDCJobAPITest {
@Test
void assertStartEnableDisableAndType() throws ReflectiveOperationException
{
- PipelineJobConfigurationManager jobConfigManager =
mockPersistedJobConfiguration(createJobConfiguration(1));
+ final PipelineJobConfigurationManager jobConfigManager =
mockPersistedJobConfiguration(createJobConfiguration(1));
JobConfigurationPOJO jobConfigPOJO = createJobConfigurationPOJO();
jobConfigPOJO.setShardingTotalCount(1);
jobConfigPOJO.setDisabled(true);
diff --git
a/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunnerTest.java
b/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunnerTest.java
index 75711b300a3..c3364cab8ac 100644
---
a/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunnerTest.java
+++
b/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunnerTest.java
@@ -215,7 +215,7 @@ class ConsistencyCheckTasksRunnerTest {
jobItemContext.setStopping(true);
return checkResult;
});
- PipelineJobCheckGovernanceRepository checkRepository =
mock(PipelineJobCheckGovernanceRepository.class);
+ final PipelineJobCheckGovernanceRepository checkRepository =
mock(PipelineJobCheckGovernanceRepository.class);
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -291,7 +291,7 @@ class ConsistencyCheckTasksRunnerTest {
when(jobFacade.getCheck()).thenReturn(checkRepository);
Map<String, TableDataConsistencyCheckResult> checkResult =
Collections.singletonMap("t_order", new TableDataConsistencyCheckResult(true));
when(checkRepository.getCheckJobResult(PARENT_JOB_ID,
CHECK_JOB_ID)).thenReturn(checkResult);
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -330,7 +330,7 @@ class ConsistencyCheckTasksRunnerTest {
PipelineJobCheckGovernanceRepository checkRepository =
mock(PipelineJobCheckGovernanceRepository.class);
when(jobFacade.getCheck()).thenReturn(checkRepository);
when(checkRepository.getCheckJobResult(PARENT_JOB_ID,
CHECK_JOB_ID)).thenReturn(Collections.emptyMap());
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -378,7 +378,7 @@ class ConsistencyCheckTasksRunnerTest {
when(jobFacade.getCheck()).thenReturn(checkRepository);
Map<String, TableDataConsistencyCheckResult> checkResult =
Collections.singletonMap("t_order", new TableDataConsistencyCheckResult(false));
when(checkRepository.getCheckJobResult(PARENT_JOB_ID,
CHECK_JOB_ID)).thenReturn(checkResult);
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -407,7 +407,7 @@ class ConsistencyCheckTasksRunnerTest {
PipelineDataConsistencyChecker checker =
mock(PipelineDataConsistencyChecker.class);
when(checker.isCanceling()).thenReturn(true);
Plugins.getMemberAccessor().set(ConsistencyCheckTasksRunner.class.getDeclaredField("consistencyChecker"),
runner, new AtomicReference<>(checker));
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -446,7 +446,7 @@ class ConsistencyCheckTasksRunnerTest {
PipelineJobItemProcessGovernanceRepository processRepository =
mock(PipelineJobItemProcessGovernanceRepository.class);
when(jobItemFacade.getProcess()).thenReturn(processRepository);
when(jobItemFacade.getErrorMessage()).thenReturn(errorRepository);
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
@@ -483,7 +483,7 @@ class ConsistencyCheckTasksRunnerTest {
when(governanceFacade.getJobItemFacade()).thenReturn(jobItemFacade);
PipelineJobItemErrorMessageGovernanceRepository errorRepository =
mock(PipelineJobItemErrorMessageGovernanceRepository.class);
when(jobItemFacade.getErrorMessage()).thenReturn(errorRepository);
- AtomicReference<ExecuteCallback> callbackRef = new AtomicReference<>();
+ final AtomicReference<ExecuteCallback> callbackRef = new
AtomicReference<>();
ConsistencyCheckProcessContext processContext =
mock(ConsistencyCheckProcessContext.class);
PipelineExecuteEngine executeEngine =
mock(PipelineExecuteEngine.class);
when(processContext.getConsistencyCheckExecuteEngine()).thenReturn(executeEngine);
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
index 016d77d3655..99b0a4ba865 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/SQLFederationEngineTest.java
@@ -144,7 +144,7 @@ class SQLFederationEngineTest {
@Test
void assertDecideWithNotMatchedRule() throws SQLException {
- Collection<ShardingSphereRule> globalRules = Collections.singleton(new
SQLFederationRule(new SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
+ final Collection<ShardingSphereRule> globalRules =
Collections.singleton(new SQLFederationRule(new
SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
Collection<ShardingSphereRule> databaseRules =
Collections.singleton(new SQLFederationDeciderRuleNotMatchFixture());
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.singleton("foo_db"));
@@ -161,7 +161,7 @@ class SQLFederationEngineTest {
@Test
void assertDecideWithMultipleRules() throws SQLException {
- Collection<ShardingSphereRule> globalRules = Collections.singleton(new
SQLFederationRule(new SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
+ final Collection<ShardingSphereRule> globalRules =
Collections.singleton(new SQLFederationRule(new
SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
Collection<ShardingSphereRule> databaseRules = Arrays.asList(new
SQLFederationDeciderRuleNotMatchFixture(), new
SQLFederationDeciderRuleMatchFixture());
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.singleton("foo_db"));
@@ -190,7 +190,7 @@ class SQLFederationEngineTest {
@Test
void assertDecideWithExplainStatement() throws SQLException {
- Collection<ShardingSphereRule> globalRules = Collections.singleton(new
SQLFederationRule(new SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
+ final Collection<ShardingSphereRule> globalRules =
Collections.singleton(new SQLFederationRule(new
SQLFederationRuleConfiguration(true, false, cacheOption),
Collections.emptyList()));
ExplainStatementContext explainStatementContext =
mock(ExplainStatementContext.class, RETURNS_DEEP_STUBS);
ExplainStatement explainStatement = mock(ExplainStatement.class,
RETURNS_DEEP_STUBS);
when(explainStatementContext.getSqlStatement()).thenReturn(explainStatement);
diff --git
a/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/implementor/EnumerableScanImplementorTest.java
b/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/implementor/EnumerableScanImplementorTest.java
index a7456f2bcd2..a58c95783af 100644
---
a/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/implementor/EnumerableScanImplementorTest.java
+++
b/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/implementor/EnumerableScanImplementorTest.java
@@ -348,7 +348,7 @@ class EnumerableScanImplementorTest {
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection>
prepareEngine = mock(DriverExecutionPrepareEngine.class);
when(prepareEngine.prepare(any(), any(), anyMap(), anyCollection(),
any())).thenReturn(executionGroupContext);
when(executorContext.getPrepareEngine()).thenReturn(prepareEngine);
- ScanImplementorContext scanContext = new
ScanImplementorContext(mock(DataContext.class), "SELECT ? FROM tbl", new
int[]{0});
+ final ScanImplementorContext scanContext = new
ScanImplementorContext(mock(DataContext.class), "SELECT ? FROM tbl", new
int[]{0});
ShardingSphereTable table = mock(ShardingSphereTable.class,
RETURNS_DEEP_STUBS);
when(table.getAllColumns()).thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.INTEGER, true, false, false, false, true,
false)));
ProcessRegistry processRegistry = mock(ProcessRegistry.class);
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManagerTest.java
index 7ea570598c0..de36ecfe6d8 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManagerTest.java
@@ -72,7 +72,7 @@ class StorageUnitManagerTest {
@Test
void assertRegisterSuccess() {
- MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ final MetaDataContexts metaDataContexts = mockMetaDataContexts();
ResourceSwitchManager resourceSwitchManager =
mock(ResourceSwitchManager.class);
SwitchingResource switchingResource = new
SwitchingResource(Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyList(), Collections.emptyMap());
when(resourceSwitchManager.switchByRegisterStorageUnit(any(ResourceMetaData.class),
any(Map.class), anyBoolean())).thenReturn(switchingResource);
@@ -124,7 +124,7 @@ class StorageUnitManagerTest {
@Test
void assertAlterSuccess() {
- MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ final MetaDataContexts metaDataContexts = mockMetaDataContexts();
ResourceSwitchManager resourceSwitchManager =
mock(ResourceSwitchManager.class);
SwitchingResource switchingResource = new
SwitchingResource(Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyList(), Collections.emptyMap());
when(resourceSwitchManager.switchByAlterStorageUnit(any(ResourceMetaData.class),
any(Map.class), anyBoolean())).thenReturn(switchingResource);
@@ -156,7 +156,7 @@ class StorageUnitManagerTest {
@Test
void assertUnregisterSuccess() {
- MetaDataContexts metaDataContexts = mockMetaDataContexts();
+ final MetaDataContexts metaDataContexts = mockMetaDataContexts();
ResourceSwitchManager resourceSwitchManager =
mock(ResourceSwitchManager.class);
SwitchingResource switchingResource = new
SwitchingResource(Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyList(), Collections.emptyMap());
when(resourceSwitchManager.switchByUnregisterStorageUnit(any(ResourceMetaData.class),
any(Collection.class))).thenReturn(switchingResource);
diff --git a/pom.xml b/pom.xml
index adff21ceeee..73674dc6028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
<spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
- <checkstyle.version>12.3.0</checkstyle.version>
+ <checkstyle.version>14.0.0</checkstyle.version>
<maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
<spotbugs-maven-plugin.version>4.7.2.1</spotbugs-maven-plugin.version>
<fb-contrib.version>7.6.0</fb-contrib.version>
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
index 3041ee08c5c..403ee5adff4 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
@@ -417,7 +417,7 @@ class ProxySQLExecutorTest {
@Test
void assertCheckExecutePrerequisitesWithMetaDataRefreshInXATransaction() {
- DatabaseType databaseType = mock(DatabaseType.class);
+ final DatabaseType databaseType = mock(DatabaseType.class);
DialectDatabaseMetaData dialectDatabaseMetaData =
mock(DialectDatabaseMetaData.class);
when(dialectDatabaseMetaData.getTransactionOption()).thenReturn(
new DialectTransactionOption(false,
DDLCommitPolicy.NO_ADDITIONAL_COMMIT, false, true, true, false, false,
Collections.emptyList()));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index 91a8b6fecad..0d419c5d485 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -203,7 +203,7 @@ class ProxyBackendHandlerFactoryTest {
QueryContext queryContext = mock(QueryContext.class);
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- DatabaseProxyBackendHandler expected =
mock(DatabaseProxyBackendHandler.class);
+ final DatabaseProxyBackendHandler expected =
mock(DatabaseProxyBackendHandler.class);
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
when(queryContext.getMetaData()).thenReturn(metaData);
when(queryContext.getSql()).thenReturn("sql");
@@ -225,7 +225,7 @@ class ProxyBackendHandlerFactoryTest {
void assertNewInstanceWithNullDatabaseName() throws SQLException {
QueryContext queryContext = mock(QueryContext.class);
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
- DatabaseProxyBackendHandler expected =
mock(DatabaseProxyBackendHandler.class);
+ final DatabaseProxyBackendHandler expected =
mock(DatabaseProxyBackendHandler.class);
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
when(queryContext.getSql()).thenReturn("sql");
when(queryContext.getParameters()).thenReturn(Collections.emptyList());
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/BeginTransactionProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/BeginTransactionProxyBackendHandlerTest.java
index a3faf16a945..2eb816d6475 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/BeginTransactionProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/BeginTransactionProxyBackendHandlerTest.java
@@ -69,7 +69,7 @@ class BeginTransactionProxyBackendHandlerTest {
@Test
void assertBeginWithNestedTransactionCommit() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true, "public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true, "public");
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -89,7 +89,7 @@ class BeginTransactionProxyBackendHandlerTest {
@Test
void assertThrowWhenNestedTransactionUnsupportedWithDefaultSchema() {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false, "public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false, "public");
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -106,7 +106,7 @@ class BeginTransactionProxyBackendHandlerTest {
@Test
void assertBeginWhenDefaultSchemaNotPresent() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false, null);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false, null);
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/CommitProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/CommitProxyBackendHandlerTest.java
index bd4be39af26..9f5c99b93ca 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/CommitProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/CommitProxyBackendHandlerTest.java
@@ -52,7 +52,7 @@ class CommitProxyBackendHandlerTest {
@Test
void assertReturnRollbackStatementWhenCommitFailed() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getProtocolType()).thenReturn(databaseType);
ConnectionContext connectionContext = new
ConnectionContext(Collections::emptyList);
@@ -73,7 +73,7 @@ class CommitProxyBackendHandlerTest {
@Test
void assertReturnOriginalStatementWhenNoException() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getProtocolType()).thenReturn(databaseType);
ConnectionContext connectionContext = new
ConnectionContext(Collections::emptyList);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/ReleaseSavepointProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/ReleaseSavepointProxyBackendHandlerTest.java
index 285be3c677b..316e8a49e91 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/ReleaseSavepointProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/ReleaseSavepointProxyBackendHandlerTest.java
@@ -47,7 +47,7 @@ class ReleaseSavepointProxyBackendHandlerTest {
@Test
void assertReleaseSavepoint() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -68,7 +68,7 @@ class ReleaseSavepointProxyBackendHandlerTest {
@Test
void assertReleaseWithDefaultSchemaMissing() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
TransactionStatus transactionStatus = new TransactionStatus();
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(transactionStatus);
@@ -88,7 +88,7 @@ class ReleaseSavepointProxyBackendHandlerTest {
@Test
void assertReleaseWithInvalidStatus() {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
TransactionStatus transactionStatus = new TransactionStatus();
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(transactionStatus);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/RollbackSavepointProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/RollbackSavepointProxyBackendHandlerTest.java
index 768accb279e..cf08824845d 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/RollbackSavepointProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/RollbackSavepointProxyBackendHandlerTest.java
@@ -47,7 +47,7 @@ class RollbackSavepointProxyBackendHandlerTest {
@Test
void assertRollbackToSavepoint() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -68,7 +68,7 @@ class RollbackSavepointProxyBackendHandlerTest {
@Test
void assertRollbackWithEmptySavepointName() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(new
TransactionStatus());
when(connectionSession.getProtocolType()).thenReturn(databaseType);
@@ -87,7 +87,7 @@ class RollbackSavepointProxyBackendHandlerTest {
@Test
void assertExecuteWithInvalidStatus() {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(new
TransactionStatus());
when(connectionSession.getProtocolType()).thenReturn(databaseType);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetAutoCommitProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetAutoCommitProxyBackendHandlerTest.java
index a31e440ea5f..d2afd8d9a8d 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetAutoCommitProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetAutoCommitProxyBackendHandlerTest.java
@@ -52,7 +52,7 @@ class SetAutoCommitProxyBackendHandlerTest {
@Test
void assertExecuteCommitWhenNestedTransactionSupported() throws
SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -75,7 +75,7 @@ class SetAutoCommitProxyBackendHandlerTest {
@Test
void assertExecuteWithoutCommitWhenNestedTransactionUnsupported() throws
SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(false);
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -97,7 +97,7 @@ class SetAutoCommitProxyBackendHandlerTest {
@Test
void assertExecuteWhenAutoCommitDisabled() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -119,7 +119,7 @@ class SetAutoCommitProxyBackendHandlerTest {
@Test
void assertExecuteWhenNotInTransaction() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(true);
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(false);
ConnectionSession connectionSession = mock(ConnectionSession.class);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetSavepointProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetSavepointProxyBackendHandlerTest.java
index ae8484dadd4..922dbeecadf 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetSavepointProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/local/type/SetSavepointProxyBackendHandlerTest.java
@@ -47,7 +47,7 @@ class SetSavepointProxyBackendHandlerTest {
@Test
void assertExecuteWithTransaction() throws SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
TransactionStatus transactionStatus = new TransactionStatus();
transactionStatus.setInTransaction(true);
ConnectionSession connectionSession = mock(ConnectionSession.class);
@@ -68,7 +68,7 @@ class SetSavepointProxyBackendHandlerTest {
@Test
void assertExecuteWithoutTransactionButNoDefaultSchema() throws
SQLException {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData(null);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(new
TransactionStatus());
when(connectionSession.getProtocolType()).thenReturn(databaseType);
@@ -87,7 +87,7 @@ class SetSavepointProxyBackendHandlerTest {
@Test
void assertExecuteWithInvalidStatus() {
- DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
+ final DialectDatabaseMetaData dialectDatabaseMetaData =
mockDialectDatabaseMetaData("public");
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getTransactionStatus()).thenReturn(new
TransactionStatus());
when(connectionSession.getProtocolType()).thenReturn(databaseType);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
index 1c9f6faa910..70a3980153c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
@@ -76,7 +76,7 @@ class MetaDataImportExecutorTest {
void assertImportClusterConfigurations() {
MetaDataManagerPersistService metaDataManagerService =
mock(MetaDataManagerPersistService.class);
when(contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService()).thenReturn(metaDataManagerService);
- ExportedMetaData exportedMetaData = createExportedMetaData();
+ final ExportedMetaData exportedMetaData = createExportedMetaData();
MetaDataImportExecutor executor = new
MetaDataImportExecutor(contextManager);
setField(executor, "databaseConfigImportExecutor",
databaseConfigImportExecutor);
YamlRuleConfigurationSwapperEngine swapperEngine =
mock(YamlRuleConfigurationSwapperEngine.class);
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
index 0add6dc0b94..578ac2a86fb 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
@@ -76,7 +76,7 @@ class MySQLSetVariableAdminExecutorTest {
@Test
void assertExecute() throws SQLException {
SetStatement setStatement = prepareSetStatement();
- MySQLSetVariableAdminExecutor executor = new
MySQLSetVariableAdminExecutor(setStatement);
+ final MySQLSetVariableAdminExecutor executor = new
MySQLSetVariableAdminExecutor(setStatement);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getAttributeMap()).thenReturn(new
DefaultAttributeMap());
when(connectionSession.getUsedDatabaseName()).thenReturn("foo_db");
diff --git
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLResetVariableAdminExecutorTest.java
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLResetVariableAdminExecutorTest.java
index 84f2a9bf9bd..60575e86bbd 100644
---
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLResetVariableAdminExecutorTest.java
+++
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLResetVariableAdminExecutorTest.java
@@ -69,7 +69,7 @@ class PostgreSQLResetVariableAdminExecutorTest {
@Test
void assertExecuteWithClientEncoding() {
- PostgreSQLResetVariableAdminExecutor executor = new
PostgreSQLResetVariableAdminExecutor(new
PostgreSQLResetParameterStatement(databaseType, "client_encoding"));
+ final PostgreSQLResetVariableAdminExecutor executor = new
PostgreSQLResetVariableAdminExecutor(new
PostgreSQLResetParameterStatement(databaseType, "client_encoding"));
ConnectionSession connectionSession = mock(ConnectionSession.class);
RequiredSessionVariableRecorder requiredSessionVariableRecorder =
mock(RequiredSessionVariableRecorder.class);
AttributeMap attributeMap = mock(AttributeMap.class);
diff --git
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLSetVariableAdminExecutorTest.java
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLSetVariableAdminExecutorTest.java
index ddd407c2dbb..ed960f70eb0 100644
---
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLSetVariableAdminExecutorTest.java
+++
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLSetVariableAdminExecutorTest.java
@@ -74,7 +74,7 @@ class PostgreSQLSetVariableAdminExecutorTest {
@Test
void assertExecuteWithInvalidClientEncoding() {
SetStatement setStatement = new SetStatement(databaseType,
Collections.singletonList(new VariableAssignSegment(0, 0, new
VariableSegment(0, 0, "client_encoding"), "'LATIN1'")));
- PostgreSQLSetVariableAdminExecutor executor = new
PostgreSQLSetVariableAdminExecutor(setStatement);
+ final PostgreSQLSetVariableAdminExecutor executor = new
PostgreSQLSetVariableAdminExecutor(setStatement);
ConnectionSession connectionSession = mock(ConnectionSession.class);
RequiredSessionVariableRecorder requiredSessionVariableRecorder =
mock(RequiredSessionVariableRecorder.class);
AttributeMap attributeMap = mock(AttributeMap.class);
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
index 6909a63f512..39ad6c37d00 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
@@ -323,7 +323,7 @@ class MySQLAuthenticationEngineTest {
setAuthenticationResult();
MySQLPacketPayload payload = mock(MySQLPacketPayload.class);
when(payload.readStringEOFByBytes()).thenReturn(authResponse);
- ChannelHandlerContext context =
mockDomainSocketChannelHandlerContext();
+ final ChannelHandlerContext context =
mockDomainSocketChannelHandlerContext();
AuthorityRule rule = mock(AuthorityRule.class);
ShardingSphereUser user = new ShardingSphereUser("root", "",
"local_host");
when(rule.findUser(user.getGrantee())).thenReturn(Optional.of(user));
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index 8da5bc2483d..b941470b4ae 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -183,7 +183,6 @@
</module>
<module name="JavadocMissingLeadingAsterisk" />
<module name="JavadocMissingWhitespaceAfterAsterisk" />
- <module name="JavadocStyle" />
<module name="JavadocTagContinuationIndentation">
<property name="violateExecutionOnNonTightHtml" value="true" />
</module>
diff --git
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewriter/engine/SQLRewriterIT.java
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewriter/engine/SQLRewriterIT.java
index b1fe00c8cec..13d8a08ca1a 100644
---
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewriter/engine/SQLRewriterIT.java
+++
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewriter/engine/SQLRewriterIT.java
@@ -137,11 +137,11 @@ public abstract class SQLRewriterIT {
private Collection<SQLRewriteUnit> createSQLRewriteUnits(final
SQLRewriteResult sqlRewriteResult) {
return sqlRewriteResult instanceof GenericSQLRewriteResult
? Collections.singleton(((GenericSQLRewriteResult)
sqlRewriteResult).getSqlRewriteUnit())
- : (((RouteSQLRewriteResult)
sqlRewriteResult).getSqlRewriteUnits()).values();
+ : ((RouteSQLRewriteResult)
sqlRewriteResult).getSqlRewriteUnits().values();
}
- private RewriteScenarioContext getCachedRewriteScenarioContext(final
SQLRewriteEngineTestParameters testParams, final DatabaseType databaseType,
- final
SQLStatement sqlStatement) throws IOException, SQLException {
+ private RewriteScenarioContext getCachedRewriteScenarioContext(final
SQLRewriteEngineTestParameters testParams,
+ final
DatabaseType databaseType, final SQLStatement sqlStatement) throws IOException,
SQLException {
String cacheKey = getRewriteScenarioCacheKey(testParams, sqlStatement);
RewriteScenarioContext result =
REWRITE_SCENARIO_CONTEXT_CACHE.get(cacheKey);
if (null != result) {
