You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/07/22 14:00:58 UTC
[shardingsphere] branch master updated: Fix codes for checkstyle
(#6403)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 28ab21f Fix codes for checkstyle (#6403)
28ab21f is described below
commit 28ab21fef0767a62081c34c67e1c729837079e6d
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Jul 22 22:00:41 2020 +0800
Fix codes for checkstyle (#6403)
* Remove redundant suppression
* Make field as final as possible
---
.../cluster/heartbeat/ClusterHeartbeatInstance.java | 2 +-
.../heartbeat/detect/AbstractHeartbeatDetect.java | 18 ++++++------------
.../cluster/heartbeat/detect/HeartbeatDetect.java | 10 +++++-----
.../cluster/heartbeat/response/HeartbeatResponse.java | 2 +-
.../cluster/heartbeat/response/HeartbeatResult.java | 12 ++++++------
.../cluster/heartbeat/task/HeartbeatTaskManager.java | 4 ++--
.../core/facade/ShardingOrchestrationFacadeTest.java | 2 +-
.../core/registry/instance/OrchestrationInstance.java | 8 ++++----
.../mysql/packet/handshake/MySQLAuthPluginData.java | 2 +-
.../mysql/packet/handshake/MySQLRandomGenerator.java | 2 +-
.../packet/handshake/MySQLRandomGeneratorTest.java | 4 ++--
.../merge/dal/impl/EncryptColumnsMergedResult.java | 1 -
.../apache/shardingsphere/shadow/rule/ShadowRule.java | 4 ++--
.../shardingsphere/infra/auth/Authentication.java | 2 +-
.../infra/properties/TypedPropertyValue.java | 2 +-
.../config/YamlEngineProxyUserConfigurationTest.java | 1 -
.../kernel/impl/ShardingSphereExecutorService.java | 2 +-
.../merge/result/impl/stream/StreamMergedResult.java | 1 -
.../shardingsphere/infra/route/DataNodeRouter.java | 2 +-
.../jdbc/adapter/AbstractPreparedStatementAdapter.java | 1 -
.../jdbc/core/resultset/GeneratedKeysResultSet.java | 16 +++++++---------
.../jdbc/core/resultset/ShardingSphereResultSet.java | 12 ++++--------
.../AbstractUnsupportedGeneratedKeysResultSet.java | 2 --
.../driver/common/base/AbstractSQLTest.java | 6 +++---
...AbstractShardingSphereDataSourceForEncryptTest.java | 2 +-
...ractShardingSphereDataSourceForMasterSlaveTest.java | 2 +-
.../AbstractShardingSphereDataSourceForShadowTest.java | 2 +-
...bstractShardingSphereDataSourceForShardingTest.java | 2 +-
.../batch/BatchPreparedStatementExecutorTest.java | 1 -
.../driver/jdbc/adapter/ConnectionAdapterTest.java | 14 +++++++-------
.../core/connection/ShardingSphereConnectionTest.java | 16 ++++++++--------
.../AbstractShardingTransactionManagerFixture.java | 10 +++++-----
.../core/statement/EncryptPreparedStatementTest.java | 2 +-
.../jdbc/core/statement/EncryptStatementTest.java | 2 +-
.../core/statement/ShadowPreparedStatementTest.java | 4 ++--
.../jdbc/core/statement/ShadowStatementTest.java | 2 +-
.../circuit/resultset/CircuitBreakerResultSet.java | 4 ----
.../statement/CircuitBreakerPreparedStatement.java | 1 -
.../shardingsphere/spring/AbstractSpringJUnitTest.java | 1 -
.../OrchestrationShardingMasterSlaveNamespaceTest.java | 1 -
.../jdbc/connection/BackendConnection.java | 2 +-
.../OrchestrationConfigurationConverter.java | 2 +-
.../scaling/mysql/client/InternalResultSet.java | 4 ++--
.../sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java | 3 ---
.../parser/oracle/visitor/impl/OracleDCLVisitor.java | 1 -
.../parser/oracle/visitor/impl/OracleDDLVisitor.java | 2 --
.../parser/oracle/visitor/impl/OracleDMLVisitor.java | 2 --
.../postgresql/visitor/impl/PostgreSQLDMLVisitor.java | 2 --
.../sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java | 3 ---
.../sqlserver/visitor/impl/SQLServerDDLVisitor.java | 1 -
.../sqlserver/visitor/impl/SQLServerDMLVisitor.java | 2 --
.../shardingsphere/sql/parser/SQLParserEngine.java | 2 +-
.../sql/parser/hook/ParsingHookRegistryTest.java | 2 +-
.../integrate/jaxb/sql/loader/SQLCasesRegistry.java | 2 +-
.../jaxb/sql/loader/UnsupportedSQLCasesRegistry.java | 2 +-
.../dialect/MariaDBXAConnectionWrapperTest.java | 1 -
.../dialect/OracleXAConnectionWrapperTest.java | 1 -
.../base/seata/at/fixture/MockSeataServer.java | 2 +-
.../transaction/core/ResourceDataSource.java | 2 +-
59 files changed, 89 insertions(+), 133 deletions(-)
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstance.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstance.java
index 0b3f9e9..be46122 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstance.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstance.java
@@ -36,7 +36,7 @@ public final class ClusterHeartbeatInstance {
private HeartbeatTaskManager heartbeatTaskManager;
- private HeartbeatHandler heartbeatHandler = HeartbeatHandler.getInstance();
+ private final HeartbeatHandler heartbeatHandler = HeartbeatHandler.getInstance();
/**
* Get cluster heartbeat instance.
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
index 9f651ce..b9886fe 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.cluster.heartbeat.detect;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.cluster.heartbeat.response.HeartbeatResult;
@@ -26,24 +27,17 @@ import java.util.concurrent.Callable;
/**
* Abstract heart beat detect.
*/
+@RequiredArgsConstructor
@Slf4j
public abstract class AbstractHeartbeatDetect implements Callable<Map<String, HeartbeatResult>> {
- private Boolean retryEnable;
+ private final Boolean retryEnable;
- private Integer retryMaximum;
+ private final Integer retryMaximum;
- private Integer retryInterval;
+ private final Integer retryInterval;
- private Boolean needDetect;
-
- public AbstractHeartbeatDetect(final Boolean retryEnable, final Integer retryMaximum,
- final Integer retryInterval, final Boolean needDetect) {
- this.retryEnable = retryEnable;
- this.retryMaximum = retryMaximum;
- this.retryInterval = retryInterval;
- this.needDetect = needDetect;
- }
+ private final Boolean needDetect;
/**
* Detect heart beat.
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
index eb0b25f..8aaca2b 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
@@ -36,15 +36,15 @@ import java.util.Objects;
@Slf4j
public final class HeartbeatDetect extends AbstractHeartbeatDetect {
- private String sql;
+ private final String sql;
- private String schemaName;
+ private final String schemaName;
- private String dataSourceName;
+ private final String dataSourceName;
- private DataSource dataSource;
+ private final DataSource dataSource;
- private Boolean dataSourceDisabled;
+ private final Boolean dataSourceDisabled;
public HeartbeatDetect(final String schemaName, final String dataSourceName, final DataSource dataSource,
final HeartbeatConfiguration configuration, final Boolean dataSourceDisabled) {
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponse.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponse.java
index 88437b8..5095c0d 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponse.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponse.java
@@ -28,7 +28,7 @@ import java.util.Map;
@Getter
public final class HeartbeatResponse {
- private Map<String, Collection<HeartbeatResult>> heartbeatResultMap;
+ private final Map<String, Collection<HeartbeatResult>> heartbeatResultMap;
public HeartbeatResponse(final Map<String, Collection<HeartbeatResult>> heartbeatResultMap) {
this.heartbeatResultMap = heartbeatResultMap;
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
index e97856c..da23b6e 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
@@ -17,21 +17,21 @@
package org.apache.shardingsphere.cluster.heartbeat.response;
-import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
/**
* Heartbeat result.
*/
-@AllArgsConstructor
+@RequiredArgsConstructor
@Getter
public final class HeartbeatResult {
- private String dataSourceName;
+ private final String dataSourceName;
- private Boolean enable;
+ private final Boolean enable;
- private Long detectTimeStamp;
+ private final Long detectTimeStamp;
- private Boolean disabled;
+ private final Boolean disabled;
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManager.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManager.java
index 58809da..e528147 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManager.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManager.java
@@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit;
*/
public final class HeartbeatTaskManager {
- private Integer interval;
+ private final Integer interval;
- private ScheduledExecutorService executorService;
+ private final ScheduledExecutorService executorService;
public HeartbeatTaskManager(final Integer interval) {
this.interval = interval;
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
index 937f01a..5a1545d 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
public final class ShardingOrchestrationFacadeTest {
- private ShardingOrchestrationFacade shardingOrchestrationFacade = ShardingOrchestrationFacade.getInstance();
+ private final ShardingOrchestrationFacade shardingOrchestrationFacade = ShardingOrchestrationFacade.getInstance();
@Mock
private RegistryCenterRepository registryCenterRepository;
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/main/java/org/apache/shardingsphere/orchestration/core/registry/instance/OrchestrationInstance.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/main/java/org/apache/shardingsphere/orchestration/core/registry/instance/OrchestrationInstance.java
index 65f9e39..a97f1d4 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/main/java/org/apache/shardingsphere/orchestration/core/registry/instance/OrchestrationInstance.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/main/java/org/apache/shardingsphere/orchestration/core/registry/instance/OrchestrationInstance.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.orchestration.core.registry.instance;
-import java.lang.management.ManagementFactory;
-import java.util.UUID;
-
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.constant.Constants;
import org.apache.shardingsphere.orchestration.core.common.utils.IpUtils;
+import java.lang.management.ManagementFactory;
+import java.util.UUID;
+
/**
* Orchestration instance.
*/
@@ -33,7 +33,7 @@ public final class OrchestrationInstance {
private static final OrchestrationInstance INSTANCE = new OrchestrationInstance();
- private String instanceId;
+ private final String instanceId;
private OrchestrationInstance() {
String tag = Strings.isNullOrEmpty(System.getProperty(Constants.PORT_KEY))
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthPluginData.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthPluginData.java
index 87f64de..175b213 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthPluginData.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLAuthPluginData.java
@@ -38,7 +38,7 @@ public final class MySQLAuthPluginData {
private final byte[] authPluginDataPart2;
public MySQLAuthPluginData() {
- this(MySQLRandomGenerator.getInstance().generateRandomBytes(8), MySQLRandomGenerator.getInstance().generateRandomBytes(12));
+ this(MySQLRandomGenerator.getINSTANCE().generateRandomBytes(8), MySQLRandomGenerator.getINSTANCE().generateRandomBytes(12));
}
/**
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGenerator.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGenerator.java
index 9a07b5f..14a4449 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGenerator.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGenerator.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ThreadLocalRandom;
public final class MySQLRandomGenerator {
@Getter
- private static MySQLRandomGenerator instance = new MySQLRandomGenerator();
+ private static final MySQLRandomGenerator INSTANCE = new MySQLRandomGenerator();
private static final byte[] SEED = {
'a', 'b', 'e', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGeneratorTest.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGeneratorTest.java
index 59cc0c7..3b79be5 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGeneratorTest.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/packet/handshake/MySQLRandomGeneratorTest.java
@@ -26,7 +26,7 @@ public final class MySQLRandomGeneratorTest {
@Test
public void assertGenerateRandomBytes() {
- assertThat(MySQLRandomGenerator.getInstance().generateRandomBytes(8).length, is(8));
- assertThat(MySQLRandomGenerator.getInstance().generateRandomBytes(12).length, is(12));
+ assertThat(MySQLRandomGenerator.getINSTANCE().generateRandomBytes(8).length, is(8));
+ assertThat(MySQLRandomGenerator.getINSTANCE().generateRandomBytes(12).length, is(12));
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/EncryptColumnsMergedResult.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/EncryptColumnsMergedResult.java
index b74ca7c..b9365d6 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/EncryptColumnsMergedResult.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/EncryptColumnsMergedResult.java
@@ -117,7 +117,6 @@ public abstract class EncryptColumnsMergedResult implements MergedResult {
throw new SQLFeatureNotSupportedException();
}
- @SuppressWarnings("deprecation")
@Override
public final InputStream getInputStream(final int columnIndex, final String type) throws SQLException {
throw new SQLFeatureNotSupportedException();
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
index 091c3fb..dcd824e 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
@@ -29,9 +29,9 @@ import java.util.Map;
@Getter
public final class ShadowRule implements ShardingSphereRule {
- private Map<String, String> shadowMappings;
+ private final Map<String, String> shadowMappings;
- private String column;
+ private final String column;
public ShadowRule(final ShadowRuleConfiguration shadowRuleConfiguration) {
column = shadowRuleConfiguration.getColumn();
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/Authentication.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/Authentication.java
index a5dcd2d..5e70e91 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/Authentication.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/Authentication.java
@@ -30,5 +30,5 @@ import java.util.Map;
@Getter
public final class Authentication {
- private Map<String, ProxyUser> users = new LinkedHashMap<>();
+ private final Map<String, ProxyUser> users = new LinkedHashMap<>();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/properties/TypedPropertyValue.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/properties/TypedPropertyValue.java
index 3f7f901..b468164 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/properties/TypedPropertyValue.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/properties/TypedPropertyValue.java
@@ -25,7 +25,7 @@ import lombok.Getter;
@Getter
public final class TypedPropertyValue {
- private Object value;
+ private final Object value;
public TypedPropertyValue(final TypedPropertyKey key, final String value) throws TypedPropertyValueException {
this.value = createTypedValue(key, value);
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/config/YamlEngineProxyUserConfigurationTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/config/YamlEngineProxyUserConfigurationTest.java
index 6d853fe..b73a817 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/config/YamlEngineProxyUserConfigurationTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/config/YamlEngineProxyUserConfigurationTest.java
@@ -43,7 +43,6 @@ public final class YamlEngineProxyUserConfigurationTest {
assertThat(actual.get("authorizedSchemas").toString(), is("db1"));
}
- @SuppressWarnings("unchecked")
@Test
public void assertUnmarshalProperties() {
Properties actual = YamlEngine.unmarshalProperties("password: pwd\nauthorizedSchemas: db1");
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/impl/ShardingSphereExecutorService.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/impl/ShardingSphereExecutorService.java
index b5db8b0..c076e6b 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/impl/ShardingSphereExecutorService.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/impl/ShardingSphereExecutorService.java
@@ -36,7 +36,7 @@ public final class ShardingSphereExecutorService {
private static final ExecutorService SHUTDOWN_EXECUTOR = Executors.newSingleThreadExecutor(ShardingSphereThreadFactoryBuilder.build("Executor-Engine-Closer"));
- private ListeningExecutorService executorService;
+ private final ListeningExecutorService executorService;
public ShardingSphereExecutorService(final int executorSize) {
this(executorSize, DEFAULT_NAME_FORMAT);
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
index 96ef4e4..e6f4c18 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
@@ -56,7 +56,6 @@ public abstract class StreamMergedResult implements MergedResult {
return result;
}
- @SuppressWarnings("deprecation")
@Override
public final InputStream getInputStream(final int columnIndex, final String type) throws SQLException {
InputStream result = getCurrentQueryResult().getInputStream(columnIndex, type);
diff --git a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
index e52b57c..b1da8d9 100644
--- a/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
+++ b/shardingsphere-infra/shardingsphere-infra-route/src/main/java/org/apache/shardingsphere/infra/route/DataNodeRouter.java
@@ -51,7 +51,7 @@ public final class DataNodeRouter {
private final Map<ShardingSphereRule, RouteDecorator> decorators;
- private SPIRoutingHook routingHook;
+ private final SPIRoutingHook routingHook;
public DataNodeRouter(final ShardingSphereMetaData metaData, final ConfigurationProperties props, final Collection<ShardingSphereRule> rules) {
this.metaData = metaData;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
index 1973b1b..bd17188 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
@@ -186,7 +186,6 @@ public abstract class AbstractPreparedStatementAdapter extends AbstractUnsupport
setParameter(parameterIndex, x);
}
- @SuppressWarnings("deprecation")
@Override
public final void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) {
setParameter(parameterIndex, x);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/GeneratedKeysResultSet.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/GeneratedKeysResultSet.java
index 9de6584..2fbba23 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/GeneratedKeysResultSet.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/GeneratedKeysResultSet.java
@@ -45,7 +45,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
public GeneratedKeysResultSet() {
column = null;
- values = Collections.<Comparable<?>>emptyList().iterator();
+ values = Collections.emptyIterator();
statement = null;
}
@@ -105,7 +105,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public byte getByte(final int columnIndex) {
checkStateForGetData();
- return Byte.valueOf(getString(columnIndex));
+ return Byte.parseByte(getString(columnIndex));
}
@Override
@@ -116,7 +116,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public short getShort(final int columnIndex) {
checkStateForGetData();
- return Short.valueOf(getString(columnIndex));
+ return Short.parseShort(getString(columnIndex));
}
@Override
@@ -127,7 +127,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public int getInt(final int columnIndex) {
checkStateForGetData();
- return Integer.valueOf(getString(columnIndex));
+ return Integer.parseInt(getString(columnIndex));
}
@Override
@@ -138,7 +138,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public long getLong(final int columnIndex) {
checkStateForGetData();
- return Long.valueOf(getString(columnIndex));
+ return Long.parseLong(getString(columnIndex));
}
@Override
@@ -149,7 +149,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public float getFloat(final int columnIndex) {
checkStateForGetData();
- return Float.valueOf(getString(columnIndex));
+ return Float.parseFloat(getString(columnIndex));
}
@Override
@@ -160,7 +160,7 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
@Override
public double getDouble(final int columnIndex) {
checkStateForGetData();
- return Double.valueOf(getString(columnIndex));
+ return Double.parseDouble(getString(columnIndex));
}
@Override
@@ -168,14 +168,12 @@ public final class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKe
return getDouble(1);
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) {
checkStateForGetData();
return new BigDecimal(getString(columnIndex)).setScale(scale, BigDecimal.ROUND_HALF_UP);
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final String columnLabel, final int scale) {
return getBigDecimal(1, scale);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
index a7b137b..79eb216 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.driver.jdbc.core.resultset;
-import java.sql.SQLFeatureNotSupportedException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
import org.apache.shardingsphere.driver.jdbc.adapter.AbstractResultSetAdapter;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -35,10 +31,14 @@ import java.sql.Date;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLXML;
import java.sql.Statement;
import java.sql.Time;
import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -186,13 +186,11 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final String columnLabel, final int scale) throws SQLException {
int columnIndex = columnLabelAndIndexMap.get(columnLabel);
@@ -287,13 +285,11 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
return mergeResultSet.getInputStream(columnIndex, "Ascii");
}
- @SuppressWarnings("deprecation")
@Override
public InputStream getUnicodeStream(final int columnIndex) throws SQLException {
return mergeResultSet.getInputStream(columnIndex, "Unicode");
}
- @SuppressWarnings("deprecation")
@Override
public InputStream getUnicodeStream(final String columnLabel) throws SQLException {
int columnIndex = columnLabelAndIndexMap.get(columnLabel);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java
index 3c985fb..108ea77 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java
@@ -116,13 +116,11 @@ public abstract class AbstractUnsupportedGeneratedKeysResultSet extends Abstract
throw new SQLFeatureNotSupportedException("getAsciiStream");
}
- @SuppressWarnings("deprecation")
@Override
public final InputStream getUnicodeStream(final int columnIndex) throws SQLException {
throw new SQLFeatureNotSupportedException("getUnicodeStream");
}
- @SuppressWarnings("deprecation")
@Override
public final InputStream getUnicodeStream(final String columnLabel) throws SQLException {
throw new SQLFeatureNotSupportedException("getUnicodeStream");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java
index c9da778..08170a6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractSQLTest.java
@@ -45,7 +45,7 @@ public abstract class AbstractSQLTest {
private static final Set<DatabaseType> DATABASE_TYPES = Sets.newHashSet(DatabaseTypes.getActualDatabaseType("H2"));
@Getter(AccessLevel.PROTECTED)
- private static Map<DatabaseType, Map<String, DataSource>> databaseTypeMap = new HashMap<>();
+ private static final Map<DatabaseType, Map<String, DataSource>> DATABASE_TYPE_MAP = new HashMap<>();
@BeforeClass
public static synchronized void initDataSource() {
@@ -61,7 +61,7 @@ public abstract class AbstractSQLTest {
}
private static void createDataSources(final String dbName, final DatabaseType databaseType) {
- databaseTypeMap.computeIfAbsent(databaseType, k -> new LinkedHashMap<>()).put(dbName, buildDataSource(dbName, databaseType));
+ DATABASE_TYPE_MAP.computeIfAbsent(databaseType, k -> new LinkedHashMap<>()).put(dbName, buildDataSource(dbName, databaseType));
createSchema(dbName, databaseType);
}
@@ -78,7 +78,7 @@ public abstract class AbstractSQLTest {
private static void createSchema(final String dbName, final DatabaseType databaseType) {
try {
- Connection conn = databaseTypeMap.get(databaseType).get(dbName).getConnection();
+ Connection conn = DATABASE_TYPE_MAP.get(databaseType).get(dbName).getConnection();
RunScript.execute(conn, new InputStreamReader(AbstractSQLTest.class.getClassLoader().getResourceAsStream("jdbc_init.sql")));
conn.close();
} catch (final SQLException ex) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java
index d6fd042..f8f67b4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForEncryptTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractShardingSphereDataSourceForEncryptTest extends Abs
}
private static Map<String, DataSource> getDataSources() {
- return Maps.filterKeys(getDatabaseTypeMap().values().iterator().next(), ENCRYPT_DB_NAMES::contains);
+ return Maps.filterKeys(getDATABASE_TYPE_MAP().values().iterator().next(), ENCRYPT_DB_NAMES::contains);
}
private static DataSource createDataSourceWithEmptyProps(final DataSource dataSource, final File yamlFile) throws IOException, SQLException {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForMasterSlaveTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForMasterSlaveTest.java
index 00d522b..d9f789e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForMasterSlaveTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForMasterSlaveTest.java
@@ -49,7 +49,7 @@ public abstract class AbstractShardingSphereDataSourceForMasterSlaveTest extends
}
private static Map<String, DataSource> getDataSources() {
- return Maps.filterKeys(getDatabaseTypeMap().values().iterator().next(), MASTER_SLAVE_DB_NAMES::contains);
+ return Maps.filterKeys(getDATABASE_TYPE_MAP().values().iterator().next(), MASTER_SLAVE_DB_NAMES::contains);
}
private static File getFile(final String fileName) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java
index d47d944..4e3eb8d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShadowTest.java
@@ -49,7 +49,7 @@ public abstract class AbstractShardingSphereDataSourceForShadowTest extends Abst
}
private static Map<String, DataSource> getDataSources() {
- return Maps.filterKeys(getDatabaseTypeMap().values().iterator().next(), SHADOW_DB_NAMES::contains);
+ return Maps.filterKeys(getDATABASE_TYPE_MAP().values().iterator().next(), SHADOW_DB_NAMES::contains);
}
private static File getFile(final String fileName) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShardingTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShardingTest.java
index e91ab85..6eed3c1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShardingTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForShardingTest.java
@@ -53,7 +53,7 @@ public abstract class AbstractShardingSphereDataSourceForShardingTest extends Ab
}
private static Map<String, DataSource> getDataSourceMap() {
- return Maps.filterKeys(getDatabaseTypeMap().values().iterator().next(), SHARDING_DB_NAMES::contains);
+ return Maps.filterKeys(getDATABASE_TYPE_MAP().values().iterator().next(), SHARDING_DB_NAMES::contains);
}
private static File getFile(final String fileName) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
index 4196ed5..9b7498b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
@@ -64,7 +64,6 @@ public final class BatchPreparedStatementExecutorTest extends AbstractBaseExecut
when(sqlStatementContext.getTablesContext()).thenReturn(mock(TablesContext.class));
}
- @SuppressWarnings("unchecked")
@Test
public void assertNoPreparedStatement() throws SQLException {
PreparedStatement preparedStatement = getPreparedStatement();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
index 227ee79..cc787fa 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/ConnectionAdapterTest.java
@@ -47,8 +47,8 @@ public final class ConnectionAdapterTest extends AbstractShardingSphereDataSourc
@After
public void tearDown() {
TransactionTypeHolder.clear();
- XAShardingTransactionManagerFixture.getInvocations().clear();
- BASEShardingTransactionManagerFixture.getInvocations().clear();
+ XAShardingTransactionManagerFixture.getINVOCATIONS().clear();
+ BASEShardingTransactionManagerFixture.getINVOCATIONS().clear();
}
@Test
@@ -97,9 +97,9 @@ public final class ConnectionAdapterTest extends AbstractShardingSphereDataSourc
try (ShardingSphereConnection actual = getShardingSphereDataSource().getConnection()) {
actual.setAutoCommit(false);
assertTrue(actual.getShardingTransactionManager().isInTransaction());
- assertThat(XAShardingTransactionManagerFixture.getInvocations().size(), is(1));
+ assertThat(XAShardingTransactionManagerFixture.getINVOCATIONS().size(), is(1));
actual.setAutoCommit(false);
- assertThat(XAShardingTransactionManagerFixture.getInvocations().size(), is(1));
+ assertThat(XAShardingTransactionManagerFixture.getINVOCATIONS().size(), is(1));
} finally {
TransactionTypeHolder.clear();
}
@@ -119,7 +119,7 @@ public final class ConnectionAdapterTest extends AbstractShardingSphereDataSourc
TransactionTypeHolder.set(TransactionType.XA);
try (ShardingSphereConnection actual = getShardingSphereDataSource().getConnection()) {
actual.commit();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.COMMIT));
} finally {
TransactionTypeHolder.clear();
}
@@ -131,7 +131,7 @@ public final class ConnectionAdapterTest extends AbstractShardingSphereDataSourc
try (ShardingSphereConnection actual = getShardingSphereDataSource().getConnection()) {
actual.setAutoCommit(false);
actual.setAutoCommit(true);
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.COMMIT));
} finally {
TransactionTypeHolder.clear();
}
@@ -151,7 +151,7 @@ public final class ConnectionAdapterTest extends AbstractShardingSphereDataSourc
TransactionTypeHolder.set(TransactionType.XA);
try (ShardingSphereConnection actual = getShardingSphereDataSource().getConnection()) {
actual.rollback();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.ROLLBACK));
} finally {
TransactionTypeHolder.clear();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index 822518d..1b6992f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -93,8 +93,8 @@ public final class ShardingSphereConnectionTest {
try {
connection.close();
TransactionTypeHolder.clear();
- XAShardingTransactionManagerFixture.getInvocations().clear();
- BASEShardingTransactionManagerFixture.getInvocations().clear();
+ XAShardingTransactionManagerFixture.getINVOCATIONS().clear();
+ BASEShardingTransactionManagerFixture.getINVOCATIONS().clear();
} catch (final SQLException ignored) {
}
}
@@ -113,22 +113,22 @@ public final class ShardingSphereConnectionTest {
public void assertXATransactionOperation() throws SQLException {
connection = new ShardingSphereConnection(dataSourceMap, schemaContexts, TransactionType.XA);
connection.setAutoCommit(false);
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.BEGIN));
connection.commit();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.COMMIT));
connection.rollback();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
+ assertTrue(XAShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.ROLLBACK));
}
@Test
public void assertBASETransactionOperation() throws SQLException {
connection = new ShardingSphereConnection(dataSourceMap, schemaContexts, TransactionType.BASE);
connection.setAutoCommit(false);
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
+ assertTrue(BASEShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.BEGIN));
connection.commit();
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(BASEShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.COMMIT));
connection.rollback();
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
+ assertTrue(BASEShardingTransactionManagerFixture.getINVOCATIONS().contains(TransactionOperationType.ROLLBACK));
}
@Test
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java
index 5d344f0..0e9848e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java
@@ -34,7 +34,7 @@ import java.util.Map;
public abstract class AbstractShardingTransactionManagerFixture implements ShardingTransactionManager {
@Getter
- private static Collection<TransactionOperationType> invocations = new LinkedList<>();
+ private static final Collection<TransactionOperationType> INVOCATIONS = new LinkedList<>();
private final Map<String, DataSource> dataSourceMap = new HashMap<>();
@@ -47,7 +47,7 @@ public abstract class AbstractShardingTransactionManagerFixture implements Shard
@Override
public final boolean isInTransaction() {
- return invocations.contains(TransactionOperationType.BEGIN);
+ return INVOCATIONS.contains(TransactionOperationType.BEGIN);
}
@Override
@@ -57,17 +57,17 @@ public abstract class AbstractShardingTransactionManagerFixture implements Shard
@Override
public final void begin() {
- invocations.add(TransactionOperationType.BEGIN);
+ INVOCATIONS.add(TransactionOperationType.BEGIN);
}
@Override
public final void commit() {
- invocations.add(TransactionOperationType.COMMIT);
+ INVOCATIONS.add(TransactionOperationType.COMMIT);
}
@Override
public final void rollback() {
- invocations.add(TransactionOperationType.ROLLBACK);
+ INVOCATIONS.add(TransactionOperationType.ROLLBACK);
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
index 26f42b8..06e0a79 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -170,7 +170,7 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
}
private void assertResultSet(final int resultSetCount, final int id, final Object pwd, final Object assistPwd) throws SQLException {
- try (Connection conn = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection();
+ try (Connection conn = getDATABASE_TYPE_MAP().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection();
Statement stmt = conn.createStatement()) {
ResultSet resultSet = stmt.executeQuery(SELECT_ALL_SQL);
int count = 1;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
index 4599377..a745cab 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptStatementTest.java
@@ -168,7 +168,7 @@ public final class EncryptStatementTest extends AbstractShardingSphereDataSource
}
private void assertResultSet(final int resultSetCount, final int id, final Object pwd, final Object plain) throws SQLException {
- try (Connection conn = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection();
+ try (Connection conn = getDATABASE_TYPE_MAP().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection();
Statement stmt = conn.createStatement()) {
ResultSet resultSet = stmt.executeQuery(SELECT_SQL_TO_ASSERT);
int count = 1;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
index b047ed0..50f7231 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
@@ -122,7 +122,7 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat
}
private void assertResultSet(final boolean isShadow, final int resultSetCount, final Object cipherPwd) throws SQLException {
- final Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2"));
+ final Map<String, DataSource> dataMaps = getDATABASE_TYPE_MAP().get(DatabaseTypes.getActualDatabaseType("H2"));
DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0");
try (Statement statement = dataSource.getConnection().createStatement()) {
ResultSet resultSet = statement.executeQuery(SELECT_SQL);
@@ -136,7 +136,7 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat
}
private void assertResultSet(final boolean isShadow, final int id, final int resultSetCount, final Object cipherPwd) throws SQLException {
- final Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2"));
+ final Map<String, DataSource> dataMaps = getDATABASE_TYPE_MAP().get(DatabaseTypes.getActualDatabaseType("H2"));
DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0");
try (PreparedStatement statement = dataSource.getConnection().prepareStatement(SELECT_SQL_BY_ID)) {
statement.setObject(1, id);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java
index 248b8a9..a63e28d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowStatementTest.java
@@ -86,7 +86,7 @@ public final class ShadowStatementTest extends AbstractShardingSphereDataSourceF
}
private void assertResultSet(final boolean isShadow, final int resultSetCount, final Object cipherPwd) throws SQLException {
- final Map<String, DataSource> dataMaps = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2"));
+ final Map<String, DataSource> dataMaps = getDATABASE_TYPE_MAP().get(DatabaseTypes.getActualDatabaseType("H2"));
DataSource dataSource = isShadow ? dataMaps.get("jdbc_1") : dataMaps.get("jdbc_0");
try (Statement statement = dataSource.getConnection().createStatement()) {
ResultSet resultSet = statement.executeQuery(SELECT_SQL);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
index 6dea0ef..c1e9877 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java
@@ -225,13 +225,11 @@ public final class CircuitBreakerResultSet extends AbstractUnsupportedOperationR
return null;
}
- @SuppressWarnings("deprecation")
@Override
public InputStream getUnicodeStream(final int columnIndex) {
return null;
}
- @SuppressWarnings("deprecation")
@Override
public InputStream getUnicodeStream(final String columnLabel) {
return null;
@@ -297,13 +295,11 @@ public final class CircuitBreakerResultSet extends AbstractUnsupportedOperationR
return null;
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) {
return null;
}
- @SuppressWarnings("deprecation")
@Override
public BigDecimal getBigDecimal(final String columnLabel, final int scale) {
return null;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
index b6381d2..23f7bf4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java
@@ -130,7 +130,6 @@ public final class CircuitBreakerPreparedStatement extends AbstractUnsupportedOp
public void setAsciiStream(final int parameterIndex, final InputStream x, final long length) {
}
- @SuppressWarnings("deprecation")
@Override
public void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractSpringJUnitTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractSpringJUnitTest.java
index d56c27e..7ab6be8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractSpringJUnitTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractSpringJUnitTest.java
@@ -84,7 +84,6 @@ public abstract class AbstractSpringJUnitTest extends AbstractJUnit4SpringContex
return Arrays.asList("schema/dbtbl_0.sql", "schema/dbtbl_1.sql");
}
- @SuppressWarnings("unchecked")
@SneakyThrows(SQLException.class)
private void reInitMetaData() {
SchemaContextsBuilder schemaContextsBuilder = createSchemaContextsBuilder();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/OrchestrationShardingMasterSlaveNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/Orchest [...]
index f6d392b..a8f2186 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/OrchestrationShardingMasterSlaveNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/OrchestrationShardingMasterSlaveNamespaceTest.java
@@ -56,7 +56,6 @@ public class OrchestrationShardingMasterSlaveNamespaceTest extends AbstractJUnit
assertThat(shardingRule.getTableRules().iterator().next().getLogicTable(), is("t_order"));
}
- @SuppressWarnings("unchecked")
private Map<String, DataSource> getDataSourceMap(final String shardingSphereDataSourceName) {
OrchestrationShardingSphereDataSource shardingSphereDataSource = applicationContext.getBean(shardingSphereDataSourceName, OrchestrationShardingSphereDataSource.class);
ShardingSphereDataSource dataSource = (ShardingSphereDataSource) FieldValueUtil.getFieldValue(shardingSphereDataSource, "dataSource");
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnection.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnection.java
index f9e836b..e8a17c7 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnection.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnection.java
@@ -63,7 +63,7 @@ public final class BackendConnection implements JDBCExecutionConnection, AutoClo
private TransactionType transactionType;
- private boolean supportHint;
+ private final boolean supportHint;
@Setter
private int connectionId;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java b/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
index 9c9b0d1..efe5d57 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
@@ -52,7 +52,7 @@ import java.util.Set;
*/
public class OrchestrationConfigurationConverter extends AbstractConfigurationConverter {
- private ShardingOrchestrationFacade shardingOrchestrationFacade = ShardingOrchestrationFacade.getInstance();
+ private final ShardingOrchestrationFacade shardingOrchestrationFacade = ShardingOrchestrationFacade.getInstance();
@Override
public ProxyConfiguration convert(final ShardingConfiguration shardingConfiguration) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/InternalResultSet.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/InternalResultSet.java
index 7716fa9..b8a457c 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/InternalResultSet.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/InternalResultSet.java
@@ -36,7 +36,7 @@ public final class InternalResultSet {
private final MySQLFieldCountPacket header;
- private List<MySQLColumnDefinition41Packet> fieldDescriptors = new ArrayList<>();
+ private final List<MySQLColumnDefinition41Packet> fieldDescriptors = new ArrayList<>();
- private List<MySQLTextResultSetRowPacket> fieldValues = new ArrayList<>();
+ private final List<MySQLTextResultSetRowPacket> fieldValues = new ArrayList<>();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java
index 346746f..8a3df45 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDMLVisitor.java
@@ -196,7 +196,6 @@ public final class MySQLDMLVisitor extends MySQLVisitor implements DMLVisitor {
return new OnDuplicateKeyColumnsSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), columns);
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitReplace(final ReplaceContext ctx) {
// TODO :FIXME, since there is no segment for replaceValuesClause, ReplaceStatement is created by sub rule.
@@ -497,7 +496,6 @@ public final class MySQLDMLVisitor extends MySQLVisitor implements DMLVisitor {
return visit(ctx.tableReferences());
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTableReferences(final TableReferencesContext ctx) {
CollectionValue<TableReferenceSegment> result = new CollectionValue<>();
@@ -554,7 +552,6 @@ public final class MySQLDMLVisitor extends MySQLVisitor implements DMLVisitor {
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitJoinedTable(final JoinedTableContext ctx) {
JoinedTableSegment result = new JoinedTableSegment();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDCLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDCLVisitor.java
index 1b2f1bb..4e08c71 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDCLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDCLVisitor.java
@@ -69,7 +69,6 @@ public final class OracleDCLVisitor extends OracleVisitor implements DCLVisitor
return result;
}
- @SuppressWarnings("unchecked")
private Collection<SimpleTableSegment> getTableFromPrivilegeClause(final ObjectPrivilegeClauseContext ctx) {
return null == ctx.onObjectClause().tableName() ? Collections.emptyList() : Collections.singletonList((SimpleTableSegment) visit(ctx.onObjectClause().tableName()));
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDDLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDDLVisitor.java
index 80ca684..06def35 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDDLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDDLVisitor.java
@@ -233,7 +233,6 @@ public final class OracleDDLVisitor extends OracleVisitor implements DDLVisitor
return new DropColumnDefinitionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), columns);
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
DropTableStatement result = new DropTableStatement();
@@ -241,7 +240,6 @@ public final class OracleDDLVisitor extends OracleVisitor implements DDLVisitor
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTruncateTable(final TruncateTableContext ctx) {
TruncateStatement result = new TruncateStatement();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java
index b76f500..970b0d8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/impl/OracleDMLVisitor.java
@@ -365,7 +365,6 @@ public final class OracleDMLVisitor extends OracleVisitor implements DMLVisitor
return visit(ctx.tableReferences());
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTableReferences(final TableReferencesContext ctx) {
CollectionValue<TableReferenceSegment> result = new CollectionValue<>();
@@ -417,7 +416,6 @@ public final class OracleDMLVisitor extends OracleVisitor implements DMLVisitor
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitJoinedTable(final JoinedTableContext ctx) {
JoinedTableSegment result = new JoinedTableSegment();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
index 30dda68..ca83dd8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
@@ -268,7 +268,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitUpdate(final UpdateContext ctx) {
UpdateStatement result = new UpdateStatement();
@@ -293,7 +292,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
return super.visitSetTargetList(ctx);
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitDelete(final DeleteContext ctx) {
DeleteStatement result = new DeleteStatement();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java
index 05ed727..872f746 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/impl/SQL92DMLVisitor.java
@@ -183,7 +183,6 @@ public final class SQL92DMLVisitor extends SQL92Visitor implements DMLVisitor {
return new CommonExpressionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.getText());
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitDelete(final DeleteContext ctx) {
DeleteStatement result = new DeleteStatement();
@@ -334,7 +333,6 @@ public final class SQL92DMLVisitor extends SQL92Visitor implements DMLVisitor {
return visit(ctx.tableReferences());
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTableReferences(final TableReferencesContext ctx) {
CollectionValue<TableReferenceSegment> result = new CollectionValue<>();
@@ -386,7 +384,6 @@ public final class SQL92DMLVisitor extends SQL92Visitor implements DMLVisitor {
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitJoinedTable(final JoinedTableContext ctx) {
JoinedTableSegment result = new JoinedTableSegment();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDDLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDDLVisitor.java
index 0b29d18..e6f3ec8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDDLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDDLVisitor.java
@@ -233,7 +233,6 @@ public final class SQLServerDDLVisitor extends SQLServerVisitor implements DDLVi
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTruncateTable(final TruncateTableContext ctx) {
TruncateStatement result = new TruncateStatement();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java
index ac24c4f..73f3d11 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/impl/SQLServerDMLVisitor.java
@@ -383,7 +383,6 @@ public final class SQLServerDMLVisitor extends SQLServerVisitor implements DMLVi
return visit(ctx.tableReferences());
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitTableReferences(final TableReferencesContext ctx) {
CollectionValue<TableReferenceSegment> result = new CollectionValue<>();
@@ -435,7 +434,6 @@ public final class SQLServerDMLVisitor extends SQLServerVisitor implements DMLVi
return result;
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitJoinedTable(final JoinedTableContext ctx) {
JoinedTableSegment result = new JoinedTableSegment();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/SQLParserEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/SQLParserEngine.java
index 80f0d85..8056139 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/SQLParserEngine.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/SQLParserEngine.java
@@ -38,7 +38,7 @@ public final class SQLParserEngine {
private final SQLParseResultCache cache = new SQLParseResultCache();
- private ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
+ private final ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
// TODO check skywalking plugin
/*
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/hook/ParsingHookRegistryTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/hook/ParsingHookRegistryTest.java
index 0ece57c..93881d6 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/hook/ParsingHookRegistryTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/hook/ParsingHookRegistryTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
public final class ParsingHookRegistryTest {
- private ParsingHookRegistry registry = ParsingHookRegistry.getInstance();
+ private final ParsingHookRegistry registry = ParsingHookRegistry.getInstance();
@Before
public void setUp() {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/SQLCasesRegistry.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/SQLCasesRegistry.java
index b10d50a..0e5b127 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/SQLCasesRegistry.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/SQLCasesRegistry.java
@@ -27,7 +27,7 @@ public final class SQLCasesRegistry {
private static final SQLCasesRegistry INSTANCE = new SQLCasesRegistry();
@Getter
- private SQLCasesLoader sqlCasesLoader;
+ private final SQLCasesLoader sqlCasesLoader;
private SQLCasesRegistry() {
sqlCasesLoader = new SQLCasesLoader("sql/supported");
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/UnsupportedSQLCasesRegistry.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/UnsupportedSQLCasesRegistry.java
index 42d15b6..9d0c6b4 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/UnsupportedSQLCasesRegistry.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/sql/loader/UnsupportedSQLCasesRegistry.java
@@ -27,7 +27,7 @@ public final class UnsupportedSQLCasesRegistry {
private static final UnsupportedSQLCasesRegistry INSTANCE = new UnsupportedSQLCasesRegistry();
@Getter
- private SQLCasesLoader sqlCasesLoader;
+ private final SQLCasesLoader sqlCasesLoader;
private UnsupportedSQLCasesRegistry() {
sqlCasesLoader = new SQLCasesLoader("sql/unsupported");
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MariaDBXAConnectionWrapperTest.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MariaDBXAConnectionWrapperTest.java
index 69d88dc..1e6ffe7 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MariaDBXAConnectionWrapperTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MariaDBXAConnectionWrapperTest.java
@@ -49,7 +49,6 @@ public final class MariaDBXAConnectionWrapperTest {
private Connection connection;
@Before
- @SuppressWarnings("unchecked")
public void setUp() throws SQLException, ClassNotFoundException {
Connection connection = (Connection) mock(Class.forName("org.mariadb.jdbc.MariaDbConnection"));
DataSource dataSource = DataSourceUtils.build(HikariDataSource.class, DatabaseTypes.getActualDatabaseType("MariaDB"), "ds1");
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/OracleXAConnectionWrapperTest.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/OracleXAConnectionWrapperTest.java
index 8e78e75..b94ab93 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/OracleXAConnectionWrapperTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/OracleXAConnectionWrapperTest.java
@@ -57,7 +57,6 @@ public final class OracleXAConnectionWrapperTest {
@SneakyThrows(ReflectiveOperationException.class)
@Before
@Ignore("oracle jdbc driver is not import because of the limitations of license")
- @SuppressWarnings("unchecked")
public void setUp() throws SQLException {
Connection connection = (Connection) mock(Class.forName("oracle.jdbc.internal.OracleConnection"));
DataSource dataSource = DataSourceUtils.build(HikariDataSource.class, DatabaseTypes.getActualDatabaseType("Oracle"), "ds1");
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java
index 32b975f..d8c7403 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java
@@ -49,7 +49,7 @@ public final class MockSeataServer {
private final int port;
@Getter
- private MockMessageHandler messageHandler = new MockMessageHandler();
+ private final MockMessageHandler messageHandler = new MockMessageHandler();
@Getter
private final AtomicBoolean initialized = new AtomicBoolean(false);
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/ResourceDataSource.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/ResourceDataSource.java
index fe3676b..a263a66 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/ResourceDataSource.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/ResourceDataSource.java
@@ -29,7 +29,7 @@ public final class ResourceDataSource {
private final String originalName;
- private String uniqueResourceName;
+ private final String uniqueResourceName;
private final DataSource dataSource;