You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/02/05 16:38:28 UTC
[shardingsphere] branch master updated: For code style (#9355)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 9424b26 For code style (#9355)
9424b26 is described below
commit 9424b261f6a125a06890c706bf56f7dd410423f3
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Feb 6 00:37:52 2021 +0800
For code style (#9355)
* Remove useless codes
* For code style
* For code style
* For code style
---
.../exception/PluginConfigurationException.java | 8 ++---
.../swapper/YamlAgentConfigurationSwapper.java | 8 +++--
.../core/plugin/PluginBootServiceManager.java | 3 ++
.../agent/core/spi/PluginServiceLoader.java | 6 +++-
.../metrics/api/reporter/MetricsReporter.java | 8 +++--
.../register/PrometheusMetricsRegisterTest.java | 9 ++---
.../jaeger/advice/JDBCExecutorCallbackAdvice.java | 10 +++---
.../tracing/jaeger/constant/JaegerConstants.java | 7 +++-
.../agent/plugin/tracing/AgentRunner.java | 8 ++---
.../zipkin/advice/JDBCExecutorCallbackAdvice.java | 12 +++----
.../tracing/zipkin/constant/ZipkinConstants.java | 1 +
.../tracing/zipkin/collector/ZipkinCollector.java | 5 +--
.../query/binary/bind/PostgreSQLComBindPacket.java | 3 +-
.../rewrite/condition/EncryptConditionEngine.java | 1 -
.../ha/rule/biulder/HARuleBuilder.java | 2 +-
.../shardingsphere/ha/mgr/MGRHATypeTest.java | 4 +--
.../ha/spring/boot/HASpringBootStarterTest.java | 1 +
.../boot/ReplicaQuerySpringBootStarterTest.java | 1 +
.../impl/ShardingPaginationParameterRewriter.java | 2 +-
.../src/test/resources/sharding/select.xml | 2 +-
.../impl/ShardingDropTableStatementValidator.java | 2 +-
.../metadata/GovernanceMetaDataContexts.java | 2 +-
.../yaml/config/YamlConfigurationConverter.java | 5 ++-
.../core/registry/RegistryCenterNodeTest.java | 7 +++-
.../statement/ddl/AlterIndexStatementContext.java | 2 +-
.../statement/ddl/DropIndexStatementContext.java | 2 +-
.../builtin/yaml/swapper/UserRuleYamlSwapper.java | 2 +-
.../ShardingSphereFilterYamlConstructor.java | 2 +-
.../YamlRuleConfigurationSwapperEngine.java | 11 +++---
.../yaml/swapper/UserRuleYamlSwapperTest.java | 2 +-
.../infra/yaml/engine/YamlEngineTest.java | 2 +-
.../metadata/MetaDataContextsBuilderTest.java | 17 +++++-----
.../core/statement/ShardingSphereStatement.java | 2 +-
.../driver/executor/AbstractBaseExecutorTest.java | 7 ----
.../jdbc/core/statement/CalciteStatementTest.java | 4 +--
.../connection/CircuitBreakerConnection.java | 9 +++--
.../AbstractDbcp2DataSourcePropertiesSetter.java | 2 +-
.../text/TextProtocolBackendHandlerFactory.java | 5 +--
.../rdl/AlterShardingRuleBackendHandler.java | 3 +-
.../impl/ReplicaQueryRuleQueryBackendHandler.java | 8 ++---
.../impl/StandardBootstrapInitializer.java | 8 +----
.../impl/GovernanceBootstrapInitializerTest.java | 10 ++----
.../query/builder/ResponsePacketBuilderTest.java | 3 ++
.../common/exception/DataCheckFailException.java | 2 ++
.../UnexpectedDataRecordOrderException.java | 2 ++
.../sqlbuilder/ScalingSQLBuilderFactory.java | 3 ++
.../executor/job/FinishedCheckJobExecutor.java | 3 +-
.../core/executor/job/ScalingJobExecutor.java | 5 ++-
.../scaling/core/job/FinishedCheckJob.java | 8 ++---
.../job/check/DataConsistencyCheckerFactory.java | 3 ++
.../job/position/PositionInitializerFactory.java | 3 ++
.../scaling/core/job/progress/JobProgress.java | 2 +-
.../scaling/core/job/schedule/JobScheduler.java | 2 +-
.../core/job/schedule/JobSchedulerCenter.java | 3 ++
.../scaling/core/api/impl/ScalingAPIImplTest.java | 7 ++--
.../distribution/DistributionChannelTest.java | 6 ++--
.../common/datasource/DataSourceFactoryTest.java | 9 ++---
.../executor/importer/DataRecordMergerTest.java | 14 ++++----
.../fixture/FixtureDataConsistencyChecker.java | 3 +-
.../core/fixture/FixtureScalingSQLBuilder.java | 3 +-
.../FixtureShardingSphereJDBCConfiguration.java | 4 +++
.../checker/AbstractDataSourceCheckerTest.java | 16 ++++-----
.../splitter/InventoryTaskSplitterTest.java | 2 +-
.../scaling/core/util/JDBCUtilTest.java | 2 +-
.../component/MySQLDataConsistencyChecker.java | 3 +-
.../mysql/component/MySQLScalingSQLBuilder.java | 3 +-
.../netty/MySQLBinlogEventPacketDecoderTest.java | 17 +++++-----
.../PostgreSQLDataConsistencyChecker.java | 3 +-
.../component/PostgreSQLScalingSQLBuilder.java | 3 +-
.../visitor/format/impl/MySQLFormatSQLVisitor.java | 2 +-
.../statement/impl/MySQLStatementSQLVisitor.java | 2 +-
.../impl/PostgreSQLDMLStatementSQLVisitor.java | 2 +-
.../statement/dml/impl/SelectStatementAssert.java | 3 +-
.../statement/dml/impl/UpdateStatementAssert.java | 3 +-
.../{JdbcUtils.java => JDBCAgentTestUtils.java} | 18 ++++++----
.../agent/test/common/util/OkHttpUtils.java | 9 +++--
.../agent/test/metrics/MetricsPluginIT.java | 39 +++++++++++-----------
.../test/integration/engine/it/ddl/BaseDDLIT.java | 3 +-
.../ITBlockJUnit4ClassRunnerWithParameters.java | 4 +--
79 files changed, 222 insertions(+), 212 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/exception/PluginConfigurationException.java b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/exception/PluginConfigurationException.java
index 5abf8d1..69fb449 100644
--- a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/exception/PluginConfigurationException.java
+++ b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/exception/PluginConfigurationException.java
@@ -22,12 +22,8 @@ package org.apache.shardingsphere.agent.exception;
*/
public final class PluginConfigurationException extends RuntimeException {
- /**
- * Constructs an exception with formatted error message and arguments.
- *
- * @param errorMessage formatted error message
- * @param args arguments of error message
- */
+ private static final long serialVersionUID = -3298813951573088711L;
+
public PluginConfigurationException(final String errorMessage, final Object... args) {
super(String.format(errorMessage, args));
}
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlAgentConfigurationSwapper.java b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlAgentConfigurationSwapper.java
index ea7c1dc..3b98575 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlAgentConfigurationSwapper.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlAgentConfigurationSwapper.java
@@ -17,16 +17,20 @@
package org.apache.shardingsphere.agent.core.config.yaml.swapper;
-import java.util.Map;
-import java.util.stream.Collectors;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.config.AgentConfiguration;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.YamlAgentConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.YamlPluginConfiguration;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
* YAML agent configuration swapper.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class YamlAgentConfigurationSwapper {
/**
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
index 024040c..3300435 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.agent.core.plugin;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.agent.config.AgentConfiguration;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
@@ -30,6 +32,7 @@ import java.util.Set;
/**
* Plugin boot service manager.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
public final class PluginBootServiceManager {
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
index 2902e7c..44d3e22 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
@@ -17,15 +17,19 @@
package org.apache.shardingsphere.agent.core.spi;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.agent.core.plugin.PluginLoader;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.ServiceLoader;
-import org.apache.shardingsphere.agent.core.plugin.PluginLoader;
/**
* Plugin service loader.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PluginServiceLoader {
/**
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/reporter/MetricsReporter.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/reporter/MetricsReporter.java
index fb03dff..d81b075 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/reporter/MetricsReporter.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/reporter/MetricsReporter.java
@@ -17,14 +17,18 @@
package org.apache.shardingsphere.agent.metrics.api.reporter;
-import java.util.Collection;
-import java.util.List;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.metrics.api.MetricsRegister;
import org.apache.shardingsphere.agent.metrics.api.entity.Metric;
+import java.util.Collection;
+import java.util.List;
+
/**
* Metrics reporter.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class MetricsReporter {
private static MetricsRegister metricsRegister;
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegisterTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
index 95a9051..e82024c 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
@@ -20,10 +20,11 @@ package org.apache.shardingsphere.agent.metrics.prometheus.register;
import io.prometheus.client.Counter;
import io.prometheus.client.Gauge;
import io.prometheus.client.Histogram;
-import java.util.Map;
import org.apache.shardingsphere.agent.metrics.prometheus.util.ReflectiveUtil;
import org.junit.Test;
+import java.util.Map;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -35,7 +36,7 @@ public final class PrometheusMetricsRegisterTest {
@SuppressWarnings("unchecked")
public void assertCounter() {
String routeDatasource = "route_datasource";
- String[] labelNames = new String[] {"name"};
+ String[] labelNames = {"name"};
prometheusMetricsRegister.registerCounter(routeDatasource, labelNames, "the shardingsphere proxy route datasource");
prometheusMetricsRegister.counterIncrement(routeDatasource, labelNames);
prometheusMetricsRegister.counterIncrement(routeDatasource, labelNames, 2);
@@ -55,7 +56,7 @@ public final class PrometheusMetricsRegisterTest {
@SuppressWarnings("unchecked")
public void assertGauge() {
String connectionTotal = "proxy_connection_total";
- String[] labelNames = new String[] {"connectionTotal"};
+ String[] labelNames = {"connectionTotal"};
prometheusMetricsRegister.registerGauge(connectionTotal, labelNames, "the shardingsphere proxy request total");
prometheusMetricsRegister.gaugeIncrement(connectionTotal, labelNames);
prometheusMetricsRegister.gaugeIncrement(connectionTotal, labelNames);
@@ -77,7 +78,7 @@ public final class PrometheusMetricsRegisterTest {
@SuppressWarnings("unchecked")
public void assertHistogram() {
String name = "proxy_execute_latency_millis";
- String[] labelNames = new String[] {"name"};
+ String[] labelNames = {"name"};
prometheusMetricsRegister.registerHistogram(name, labelNames, "the shardingsphere proxy executor latency millis");
prometheusMetricsRegister.recordTime(name, labelNames, 1000);
String latencyMillis = "execute_latency_millis";
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
index a752c64..f83db92 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
@@ -29,7 +29,6 @@ import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
-import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
@@ -52,19 +51,18 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
if ((boolean) args[1]) {
builder.asChildOf(root);
} else {
- final JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- final ExecutionUnit unit = executionUnit.getExecutionUnit();
+ JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
Method getMetadataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
getMetadataMethod.setAccessible(true);
DataSourceMetaData metaData = (DataSourceMetaData) getMetadataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
builder.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.withTag(Tags.DB_TYPE.getKey(), JaegerConstants.DB_TYPE_VALUE)
- .withTag(Tags.DB_INSTANCE.getKey(), unit.getDataSourceName())
+ .withTag(Tags.DB_INSTANCE.getKey(), executionUnit.getExecutionUnit().getDataSourceName())
.withTag(Tags.PEER_HOSTNAME.getKey(), metaData.getHostName())
.withTag(Tags.PEER_PORT.getKey(), metaData.getPort())
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
- .withTag(Tags.DB_STATEMENT.getKey(), unit.getSqlUnit().getSql())
- .withTag(JaegerConstants.ShardingSphereTags.DB_BIND_VARIABLES.getKey(), unit.getSqlUnit().getParameters().toString());
+ .withTag(Tags.DB_STATEMENT.getKey(), executionUnit.getExecutionUnit().getSqlUnit().getSql())
+ .withTag(JaegerConstants.ShardingSphereTags.DB_BIND_VARIABLES.getKey(), executionUnit.getExecutionUnit().getSqlUnit().getParameters().toString());
}
target.setAttachment(builder.startActive(true));
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/constant/JaegerConstants.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/constant/JaegerConstants.java
index 99cfc1e..5e5bc3c 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/constant/JaegerConstants.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/constant/JaegerConstants.java
@@ -18,8 +18,11 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant;
import io.opentracing.tag.StringTag;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
-public class JaegerConstants {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class JaegerConstants {
public static final String ROOT_SPAN = "jaeger_root_span";
@@ -33,6 +36,7 @@ public class JaegerConstants {
/**
* Error log tag keys.
*/
+ @NoArgsConstructor(access = AccessLevel.PRIVATE)
public static final class ErrorLogTagKeys {
public static final String EVENT = "event";
@@ -47,6 +51,7 @@ public class JaegerConstants {
/**
* ShardingSphere tags.
*/
+ @NoArgsConstructor(access = AccessLevel.PRIVATE)
public static final class ShardingSphereTags {
/**
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
index 405fa5c..139209e 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
@@ -36,8 +36,8 @@ import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.Statement;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
@Slf4j
public final class AgentRunner extends BlockJUnit4ClassRunner {
@@ -46,7 +46,7 @@ public final class AgentRunner extends BlockJUnit4ClassRunner {
private static ResettableClassFileTransformer byteBuddyAgent;
- private static final String[] ENHANCEMENT_CLASSES = new String[]{
+ private static final String[] ENHANCEMENT_CLASSES = {
"org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask",
"org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback",
"org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine",
@@ -61,7 +61,7 @@ public final class AgentRunner extends BlockJUnit4ClassRunner {
@Override
protected Statement withBeforeClasses(final Statement statement) {
ByteBuddyAgent.install();
- final Set<String> classes = Sets.newHashSet(ENHANCEMENT_CLASSES);
+ Collection<String> classes = Sets.newHashSet(ENHANCEMENT_CLASSES);
byteBuddyAgent = new AgentBuilder.Default()
.with(new ByteBuddy().with(TypeValidation.ENABLED))
.type(ElementMatchers.namedOneOf(ENHANCEMENT_CLASSES))
@@ -78,7 +78,7 @@ public final class AgentRunner extends BlockJUnit4ClassRunner {
try {
Class<?> klass = Class.forName(className);
log.info("It is successful to enhance the {}", klass);
- } catch (ClassNotFoundException ignore) {
+ } catch (final ClassNotFoundException ignored) {
}
});
return super.withBeforeClasses(statement);
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
index b0e4715..f0ae4cd 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
@@ -20,12 +20,11 @@ package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
+import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
-import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
@@ -47,19 +46,18 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
if ((boolean) args[1]) {
target.setAttachment(Tracing.currentTracer().newChild(root.context()).name(OPERATION_NAME).start());
} else {
- final JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- final ExecutionUnit unit = executionUnit.getExecutionUnit();
+ JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
Method getMetadataMethod = JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class);
getMetadataMethod.setAccessible(true);
DataSourceMetaData metaData = (DataSourceMetaData) getMetadataMethod.invoke(target, new Object[]{executionUnit.getStorageResource().getConnection().getMetaData()});
Span span = Tracing.currentTracer().nextSpan().name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
span.tag(ZipkinConstants.Tags.DB_TYPE, ZipkinConstants.DB_TYPE_VALUE);
- span.tag(ZipkinConstants.Tags.DB_INSTANCE, unit.getDataSourceName());
+ span.tag(ZipkinConstants.Tags.DB_INSTANCE, executionUnit.getExecutionUnit().getDataSourceName());
span.tag(ZipkinConstants.Tags.PEER_HOSTNAME, metaData.getHostName());
span.tag(ZipkinConstants.Tags.PEER_PORT, String.valueOf(metaData.getPort()));
- span.tag(ZipkinConstants.Tags.DB_STATEMENT, unit.getSqlUnit().getSql());
- span.tag(ZipkinConstants.Tags.DB_BIND_VARIABLES, unit.getSqlUnit().getParameters().toString());
+ span.tag(ZipkinConstants.Tags.DB_STATEMENT, executionUnit.getExecutionUnit().getSqlUnit().getSql());
+ span.tag(ZipkinConstants.Tags.DB_BIND_VARIABLES, executionUnit.getExecutionUnit().getSqlUnit().getParameters().toString());
span.start();
target.setAttachment(span);
}
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/constant/ZipkinConstants.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/constant/ZipkinConstants.java
index 81443d7..71fb814 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/constant/ZipkinConstants.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/constant/ZipkinConstants.java
@@ -32,6 +32,7 @@ public final class ZipkinConstants {
public static final String DB_TYPE_VALUE = "shardingsphere-proxy";
+ @NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class Tags {
/**
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/collector/ZipkinCollector.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/collector/ZipkinCollector.java
index 5f9e590..543e77a 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/collector/ZipkinCollector.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/collector/ZipkinCollector.java
@@ -33,10 +33,7 @@ public class ZipkinCollector extends ExternalResource implements CollectorRule {
@Override
@SneakyThrows
protected void before() {
- Tracing.newBuilder()
- .currentTraceContext(StrictCurrentTraceContext.create())
- .spanReporter(SPANS::add)
- .build();
+ Tracing.newBuilder().currentTraceContext(StrictCurrentTraceContext.create()).spanReporter(SPANS::add).build();
}
@Override
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
index c2984b7..5211b20 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/binary/bind/PostgreSQLComBindPacket.java
@@ -28,7 +28,6 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.bin
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.binary.bind.protocol.PostgreSQLBinaryProtocolValueFactory;
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -48,7 +47,7 @@ public final class PostgreSQLComBindPacket extends PostgreSQLCommandPacket {
private final boolean binaryRowData;
- public PostgreSQLComBindPacket(final PostgreSQLPacketPayload payload, final int connectionId) throws SQLException {
+ public PostgreSQLComBindPacket(final PostgreSQLPacketPayload payload, final int connectionId) {
payload.readInt4();
payload.readStringNul();
statementId = payload.readStringNul();
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
index 3f986ce..2cce404 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
@@ -67,7 +67,6 @@ public final class EncryptConditionEngine {
if (!whereSegment.isPresent()) {
return Collections.emptyList();
}
-
ExpressionSegment expression = ((WhereAvailable) sqlStatementContext).getWhere().get().getExpr();
ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
Collection<AndPredicate> andPredicates = new LinkedList<>(expressionBuilder.extractAndPredicates().getAndPredicates());
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java
index 6f44d95..7835978 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/rule/biulder/HARuleBuilder.java
@@ -49,7 +49,7 @@ public final class HARuleBuilder implements ShardingSphereRuleBuilder<HARule, HA
for (HADataSourceRuleConfiguration each : ruleConfig.getDataSources()) {
dataSourceSet.addAll(each.getDataSourceNames());
}
- dataSourceMap.entrySet().removeIf(stringDataSourceEntry -> !dataSourceSet.contains(stringDataSourceEntry.getKey()));
+ dataSourceMap.entrySet().removeIf(entry -> !dataSourceSet.contains(entry.getKey()));
return new HARule(ruleConfig, databaseType, dataSourceMap, schemaName);
}
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/test/java/org/apache/shardingsphere/ha/mgr/MGRHATypeTest.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/test/java/org/apache/shardingsphere/ha/mgr/MGRHATypeTest.java
index ac5cb73..2f909c0 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/test/java/org/apache/shardingsphere/ha/mgr/MGRHATypeTest.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-provider/shardingsphere-ha-mgr/src/test/java/org/apache/shardingsphere/ha/mgr/MGRHATypeTest.java
@@ -109,9 +109,9 @@ public final class MGRHATypeTest {
} catch (final SQLException ex) {
throw new ShardingSphereException(ex);
}
- Map<String, DataSource> dataSourceMap = new HashMap<>();
+ Map<String, DataSource> dataSourceMap = new HashMap<>(3, 1);
for (int i = 0; i < 3; i++) {
- dataSourceMap.put("ds_" + i, dataSources.get(i));
+ dataSourceMap.put(String.format("ds_%s", i), dataSources.get(i));
}
mgrHaType.getProps().setProperty("groupName", "group_name");
mgrHaType.updatePrimaryDataSource(dataSourceMap, "ha_db", Collections.emptySet(), "group_name", null);
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/src/test/java/org/apache/shardingsphere/ha/spring/boot/HASpringBootStarterTest.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/src/test/java/org/apache/shardingsphere/ha/spring/boot/HASpringBootStarterTest.java
index 5e84c0d..b6d18c1 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/src/test/java/org/apache/shardingsphere/ha/spring/boot/HASpringBootStarterTest.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/src/test/java/org/apache/shardingsphere/ha/spring/boot/HASpringBootStarterTest.java
@@ -53,6 +53,7 @@ public class HASpringBootStarterTest {
@Test
public void assertHARuleConfiguration() {
assertThat(config.getDataSources().size(), is(1));
+ assertTrue(config.getDataSources().stream().findFirst().isPresent());
HADataSourceRuleConfiguration dataSourceRuleConfig = config.getDataSources().stream().findFirst().get();
assertThat(dataSourceRuleConfig.getName(), is("pr_ds"));
assertThat(dataSourceRuleConfig.getLoadBalancerName(), is("random"));
diff --git a/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-spring/shardingsphere-replica-query-spring-boot-starter/src/test/java/org/apache/shardingsphere/replicaquery/spring/boot/ReplicaQuerySpringBootStarterTest.java b/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-spring/shardingsphere-replica-query-spring-boot-starter/src/test/java/org/apache/shardingsphere/replicaquery/spring/boot/ReplicaQuerySpringBootStarterTest.java
index 0ecf2d4..5cb6674 100644
--- a/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-spring/shardingsphere-replica-query-spring-boot-starter/src/test/java/org/apache/shardingsphere/replicaquery/spring/boot/ReplicaQuerySpringBootStarterTest.java
+++ b/shardingsphere-features/shardingsphere-replica-query/shardingsphere-replica-query-spring/shardingsphere-replica-query-spring-boot-starter/src/test/java/org/apache/shardingsphere/replicaquery/spring/boot/ReplicaQuerySpringBootStarterTest.java
@@ -53,6 +53,7 @@ public class ReplicaQuerySpringBootStarterTest {
@Test
public void assertReplicaQueryRuleConfiguration() {
assertThat(config.getDataSources().size(), is(1));
+ assertTrue(config.getDataSources().stream().findFirst().isPresent());
ReplicaQueryDataSourceRuleConfiguration dataSourceRuleConfig = config.getDataSources().stream().findFirst().get();
assertThat(dataSourceRuleConfig.getName(), is("pr_ds"));
assertThat(dataSourceRuleConfig.getPrimaryDataSourceName(), is("primary_ds"));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
index 0134616..b15bf92 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
@@ -48,7 +48,7 @@ public final class ShardingPaginationParameterRewriter implements ParameterRewri
PaginationContext pagination = selectStatementContext.getPaginationContext();
pagination.getOffsetParameterIndex().ifPresent(offsetParameterIndex -> rewriteOffset(pagination, offsetParameterIndex, (StandardParameterBuilder) parameterBuilder));
pagination.getRowCountParameterIndex().ifPresent(
- rowCountParameterIndex -> rewriteRowCount(pagination, rowCountParameterIndex, (StandardParameterBuilder) parameterBuilder, selectStatementContext));
+ optional -> rewriteRowCount(pagination, optional, (StandardParameterBuilder) parameterBuilder, selectStatementContext));
}
private void rewriteOffset(final PaginationContext pagination, final int offsetParameterIndex, final StandardParameterBuilder parameterBuilder) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
index 6bf9a19..ced2c36 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/resources/sharding/select.xml
@@ -27,7 +27,7 @@
<output sql="SELECT * FROM t_account_0 WHERE account_id = 100" />
</rewrite-assertion>
- <rewrite-assertion id="select_with_not_exsist" db-type="MySQL">
+ <rewrite-assertion id="select_with_not_exists" db-type="MySQL">
<input sql="SELECT * FROM t_account a WHERE not exists (select * from t_account_detail where a.account_id=account_id and account_id=1000) and account_id = 100" />
<output sql="SELECT * FROM t_account_0 a WHERE not exists (select * from t_account_detail_0 where a.account_id=account_id and account_id=1000) and account_id = 100" />
<output sql="SELECT * FROM t_account_1 a WHERE not exists (select * from t_account_detail_1 where a.account_id=account_id and account_id=1000) and account_id = 100" />
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
index e23cfeb..bd3c145 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
@@ -56,7 +56,7 @@ public final class ShardingDropTableStatementValidator extends ShardingDDLStatem
Collection<String> inUsedTable = new LinkedList<>();
Set<String> dropTables = sqlStatement.getTables().stream().map(each -> each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet());
Set<String> actualTables = routeContext.getRouteUnits().stream().flatMap(each -> each.getTableMappers().stream().map(RouteMapper::getActualName)).collect(Collectors.toSet());
- Collection<String> tableMeta = this.shardingRule.getTableRules().stream().filter(each -> !dropTables.contains(each.getLogicTable()))
+ Collection<String> tableMeta = shardingRule.getTableRules().stream().filter(each -> !dropTables.contains(each.getLogicTable()))
.flatMap(each -> each.getActualDataNodes().stream().map(DataNode::getTableName)).collect(Collectors.toSet());
for (String each : actualTables) {
if (tableMeta.contains(each)) {
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 4941030..b9debbf 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -144,7 +144,7 @@ public final class GovernanceMetaDataContexts implements MetaDataContexts {
@Override
public LockContext getLockContext() {
- return this.lockContext;
+ return lockContext;
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
index c963c99..91037aa 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlConfigurationConverter.java
@@ -17,10 +17,12 @@
package org.apache.shardingsphere.governance.core.yaml.config;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.shardingsphere.governance.core.yaml.swapper.DataSourceConfigurationYamlSwapper;
-import org.apache.shardingsphere.infra.auth.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.auth.builtin.yaml.config.YamlUserRuleConfiguration;
import org.apache.shardingsphere.infra.auth.builtin.yaml.swapper.UserRuleYamlSwapper;
+import org.apache.shardingsphere.infra.auth.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -36,6 +38,7 @@ import java.util.stream.Collectors;
/**
* Configuration converter for YAML content.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class YamlConfigurationConverter {
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterNodeTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterNodeTest.java
index e954e05..bd84b76 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterNodeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterNodeTest.java
@@ -17,14 +17,17 @@
package org.apache.shardingsphere.governance.core.registry;
+import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
import org.junit.Test;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Optional;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
public final class RegistryCenterNodeTest {
@@ -42,7 +45,9 @@ public final class RegistryCenterNodeTest {
@Test
public void assertGetGovernanceSchema() {
- assertThat(registryCenterNode.getGovernanceSchema("/states/datanodes/replica_query_db/replica_ds_0").get().getSchemaName(), is("replica_query_db"));
+ Optional<GovernanceSchema> actual = registryCenterNode.getGovernanceSchema("/states/datanodes/replica_query_db/replica_ds_0");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get().getSchemaName(), is("replica_query_db"));
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
index fc50334..3470172 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/AlterIndexStatementContext.java
@@ -48,7 +48,7 @@ public final class AlterIndexStatementContext extends CommonSQLStatementContext<
@Override
public Collection<SimpleTableSegment> getAllTables() {
Optional<SimpleTableSegment> simpleTableSegment = AlterIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
- return simpleTableSegment.isPresent() ? Collections.singletonList(simpleTableSegment.get()) : Collections.emptyList();
+ return simpleTableSegment.map(Collections::singletonList).orElse(Collections.emptyList());
}
@Override
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
index 3dc38a6..14ff9c3 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/DropIndexStatementContext.java
@@ -48,7 +48,7 @@ public final class DropIndexStatementContext extends CommonSQLStatementContext<D
@Override
public Collection<SimpleTableSegment> getAllTables() {
Optional<SimpleTableSegment> simpleTableSegment = DropIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
- return simpleTableSegment.isPresent() ? Collections.singletonList(simpleTableSegment.get()) : Collections.emptyList();
+ return simpleTableSegment.map(Collections::singletonList).orElse(Collections.emptyList());
}
@Override
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapper.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapper.java
index 52ec6bf..bb9e64f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapper.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapper.java
@@ -36,7 +36,7 @@ public final class UserRuleYamlSwapper implements YamlSwapper<YamlUserRuleConfig
@Override
public YamlUserRuleConfiguration swapToYamlConfiguration(final Collection<ShardingSphereUser> data) {
YamlUserRuleConfiguration result = new YamlUserRuleConfiguration();
- Map<String, YamlUserConfiguration> users = new LinkedHashMap<>();
+ Map<String, YamlUserConfiguration> users = new LinkedHashMap<>(data.size(), 1);
for (ShardingSphereUser each : data) {
users.put(each.getUsername(), swapToYamlConfiguration(each));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
index 6654dc8..b76ff04 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/engine/constructor/ShardingSphereFilterYamlConstructor.java
@@ -38,7 +38,7 @@ public final class ShardingSphereFilterYamlConstructor extends ShardingSphereYam
@Override
protected Class<?> getClassForName(final String name) throws ClassNotFoundException {
- for (Class<? extends Object> each : acceptClasses) {
+ for (Class<?> each : acceptClasses) {
if (name.equals(each.getName())) {
return super.getClassForName(name);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngine.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngine.java
index 80dc607..9dff4af 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngine.java
@@ -46,7 +46,7 @@ public final class YamlRuleConfigurationSwapperEngine {
* @param ruleConfigurations rule configurations
* @return YAML rule configurations
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Collection<YamlRuleConfiguration> swapToYamlConfigurations(final Collection<RuleConfiguration> ruleConfigurations) {
Collection<YamlRuleConfiguration> result = new LinkedList<>();
for (Entry<RuleConfiguration, YamlRuleConfigurationSwapper> entry : OrderedSPIRegistry.getRegisteredServices(ruleConfigurations, YamlRuleConfigurationSwapper.class).entrySet()) {
@@ -61,6 +61,7 @@ public final class YamlRuleConfigurationSwapperEngine {
* @param yamlRuleConfigs YAML rule configurations
* @return rule configurations
*/
+ @SuppressWarnings("rawtypes")
public Collection<RuleConfiguration> swapToRuleConfigurations(final Collection<YamlRuleConfiguration> yamlRuleConfigs) {
Collection<RuleConfiguration> result = new LinkedList<>();
Collection<Class<?>> ruleConfigurationTypes = yamlRuleConfigs.stream().map(YamlRuleConfiguration::getRuleConfigurationType).collect(Collectors.toList());
@@ -87,12 +88,14 @@ public final class YamlRuleConfigurationSwapperEngine {
*
* @return YAML shortcuts
*/
+ @SuppressWarnings("rawtypes")
@SneakyThrows(ReflectiveOperationException.class)
public static Map<String, Class<?>> getYamlShortcuts() {
- Map<String, Class<?>> result = new HashMap<>();
- for (YamlRuleConfigurationSwapper each : ShardingSphereServiceLoader.newServiceInstances(YamlRuleConfigurationSwapper.class)) {
+ Collection<YamlRuleConfigurationSwapper> swappers = ShardingSphereServiceLoader.newServiceInstances(YamlRuleConfigurationSwapper.class);
+ Map<String, Class<?>> result = new HashMap<>(swappers.size(), 1);
+ for (YamlRuleConfigurationSwapper each : swappers) {
Class<?> yamlRuleConfigurationClass = Class.forName(((ParameterizedType) each.getClass().getGenericInterfaces()[0]).getActualTypeArguments()[0].getTypeName());
- result.put("!" + each.getRuleTagName(), yamlRuleConfigurationClass);
+ result.put(String.format("!%s", each.getRuleTagName()), yamlRuleConfigurationClass);
}
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapperTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapperTest.java
index d79a03e..4153974 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapperTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/builtin/yaml/swapper/UserRuleYamlSwapperTest.java
@@ -39,7 +39,7 @@ public final class UserRuleYamlSwapperTest {
@Test
public void assertSwapToYaml() {
- DefaultAuthentication authentication = new DefaultAuthentication(new LinkedHashSet<>());
+ DefaultAuthentication authentication = new DefaultAuthentication(new LinkedHashSet<>(2, 1));
authentication.getAuthentication().put(new ShardingSphereUser("user1", "pwd1", "127.0.0.1"), new ShardingSpherePrivilege());
authentication.getAuthentication().put(new ShardingSphereUser("user2", "pwd2", "127.0.0.2"), new ShardingSpherePrivilege());
YamlUserRuleConfiguration actual = new UserRuleYamlSwapper().swapToYamlConfiguration(authentication.getAuthentication().keySet());
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngineTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngineTest.java
index 0e382df..d342beb 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngineTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/engine/YamlEngineTest.java
@@ -93,7 +93,7 @@ public final class YamlEngineTest {
@Test(expected = ConstructorException.class)
public void assertUnmarshalMapWithIllegalClasses() {
- YamlEngine.unmarshal("url: !!java.net.URLClassLoader [[!!java.net.URL [\"http://localhost\"]]]", Collections.<Class<?>>emptyList());
+ YamlEngine.unmarshal("url: !!java.net.URLClassLoader [[!!java.net.URL [\"http://localhost\"]]]", Collections.emptyList());
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
index 6914d26..8d6deaf 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilderTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.context.metadata;
-import org.apache.shardingsphere.infra.auth.builtin.DefaultAuthentication;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.context.fixture.FixtureRule;
import org.apache.shardingsphere.infra.context.fixture.FixtureRuleConfiguration;
@@ -37,15 +36,15 @@ import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
public final class MetaDataContextsBuilderTest {
-
+
@Test
public void assertBuildWithoutConfiguration() throws SQLException {
MetaDataContexts actual = new MetaDataContextsBuilder(Collections.emptyMap(), Collections.emptyMap(), null).build();
assertTrue(actual.getAllSchemaNames().isEmpty());
- assertTrue(((DefaultAuthentication) actual.getAuthentication()).getAuthentication().isEmpty());
+ assertTrue(actual.getAuthentication().getAuthentication().isEmpty());
assertTrue(actual.getProps().getProps().isEmpty());
}
-
+
@Test
public void assertBuildWithConfigurationsButWithoutDataSource() throws SQLException {
Properties props = new Properties();
@@ -54,11 +53,11 @@ public final class MetaDataContextsBuilderTest {
Collections.singletonMap("logic_db", Collections.emptyMap()), Collections.singletonMap("logic_db", Collections.singleton(new FixtureRuleConfiguration())), props).build();
assertRules(actual);
assertTrue(actual.getMetaData("logic_db").getResource().getDataSources().isEmpty());
- assertTrue(((DefaultAuthentication) actual.getAuthentication()).getAuthentication().isEmpty());
+ assertTrue(actual.getAuthentication().getAuthentication().isEmpty());
assertThat(actual.getProps().getProps().size(), is(1));
assertThat(actual.getProps().getValue(ConfigurationPropertyKey.EXECUTOR_SIZE), is(1));
}
-
+
@Test
public void assertBuildWithConfigurationsAndDataSources() throws SQLException {
Properties props = new Properties();
@@ -67,16 +66,16 @@ public final class MetaDataContextsBuilderTest {
Collections.singletonMap("logic_db", Collections.singleton(new FixtureRuleConfiguration())), props).build();
assertRules(actual);
assertDataSources(actual);
- assertTrue(((DefaultAuthentication) actual.getAuthentication()).getAuthentication().isEmpty());
+ assertTrue(actual.getAuthentication().getAuthentication().isEmpty());
assertThat(actual.getProps().getProps().size(), is(1));
assertThat(actual.getProps().getValue(ConfigurationPropertyKey.EXECUTOR_SIZE), is(1));
}
-
+
private void assertRules(final MetaDataContexts actual) {
assertThat(actual.getMetaData("logic_db").getRuleMetaData().getRules().size(), is(1));
assertThat(actual.getMetaData("logic_db").getRuleMetaData().getRules().iterator().next(), CoreMatchers.instanceOf(FixtureRule.class));
}
-
+
private void assertDataSources(final MetaDataContexts actual) {
assertThat(actual.getMetaData("logic_db").getResource().getDataSources().size(), is(1));
assertThat(actual.getMetaData("logic_db").getResource().getDataSources().get("ds"), CoreMatchers.instanceOf(MockedDataSource.class));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 75f9151..21b085b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -385,7 +385,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
};
return driverJDBCExecutor.execute(executionGroups, sqlStatement, routeUnits, jdbcExecutorCallback);
}
-
+
private ExecutionContext createExecutionContext(final String sql) throws SQLException {
clearStatements();
LogicSQL logicSQL = createLogicSQL(sql);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
index 073cd04..61277f4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.driver.executor;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
@@ -87,12 +86,6 @@ public abstract class AbstractBaseExecutorTest {
return result;
}
- protected final SQLStatementContext<?> createSQLStatementContext() {
- SQLStatementContext<?> result = mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
- when(result.getTablesContext().getTableNames()).thenReturn(Collections.singleton("table_x"));
- return result;
- }
-
private ConfigurationProperties createConfigurationProperties() {
Properties props = new Properties();
props.setProperty(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY.getKey(), ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY.getDefaultValue());
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
index 18cc540..50dcb35 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/CalciteStatementTest.java
@@ -48,7 +48,7 @@ public final class CalciteStatementTest extends AbstractShardingSphereDataSource
+ "where t_order_calcite.order_id = t_order_item_calcite_sharding.item_id "
+ "AND t_order_item_calcite_sharding.remarks = 't_order_item_calcite_sharding'";
- private static final String SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ORDERBY =
+ private static final String SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ORDER_BY =
"select t_order_calcite.* from t_order_calcite, t_order_item_calcite_sharding "
+ "where t_order_calcite.order_id = t_order_item_calcite_sharding.item_id "
+ "ORDER BY t_order_item_calcite_sharding.user_id";
@@ -149,7 +149,7 @@ public final class CalciteStatementTest extends AbstractShardingSphereDataSource
@Test
public void assertQueryWithCalciteInSingleAndShardingTableOrderBy() throws SQLException {
ShardingSphereStatement preparedStatement = (ShardingSphereStatement) getShardingSphereDataSource().getConnection().createStatement();
- ResultSet resultSet = preparedStatement.executeQuery(SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ORDERBY);
+ ResultSet resultSet = preparedStatement.executeQuery(SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ORDER_BY);
assertNotNull(resultSet);
assertTrue(resultSet.next());
assertThat(resultSet.getInt(1), is(1000));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java
index 99263c0..2dfe0a9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java
@@ -25,7 +25,6 @@ import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOper
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
-import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
@@ -49,11 +48,11 @@ public final class CircuitBreakerConnection extends AbstractUnsupportedOperation
}
@Override
- public void setCatalog(final String catalog) throws SQLException {
+ public void setCatalog(final String catalog) {
}
@Override
- public String getCatalog() throws SQLException {
+ public String getCatalog() {
return "";
}
@@ -137,11 +136,11 @@ public final class CircuitBreakerConnection extends AbstractUnsupportedOperation
}
@Override
- public void setSchema(final String schema) throws SQLException {
+ public void setSchema(final String schema) {
}
@Override
- public String getSchema() throws SQLException {
+ public String getSchema() {
return "";
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/prop/impl/AbstractDbcp2DataSourcePropertiesSetter.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/prop/impl/AbstractDbcp2DataSourcePropertiesSe [...]
index 1e79b9b..b3919ea 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/prop/impl/AbstractDbcp2DataSourcePropertiesSetter.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/datasource/prop/impl/AbstractDbcp2DataSourcePropertiesSetter.java
@@ -46,7 +46,7 @@ public abstract class AbstractDbcp2DataSourcePropertiesSetter implements DataSou
if (PropertyUtil.containPropertyPrefix(environment, datasourcePropPrefix)) {
Map<?, ?> datasourceProperties = PropertyUtil.handle(environment, datasourcePropPrefix, Map.class);
Method method = dataSource.getClass().getMethod("addConnectionProperty", String.class, String.class);
- for (final Entry<?, ?> entry : datasourceProperties.entrySet()) {
+ for (Entry<?, ?> entry : datasourceProperties.entrySet()) {
method.invoke(dataSource, entry.getKey(), entry.getValue());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
index 166c5f3..0c0dd23 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -70,10 +70,7 @@ public final class TextProtocolBackendHandlerFactory {
return distSQLBackendHandler.get();
}
Optional<TextProtocolBackendHandler> databaseAdminBackendHandler = DatabaseAdminBackendHandlerFactory.newInstance(databaseType, sqlStatement, backendConnection);
- if (databaseAdminBackendHandler.isPresent()) {
- return databaseAdminBackendHandler.get();
- }
- return DatabaseBackendHandlerFactory.newInstance(sqlStatement, sql, backendConnection);
+ return databaseAdminBackendHandler.orElseGet(() -> DatabaseBackendHandlerFactory.newInstance(sqlStatement, sql, backendConnection));
}
private static DatabaseType getBackendDatabaseType(final DatabaseType defaultDatabaseType, final BackendConnection backendConnection) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/AlterShardingRuleBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/AlterShardingRuleBackendHandler.java
index f825438..3a52b35 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/AlterShardingRuleBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/AlterShardingRuleBackendHandler.java
@@ -45,7 +45,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Optional;
-import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -120,7 +119,7 @@ public final class AlterShardingRuleBackendHandler extends SchemaRequiredBackend
}
private void checkBindingTable(final ShardingRuleConfiguration shardingRuleConfig, final AlterShardingRuleStatement statement) {
- Set<String> validTables = new HashSet<>();
+ Collection<String> validTables = new HashSet<>();
validTables.addAll(shardingRuleConfig.getTables().stream().map(ShardingTableRuleConfiguration::getLogicTable).collect(Collectors.toSet()));
validTables.addAll(shardingRuleConfig.getAutoTables().stream().map(ShardingAutoTableRuleConfiguration::getLogicTable).collect(Collectors.toSet()));
validTables.addAll(statement.getAddShardingRules().stream().map(TableRuleSegment::getLogicTable).collect(Collectors.toList()));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReplicaQueryRuleQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReplicaQueryRuleQueryBackendHandler.java
index 20ea166..9124433 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReplicaQueryRuleQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReplicaQueryRuleQueryBackendHandler.java
@@ -64,15 +64,11 @@ public final class ReplicaQueryRuleQueryBackendHandler extends SchemaRequiredBac
private void loadRuleConfiguration(final String schemaName) {
Optional<ReplicaQueryRuleConfiguration> ruleConfig = ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations()
.stream().filter(each -> each instanceof ReplicaQueryRuleConfiguration).map(each -> (ReplicaQueryRuleConfiguration) each).findAny();
- if (ruleConfig.isPresent()) {
- data = ruleConfig.get().getDataSources().iterator();
- } else {
- data = Collections.emptyIterator();
- }
+ data = ruleConfig.map(optional -> optional.getDataSources().iterator()).orElse(Collections.emptyIterator());
}
private List<QueryHeader> getQueryHeader() {
- List<QueryHeader> result = new LinkedList();
+ List<QueryHeader> result = new LinkedList<>();
result.add(new QueryHeader(schema, "", "name", "name", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
result.add(new QueryHeader(schema, "", "primaryDataSourceName", "primaryDataSourceName", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
result.add(new QueryHeader(schema, "", "replicaDataSourceNames", "replicaDataSourceNames", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
index c643dc6..1646d48 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
@@ -22,11 +22,8 @@ import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.swapper.YamlProxyConfigurationSwapper;
import org.apache.shardingsphere.scaling.core.config.ScalingContext;
-import org.apache.shardingsphere.scaling.core.config.ServerConfiguration;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
-import java.util.Optional;
-
/**
* Standard bootstrap initializer.
*/
@@ -49,9 +46,6 @@ public final class StandardBootstrapInitializer extends AbstractBootstrapInitial
@Override
protected void initScalingWorker(final YamlProxyConfiguration yamlConfig) {
- Optional<ServerConfiguration> scalingConfigurationOptional = getScalingConfiguration(yamlConfig);
- if (scalingConfigurationOptional.isPresent()) {
- ScalingContext.getInstance().init(scalingConfigurationOptional.get());
- }
+ getScalingConfiguration(yamlConfig).ifPresent(optional -> ScalingContext.getInstance().init(optional));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
index 351652c..efff61a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
@@ -69,7 +69,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
private static final String PROPS_YAML = "conf/reg_center/config_center/props.yaml";
- private FixtureConfigurationRepository configurationRepository = new FixtureConfigurationRepository();
+ private final FixtureConfigurationRepository configurationRepository = new FixtureConfigurationRepository();
@Test
public void assertGetProxyConfiguration() throws IOException {
@@ -79,11 +79,6 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
closeConfigCenter();
}
- @SneakyThrows(IOException.class)
- protected YamlProxyConfiguration makeProxyConfiguration() {
- return ProxyConfigurationLoader.load("/conf/reg_center/");
- }
-
private void initConfigCenter() {
ConfigCenterNode node = new ConfigCenterNode();
configurationRepository.persist(node.getAuthenticationPath(), readYAML(AUTHENTICATION_YAML));
@@ -95,8 +90,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
@SneakyThrows({URISyntaxException.class, IOException.class})
private String readYAML(final String yamlFile) {
- return Files.readAllLines(Paths.get(ClassLoader.getSystemResource(yamlFile).toURI()))
- .stream().map(each -> each + System.lineSeparator()).collect(Collectors.joining());
+ return Files.readAllLines(Paths.get(ClassLoader.getSystemResource(yamlFile).toURI())).stream().map(each -> each + System.lineSeparator()).collect(Collectors.joining());
}
private void closeConfigCenter() {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
index 5822632..9f13885 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/builder/ResponsePacketBuilderTest.java
@@ -35,6 +35,7 @@ import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -47,6 +48,7 @@ public final class ResponsePacketBuilderTest {
List<QueryHeader> queryHeaders = Arrays.asList(queryHeader1, queryHeader2);
QueryResponseHeader queryResponseHeader = new QueryResponseHeader(queryHeaders);
Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildQueryResponsePackets(queryResponseHeader);
+ assertTrue(actual.stream().findAny().isPresent());
assertThat(actual.stream().findAny().get(), anyOf(instanceOf(MySQLFieldCountPacket.class), instanceOf(MySQLColumnDefinition41Packet.class), instanceOf(MySQLEofPacket.class)));
}
@@ -56,6 +58,7 @@ public final class ResponsePacketBuilderTest {
when(updateResponseHeader.getUpdateCount()).thenReturn(10L);
when(updateResponseHeader.getLastInsertId()).thenReturn(100L);
Collection<DatabasePacket<?>> actual = ResponsePacketBuilder.buildUpdateResponsePackets(updateResponseHeader);
+ assertTrue(actual.stream().findAny().isPresent());
MySQLOKPacket actualItem = (MySQLOKPacket) actual.stream().findAny().get();
assertThat(actualItem, instanceOf(MySQLOKPacket.class));
assertThat(actualItem.getAffectedRows(), is(10L));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/DataCheckFailException.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/DataCheckFailException.java
index ad3e94f..1f24566 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/DataCheckFailException.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/DataCheckFailException.java
@@ -22,6 +22,8 @@ package org.apache.shardingsphere.scaling.core.common.exception;
*/
public final class DataCheckFailException extends RuntimeException {
+ private static final long serialVersionUID = -4100671584682823997L;
+
public DataCheckFailException(final String message, final Throwable cause) {
super(message, cause);
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/UnexpectedDataRecordOrderException.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/UnexpectedDataRecordOrderException.java
index 3e49dbc..d5c1a7f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/UnexpectedDataRecordOrderException.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/exception/UnexpectedDataRecordOrderException.java
@@ -23,6 +23,8 @@ import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
@RequiredArgsConstructor
public final class UnexpectedDataRecordOrderException extends RuntimeException {
+ private static final long serialVersionUID = 6023695604738387750L;
+
private final DataRecord beforeDataRecord;
private final DataRecord afterDataRecord;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/sqlbuilder/ScalingSQLBuilderFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/sqlbuilder/ScalingSQLBuilderFactory.java
index 92223f6..1d81f66 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/sqlbuilder/ScalingSQLBuilderFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/common/sqlbuilder/ScalingSQLBuilderFactory.java
@@ -18,6 +18,8 @@
package org.apache.shardingsphere.scaling.core.common.sqlbuilder;
import com.google.common.collect.Maps;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.spi.ScalingEntry;
import org.apache.shardingsphere.scaling.core.spi.ScalingEntryLoader;
@@ -27,6 +29,7 @@ import java.util.Map;
/**
* Scaling SQL builder factory.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ScalingSQLBuilderFactory {
/**
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/FinishedCheckJobExecutor.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/FinishedCheckJobExecutor.java
index 4bd6c67..afe0404 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/FinishedCheckJobExecutor.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/FinishedCheckJobExecutor.java
@@ -22,14 +22,13 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.ScheduleJobBootstrap;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.executor.AbstractScalingExecutor;
-import org.apache.shardingsphere.scaling.core.executor.ScalingExecutor;
import org.apache.shardingsphere.scaling.core.job.FinishedCheckJob;
/**
* Finished check job executor.
*/
@Slf4j
-public final class FinishedCheckJobExecutor extends AbstractScalingExecutor implements ScalingExecutor {
+public final class FinishedCheckJobExecutor extends AbstractScalingExecutor {
private static final String JOB_NAME = "_finished_check";
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
index e31a774..514680a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.executor.AbstractScalingExecutor;
-import org.apache.shardingsphere.scaling.core.executor.ScalingExecutor;
import org.apache.shardingsphere.scaling.core.job.ScalingJob;
import org.apache.shardingsphere.scaling.core.job.schedule.JobSchedulerCenter;
@@ -38,7 +37,7 @@ import java.util.regex.Pattern;
* Scaling job executor.
*/
@Slf4j
-public final class ScalingJobExecutor extends AbstractScalingExecutor implements ScalingExecutor {
+public final class ScalingJobExecutor extends AbstractScalingExecutor {
private static final Pattern CONFIG_PATTERN = Pattern.compile(ScalingConstant.SCALING_ROOT + "/(\\d+)/config");
@@ -58,7 +57,7 @@ public final class ScalingJobExecutor extends AbstractScalingExecutor implements
return;
}
JobConfigurationPOJO jobConfigPOJO = jobConfigPOJOOptional.get();
- if (DataChangedEvent.Type.DELETED.equals(event.getType()) || jobConfigPOJO.isDisabled()) {
+ if (DataChangedEvent.Type.DELETED == event.getType() || jobConfigPOJO.isDisabled()) {
EXECUTING_JOBS.remove(jobConfigPOJO.getJobName());
JobSchedulerCenter.stop(Long.parseLong(jobConfigPOJO.getJobName()));
return;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
index 5b7d719..fa43389 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
@@ -79,11 +79,11 @@ public final class FinishedCheckJob implements SimpleJob {
if (scalingResult.isEmpty()) {
return false;
}
- for (String key : scalingResult.keySet()) {
- boolean isDataValid = scalingResult.get(key).isDataValid();
- boolean isCountValid = scalingResult.get(key).isCountValid();
+ for (String each : scalingResult.keySet()) {
+ boolean isDataValid = scalingResult.get(each).isDataValid();
+ boolean isCountValid = scalingResult.get(each).isCountValid();
if (!isDataValid || !isCountValid) {
- log.error("Scaling job: {}, table: {} data consistency check failed, dataValid: {}, countValid: {}", jobId, key, isDataValid, isCountValid);
+ log.error("Scaling job: {}, table: {} data consistency check failed, dataValid: {}, countValid: {}", jobId, each, isDataValid, isCountValid);
return false;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
index 3237e80..03a454a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.scaling.core.job.check;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.spi.ScalingEntry;
@@ -25,6 +27,7 @@ import org.apache.shardingsphere.scaling.core.spi.ScalingEntryLoader;
/**
* Data consistency checker factory.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataConsistencyCheckerFactory {
/**
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
index 18f67a0..c6d7617 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.scaling.core.job.position;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.spi.ScalingEntryLoader;
import org.apache.shardingsphere.scaling.core.util.ReflectionUtil;
@@ -24,6 +26,7 @@ import org.apache.shardingsphere.scaling.core.util.ReflectionUtil;
/**
* Position initializer factory.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PositionInitializerFactory {
/**
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgress.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgress.java
index 48d7330..776e73f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgress.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgress.java
@@ -155,7 +155,7 @@ public final class JobProgress {
private static Map<String, InventoryTaskProgress> getInventoryTaskProgressMap(final JsonObject inventory) {
JsonObject jsonObject = new JsonObject();
jsonObject.add("inventory", inventory);
- return INVENTORY_POSITION_ADAPTED_GSON.fromJson(jsonObject, JobProgress.class).getInventoryTaskProgressMap();
+ return INVENTORY_POSITION_ADAPTED_GSON.fromJson(jsonObject, JobProgress.class).inventoryTaskProgressMap;
}
private static Map<String, IncrementalTaskProgress> getIncrementalTaskProgressMap(final JsonObject incremental, final String databaseType) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobScheduler.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobScheduler.java
index 0cbbad4..0dd86c8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobScheduler.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobScheduler.java
@@ -104,7 +104,7 @@ public final class JobScheduler implements Runnable {
}
private synchronized void executeIncrementalTask() {
- if (JobStatus.EXECUTE_INCREMENTAL_TASK.equals(jobContext.getStatus())) {
+ if (JobStatus.EXECUTE_INCREMENTAL_TASK == jobContext.getStatus()) {
return;
}
log.info("-------------- Start incremental task --------------");
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
index a175f30..42052fb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
@@ -18,6 +18,8 @@
package org.apache.shardingsphere.scaling.core.job.schedule;
import com.google.common.collect.Maps;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
@@ -34,6 +36,7 @@ import java.util.concurrent.TimeUnit;
/**
* Job scheduler center.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
public final class JobSchedulerCenter {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImplTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImplTest.java
index 6ebb44d..a9b49d0 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImplTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImplTest.java
@@ -52,8 +52,7 @@ public final class ScalingAPIImplTest {
private static ServerConfiguration mockServerConfig() {
ServerConfiguration result = new ServerConfiguration();
- result.setGovernanceConfig(new GovernanceConfiguration("test",
- new GovernanceCenterConfiguration("Zookeeper", EmbedTestingServer.getConnectionString(), new Properties()), true));
+ result.setGovernanceConfig(new GovernanceConfiguration("test", new GovernanceCenterConfiguration("Zookeeper", EmbedTestingServer.getConnectionString(), new Properties()), true));
return result;
}
@@ -71,9 +70,7 @@ public final class ScalingAPIImplTest {
}
private Optional<JobInfo> getJobInfo(final long jobId) {
- return scalingAPI.list().stream()
- .filter(each -> each.getJobId() == jobId)
- .reduce((a, b) -> a);
+ return scalingAPI.list().stream().filter(each -> each.getJobId() == jobId).reduce((a, b) -> a);
}
private JobInfo getNonNullJobInfo(final long jobId) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/channel/distribution/DistributionChannelTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/channel/distribution/DistributionChannelTest.java
index cbdf18b..65cdec5 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/channel/distribution/DistributionChannelTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/channel/distribution/DistributionChannelTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.scaling.core.common.channel.distribution;
-import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.common.channel.AckCallback;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
@@ -56,7 +56,7 @@ public final class DistributionChannelTest {
AtomicInteger lastId = new AtomicInteger();
execute(ackRecords -> {
for (Record record : ackRecords) {
- final int currentId = ((IntPosition) record.getPosition()).getId();
+ int currentId = ((IntPosition) record.getPosition()).getId();
assertTrue(currentId > lastId.get());
lastId.set(currentId);
}
@@ -114,7 +114,7 @@ public final class DistributionChannelTest {
return (int) Arrays.stream(records).filter(each -> each instanceof DataRecord).count();
}
- @AllArgsConstructor
+ @RequiredArgsConstructor
@Getter
private static final class IntPosition implements Position<IntPosition> {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/DataSourceFactoryTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/DataSourceFactoryTest.java
index afc8db3..e79eeda 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/DataSourceFactoryTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/DataSourceFactoryTest.java
@@ -28,17 +28,14 @@ public final class DataSourceFactoryTest {
@Test
public void assertNewJDBCInstance() {
- StandardJDBCDataSourceConfiguration config = new StandardJDBCDataSourceConfiguration(
- "jdbc:h2:mem:test_db_2;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", "root", "password");
- DataSourceWrapper actual = new DataSourceFactory().newInstance(config);
- assertNotNull(actual);
+ StandardJDBCDataSourceConfiguration config = new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test_db_2;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", "root", "password");
+ assertNotNull(new DataSourceFactory().newInstance(config));
}
@Test
public void assertNewShardingSphereJDBCInstance() {
ShardingSphereJDBCDataSourceConfiguration config = new ShardingSphereJDBCDataSourceConfiguration(
FixtureShardingSphereJDBCConfiguration.DATA_SOURCE, FixtureShardingSphereJDBCConfiguration.RULE);
- DataSourceWrapper actual = new DataSourceFactory().newInstance(config);
- assertNotNull(actual);
+ assertNotNull(new DataSourceFactory().newInstance(config));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/DataRecordMergerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/DataRecordMergerTest.java
index f237d5a..3ff18bd 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/DataRecordMergerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/DataRecordMergerTest.java
@@ -270,12 +270,12 @@ public final class DataRecordMergerTest {
}
private DataRecord mockDeleteDataRecord(final String tableName, final int id, final int userId, final int totalPrice) {
- DataRecord preDataRecord = new DataRecord(new PlaceholderPosition(), 3);
- preDataRecord.setType(ScalingConstant.DELETE);
- preDataRecord.setTableName(tableName);
- preDataRecord.addColumn(new Column("id", id, true, true));
- preDataRecord.addColumn(new Column("user_id", userId, true, false));
- preDataRecord.addColumn(new Column("total_price", totalPrice, true, false));
- return preDataRecord;
+ DataRecord result = new DataRecord(new PlaceholderPosition(), 3);
+ result.setType(ScalingConstant.DELETE);
+ result.setTableName(tableName);
+ result.addColumn(new Column("id", id, true, true));
+ result.addColumn(new Column("user_id", userId, true, false));
+ result.addColumn(new Column("total_price", totalPrice, true, false));
+ return result;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
index 786c67c..e1474aa 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
@@ -22,12 +22,11 @@ import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilde
import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.job.check.AbstractDataConsistencyChecker;
import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyCheckResult;
-import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyChecker;
import java.util.Collections;
import java.util.Map;
-public final class FixtureDataConsistencyChecker extends AbstractDataConsistencyChecker implements DataConsistencyChecker {
+public final class FixtureDataConsistencyChecker extends AbstractDataConsistencyChecker {
public FixtureDataConsistencyChecker(final JobContext jobContext) {
super(jobContext);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureScalingSQLBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureScalingSQLBuilder.java
index 21bfd01..9c59296 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureScalingSQLBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureScalingSQLBuilder.java
@@ -18,12 +18,11 @@
package org.apache.shardingsphere.scaling.core.fixture;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.AbstractScalingSQLBuilder;
-import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
import java.util.Map;
import java.util.Set;
-public final class FixtureScalingSQLBuilder extends AbstractScalingSQLBuilder implements ScalingSQLBuilder {
+public final class FixtureScalingSQLBuilder extends AbstractScalingSQLBuilder {
public FixtureScalingSQLBuilder(final Map<String, Set<String>> shardingColumnsMap) {
super(shardingColumnsMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureShardingSphereJDBCConfiguration.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureShardingSphereJDBCConfiguration.java
index b6edcf4..5d93de7 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureShardingSphereJDBCConfiguration.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureShardingSphereJDBCConfiguration.java
@@ -17,6 +17,10 @@
package org.apache.shardingsphere.scaling.core.fixture;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class FixtureShardingSphereJDBCConfiguration {
public static final String DATA_SOURCE = "dataSources:\n ds_0:\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n "
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/AbstractDataSourceCheckerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/AbstractDataSourceCheckerTest.java
index dd23556..623a218 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/AbstractDataSourceCheckerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/AbstractDataSourceCheckerTest.java
@@ -36,21 +36,21 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class AbstractDataSourceCheckerTest {
-
+
@Mock
private DataSource dataSource;
-
+
@Mock
private Connection connection;
-
+
private AbstractDataSourceChecker dataSourceChecker;
-
+
private Collection<DataSource> dataSources;
-
+
@Before
public void setUp() {
dataSourceChecker = new AbstractDataSourceChecker() {
-
+
@Override
public void checkPrivilege(final Collection<? extends DataSource> dataSources) {
}
@@ -67,14 +67,14 @@ public final class AbstractDataSourceCheckerTest {
dataSources = new LinkedList<>();
dataSources.add(dataSource);
}
-
+
@Test
public void assertCheckConnection() throws SQLException {
when(dataSource.getConnection()).thenReturn(connection);
dataSourceChecker.checkConnection(dataSources);
verify(dataSource).getConnection();
}
-
+
@Test(expected = PrepareFailedException.class)
public void assertCheckConnectionFailed() throws SQLException {
when(dataSource.getConnection()).thenThrow(new SQLException("error"));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
index 57dcccb..b88dac3 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitterTest.java
@@ -160,7 +160,7 @@ public final class InventoryTaskSplitterTest {
ScalingDataSourceConfiguration dataSourceConfig = new StandardJDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceConfig(dataSourceConfig);
- Map<String, String> tableMap = new HashMap<>();
+ Map<String, String> tableMap = new HashMap<>(1, 1);
tableMap.put("t_order", "t_order");
result.setTableNameMap(tableMap);
return result;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/JDBCUtilTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/JDBCUtilTest.java
index 6662f61..08b0732 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/JDBCUtilTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/JDBCUtilTest.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class JDBCUtilTest {
+public final class JDBCUtilTest {
@Test
public void assertAppendStandardJDBCDataSourceConfiguration() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataConsistencyChecker.java
index efcbbaa..6c325a2 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataConsistencyChecker.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceWrappe
import org.apache.shardingsphere.scaling.core.common.exception.DataCheckFailException;
import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.job.check.AbstractDataConsistencyChecker;
-import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyChecker;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -41,7 +40,7 @@ import java.util.stream.Collectors;
/**
* MySQL data consistency checker.
*/
-public final class MySQLDataConsistencyChecker extends AbstractDataConsistencyChecker implements DataConsistencyChecker {
+public final class MySQLDataConsistencyChecker extends AbstractDataConsistencyChecker {
public MySQLDataConsistencyChecker(final JobContext jobContext) {
super(jobContext);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLScalingSQLBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLScalingSQLBuilder.java
index 95eda72..6994247 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLScalingSQLBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLScalingSQLBuilder.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.scaling.mysql.component;
import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.AbstractScalingSQLBuilder;
-import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
import java.util.Map;
import java.util.Set;
@@ -28,7 +27,7 @@ import java.util.Set;
/**
* MySQL SQL builder.
*/
-public final class MySQLScalingSQLBuilder extends AbstractScalingSQLBuilder implements ScalingSQLBuilder {
+public final class MySQLScalingSQLBuilder extends AbstractScalingSQLBuilder {
public MySQLScalingSQLBuilder(final Map<String, Set<String>> shardingColumnsMap) {
super(shardingColumnsMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLBinlogEventPacketDecoderTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLBinlogEventPacketDecoderTest.java
index f3a2c2b..ac0584d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLBinlogEventPacketDecoderTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/client/netty/MySQLBinlogEventPacketDecoderTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.scaling.mysql.client.netty;
import io.netty.buffer.ByteBuf;
-
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLBinlogEventType;
import org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.MySQLBinlogTableMapEventPacket;
import org.apache.shardingsphere.scaling.core.util.ReflectionUtil;
@@ -32,8 +31,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -69,13 +68,13 @@ public final class MySQLBinlogEventPacketDecoderTest {
@Test(expected = UnsupportedOperationException.class)
public void assertDecodeWithReadError() {
when(byteBuf.isReadable()).thenReturn(true);
- binlogEventPacketDecoder.decode(null, byteBuf, new ArrayList<>());
+ binlogEventPacketDecoder.decode(null, byteBuf, new LinkedList<>());
}
@Test
public void assertDecodeRotateEvent() {
when(byteBuf.readUnsignedByte()).thenReturn((short) 0, (short) 0, (short) MySQLBinlogEventType.ROTATE_EVENT.getValue());
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(0));
assertThat(binlogContext.getFileName(), is(""));
@@ -85,7 +84,7 @@ public final class MySQLBinlogEventPacketDecoderTest {
public void assertDecodeFormatDescriptionEvent() {
when(byteBuf.readUnsignedByte()).thenReturn((short) 0, (short) 0, (short) MySQLBinlogEventType.FORMAT_DESCRIPTION_EVENT.getValue(), (short) 19);
when(byteBuf.readUnsignedShortLE()).thenReturn(4);
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(0));
assertThat(binlogContext.getChecksumLength(), is(4));
@@ -94,7 +93,7 @@ public final class MySQLBinlogEventPacketDecoderTest {
@Test
public void assertDecodeTableMapEvent() {
when(byteBuf.readUnsignedByte()).thenReturn((short) 0, (short) 0, (short) MySQLBinlogEventType.TABLE_MAP_EVENT.getValue(), (short) 0);
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(0));
assertThat(binlogContext.getTableMap().size(), is(1));
@@ -107,7 +106,7 @@ public final class MySQLBinlogEventPacketDecoderTest {
when(byteBuf.readUnsignedShortLE()).thenReturn(2);
binlogContext.getTableMap().put(0L, tableMapEventPacket);
when(tableMapEventPacket.getColumnDefs()).thenReturn(Collections.emptyList());
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(1));
assertThat(decodedEvents.get(0), instanceOf(WriteRowsEvent.class));
@@ -119,7 +118,7 @@ public final class MySQLBinlogEventPacketDecoderTest {
when(byteBuf.readUnsignedShortLE()).thenReturn(2);
binlogContext.getTableMap().put(0L, tableMapEventPacket);
when(tableMapEventPacket.getColumnDefs()).thenReturn(Collections.emptyList());
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(1));
assertThat(decodedEvents.get(0), instanceOf(UpdateRowsEvent.class));
@@ -131,7 +130,7 @@ public final class MySQLBinlogEventPacketDecoderTest {
when(byteBuf.readUnsignedShortLE()).thenReturn(2);
binlogContext.getTableMap().put(0L, tableMapEventPacket);
when(tableMapEventPacket.getColumnDefs()).thenReturn(Collections.emptyList());
- List<Object> decodedEvents = new ArrayList<>();
+ List<Object> decodedEvents = new LinkedList<>();
binlogEventPacketDecoder.decode(null, byteBuf, decodedEvents);
assertThat(decodedEvents.size(), is(1));
assertThat(decodedEvents.get(0), instanceOf(DeleteRowsEvent.class));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLDataConsistencyChecker.java
index 8fc5005..1758448 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLDataConsistencyChecker.java
@@ -21,7 +21,6 @@ import com.google.common.collect.Maps;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.job.check.AbstractDataConsistencyChecker;
-import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyChecker;
import java.util.Collections;
import java.util.Map;
@@ -29,7 +28,7 @@ import java.util.Map;
/**
* PostgreSQL data consistency checker.
*/
-public final class PostgreSQLDataConsistencyChecker extends AbstractDataConsistencyChecker implements DataConsistencyChecker {
+public final class PostgreSQLDataConsistencyChecker extends AbstractDataConsistencyChecker {
public PostgreSQLDataConsistencyChecker(final JobContext jobContext) {
super(jobContext);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilder.java
index 28cc22c..7ca2a95 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilder.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
import org.apache.shardingsphere.scaling.core.common.record.RecordUtil;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.AbstractScalingSQLBuilder;
-import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
import java.util.Map;
import java.util.Set;
@@ -29,7 +28,7 @@ import java.util.Set;
/**
* PostgreSQL SQL builder.
*/
-public final class PostgreSQLScalingSQLBuilder extends AbstractScalingSQLBuilder implements ScalingSQLBuilder {
+public final class PostgreSQLScalingSQLBuilder extends AbstractScalingSQLBuilder {
public PostgreSQLScalingSQLBuilder(final Map<String, Set<String>> shardingColumnsMap) {
super(shardingColumnsMap);
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
index 4d91cf7..0a02ce8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
@@ -102,7 +102,7 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
setParameterized(Boolean.parseBoolean(props.getProperty("parameterized")));
}
if (props.containsKey("projectionsCountOfLine")) {
- setProjectionsCountOfLine(Integer.valueOf(props.getProperty("projectionsCountOfLine")));
+ setProjectionsCountOfLine(Integer.parseInt(props.getProperty("projectionsCountOfLine")));
}
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index e2b2a49..d7c7847 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -965,7 +965,7 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
result.setSetAssignment((SetAssignmentSegment) visit(ctx.setAssignmentsClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setParameterCount(getCurrentParameterIndex());
+ result.setParameterCount(currentParameterIndex);
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
index b5e6eed..625d316 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
@@ -476,7 +476,7 @@ public final class PostgreSQLDMLStatementSQLVisitor extends PostgreSQLStatementS
result.setRight((TableSegment) visit(ctx.tableReference()));
return result;
}
- return (TableSegment) visit(ctx.tableReference());
+ return visit(ctx.tableReference());
}
@Override
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
index 97dac9d..e00f0cd 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
@@ -37,6 +37,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import java.util.Optional;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -73,7 +74,7 @@ public final class SelectStatementAssert {
if (null != expected.getFrom()) {
TableAssert.assertIs(assertContext, actual.getFrom(), expected.getFrom());
} else {
- assertFalse(assertContext.getText("Actual from should not exist."), null != actual.getFrom());
+ assertNull(assertContext.getText("Actual from should not exist."), actual.getFrom());
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
index 33b9055..383dcce 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
@@ -35,6 +35,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import java.util.Optional;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -62,7 +63,7 @@ public final class UpdateStatementAssert {
if (null != expected.getTable()) {
TableAssert.assertIs(assertContext, actual.getTableSegment(), expected.getTable());
} else {
- assertFalse(assertContext.getText("Actual from should not exist."), null != actual.getTableSegment());
+ assertNull(assertContext.getText("Actual from should not exist."), actual.getTableSegment());
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JdbcUtils.java b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUt [...]
similarity index 92%
rename from shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JdbcUtils.java
rename to shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUtils.java
index 8efda0b..6a0f3b8 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JdbcUtils.java
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUtils.java
@@ -17,6 +17,11 @@
package org.apache.shardingsphere.integration.agent.test.common.util;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.integration.agent.test.common.entity.OrderEntity;
+
+import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -24,13 +29,12 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collection;
import java.util.LinkedList;
-import javax.sql.DataSource;
-import org.apache.shardingsphere.integration.agent.test.common.entity.OrderEntity;
/**
- * Jdbc utils.
+ * JDBC agent test utils.
*/
-public class JdbcUtils {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class JDBCAgentTestUtils {
/**
* Insert order.
@@ -39,7 +43,7 @@ public class JdbcUtils {
* @param dataSource data source
*/
public static void insertOrder(final OrderEntity orderEntity, final DataSource dataSource) {
- String sql = "INSERT INTO t_order (order_id,user_id, status) VALUES (?, ?,?)";
+ String sql = "INSERT INTO t_order (order_id, user_id, status) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
connection.setAutoCommit(false);
preparedStatement.setLong(1, orderEntity.getOrderId());
@@ -58,7 +62,7 @@ public class JdbcUtils {
* @param dataSource data source
*/
public static void insertOrderRollback(final OrderEntity orderEntity, final DataSource dataSource) {
- String sql = "INSERT INTO t_order (order_id,user_id, status) VALUES (?, ?,?)";
+ String sql = "INSERT INTO t_order (order_id, user_id, status) VALUES (?, ?, ?)";
try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
connection.setAutoCommit(false);
preparedStatement.setLong(1, orderEntity.getOrderId());
@@ -92,7 +96,7 @@ public class JdbcUtils {
* @param dataSource data source
*/
public static void updateOrderStatus(final OrderEntity orderEntity, final DataSource dataSource) {
- String sql = "UPDATE t_order SET status = ? where order_id =?";
+ String sql = "UPDATE t_order SET status = ? WHERE order_id =?";
try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
connection.setAutoCommit(false);
preparedStatement.setString(1, orderEntity.getStatus());
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java
index 3ada7d9..4d743a8 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java
@@ -18,12 +18,15 @@
package org.apache.shardingsphere.integration.agent.test.common.util;
import com.google.gson.Gson;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertNotNull;
+
/**
* Ok http utils.
*/
@@ -64,7 +67,7 @@ public final class OkHttpUtils {
public <T> T get(final String url, final Class<T> clazz) throws IOException {
Request request = new Request.Builder().url(url).build();
Response response = client.newCall(request).execute();
- assert response.body() != null;
+ assertNotNull(response.body());
String result = response.body().string();
return GSON.fromJson(result, clazz);
}
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java
index bd91fe4..00daa94 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java
@@ -17,24 +17,25 @@
package org.apache.shardingsphere.integration.agent.test.metrics;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import javax.sql.DataSource;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.integration.agent.test.common.entity.OrderEntity;
import org.apache.shardingsphere.integration.agent.test.common.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.integration.agent.test.common.util.JdbcUtils;
+import org.apache.shardingsphere.integration.agent.test.common.util.JDBCAgentTestUtils;
import org.apache.shardingsphere.integration.agent.test.common.util.OkHttpUtils;
import org.apache.shardingsphere.integration.agent.test.metrics.result.MetricResult;
import org.junit.Test;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
@Slf4j
public final class MetricsPluginIT {
@@ -68,15 +69,15 @@ public final class MetricsPluginIT {
List<Long> results = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
OrderEntity orderEntity = new OrderEntity(i, i, "INSERT_TEST");
- JdbcUtils.insertOrder(orderEntity, dataSource);
+ JDBCAgentTestUtils.insertOrder(orderEntity, dataSource);
results.add(orderEntity.getOrderId());
}
OrderEntity orderEntity = new OrderEntity(1000, 1000, "ROLL_BACK");
- JdbcUtils.insertOrderRollback(orderEntity, dataSource);
- JdbcUtils.updateOrderStatus(orderEntity, dataSource);
- JdbcUtils.selectAllOrders(dataSource);
+ JDBCAgentTestUtils.insertOrderRollback(orderEntity, dataSource);
+ JDBCAgentTestUtils.updateOrderStatus(orderEntity, dataSource);
+ JDBCAgentTestUtils.selectAllOrders(dataSource);
for (Long each : results) {
- JdbcUtils.deleteOrderByOrderId(each, dataSource);
+ JDBCAgentTestUtils.deleteOrderByOrderId(each, dataSource);
}
Properties engineEnvProps = IntegrationTestEnvironment.getInstance().getEngineEnvProps();
try {
@@ -90,8 +91,8 @@ public final class MetricsPluginIT {
try {
MetricResult metricResult = OkHttpUtils.getInstance().get(metricURL, MetricResult.class);
assertResult(metricResult, each);
- } catch (IOException e) {
- log.info("http get prometheus is error :", e);
+ } catch (final IOException ex) {
+ log.info("http get prometheus is error :", ex);
}
}
}
@@ -99,13 +100,13 @@ public final class MetricsPluginIT {
private void assertResult(final MetricResult metricResult, final String metricsName) {
assertThat(metricResult.getStatus(), is("success"));
- assertTrue(metricResult.getData().size() > 0);
+ assertFalse(metricResult.getData().isEmpty());
List<MetricResult.Metric> metricList = metricResult.getData().get(metricsName);
- assertTrue(metricList.size() > 0);
+ assertFalse(metricList.isEmpty());
}
private Collection<String> buildMetricsNames() {
- Collection<String> result = new HashSet<>();
+ Collection<String> result = new HashSet<>(11, 1);
result.add(REQUEST_TOTAL);
result.add(COLLECTION_TOTAL);
result.add(EXECUTE_LATENCY);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
index dab03a6..4e1dbeb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
@@ -93,8 +93,7 @@ public abstract class BaseDDLIT extends SingleIT {
private void dropInitializedTable(final Connection connection) {
try (PreparedStatement preparedStatement = connection.prepareStatement(String.format("DROP TABLE %s", getAssertion().getInitialSQL().getAffectedTable()))) {
preparedStatement.executeUpdate();
- } catch (final SQLException ignored) {
- } catch (final NoSuchTableException ignored) {
+ } catch (final SQLException | NoSuchTableException ignored) {
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITBlockJUnit4ClassRunnerWithParameters.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITBlockJUnit4ClassRunnerWithParameters.java
index da3d7aa..bcca5fd 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITBlockJUnit4ClassRunnerWithParameters.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITBlockJUnit4ClassRunnerWithParameters.java
@@ -45,7 +45,7 @@ public final class ITBlockJUnit4ClassRunnerWithParameters extends BlockJUnit4Cla
public ITBlockJUnit4ClassRunnerWithParameters(final TestWithParameters test) throws InitializationError {
super(test.getTestClass().getJavaClass());
name = test.getName();
- parameters = test.getParameters().toArray(new Object[test.getParameters().size()]);
+ parameters = test.getParameters().toArray(new Object[0]);
}
@Override
@@ -98,7 +98,7 @@ public final class ITBlockJUnit4ClassRunnerWithParameters extends BlockJUnit4Cla
@Override
protected String testName(final FrameworkMethod method) {
- return method.getName() + getName();
+ return method.getName() + name;
}
@Override