You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/07/26 23:23:14 UTC
[shardingsphere] branch master updated: Use raw new HashMap to
instead of guava (#11517)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 6d7e3fe Use raw new HashMap to instead of guava (#11517)
6d7e3fe is described below
commit 6d7e3fe33533f8d8dd098e81d667ce57aabd625a
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Jul 27 07:22:30 2021 +0800
Use raw new HashMap to instead of guava (#11517)
* Use raw new HashMap to instead of guava
* Use raw new HashMap to instead of guava
---
.../AbstractPluginDefinitionService.java | 4 +-
.../agent/core/plugin/PluginLoader.java | 4 +-
.../transformer/ShardingSphereTransformerTest.java | 4 +-
.../agent/core/plugin/loader/PluginLoaderTest.java | 8 ++-
.../advice/CommandExecutorTaskAdviceTest.java | 5 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 8 ++-
.../AbstractJDBCExecutorCallbackAdviceTest.java | 6 +--
.../DatabaseDiscoveryRuleStatementConverter.java | 2 +-
...rDatabaseDiscoveryRuleStatementUpdaterTest.java | 5 +-
.../query/EncryptRuleQueryResultSetTest.java | 6 +--
.../AlterEncryptRuleStatementUpdaterTest.java | 7 ++-
.../ReadwriteSplittingRuleStatementConverter.java | 2 +-
.../ReadwriteSplittingRuleQueryResultSetTest.java | 6 +--
...ReadwriteSplittingRuleStatementUpdaterTest.java | 5 +-
...ReadwriteSplittingRuleStatementUpdaterTest.java | 5 +-
.../impl/PreparedShadowDataSourceRouterTest.java | 6 +--
.../impl/SimpleShadowDataSourceRouterTest.java | 10 +---
.../ComplexInlineShardingAlgorithmTest.java | 14 ++----
.../merge/ShardingResultMergerEngineTest.java | 4 +-
...gDataSourceGroupBroadcastRoutingEngineTest.java | 4 +-
.../engine/type/standard/AbstractSQLRouteTest.java | 3 +-
.../dml/ShardingInsertStatementValidatorTest.java | 6 +--
.../metadata/GovernanceMetaDataContextsTest.java | 3 +-
.../zookeeper/CuratorZookeeperRepositoryTest.java | 6 +--
.../authority/merge/PrivilegeMergeTest.java | 22 ++++-----
.../NativeAuthorityProviderAlgorithmTest.java | 57 +++++++++-------------
.../orderby/engine/OrderByContextEngineTest.java | 8 +--
.../select/pagination/PaginationContextTest.java | 7 +--
.../engine/ProjectionsContextEngineTest.java | 6 +--
.../statement/SQLStatementContextFactoryTest.java | 22 +++------
.../statement/impl/InsertStatementContextTest.java | 6 +--
.../statement/impl/SelectStatementContextTest.java | 19 ++------
.../infra/datanode/DataNodesTest.java | 2 +-
.../impl/StandardMetaDataContextsTest.java | 31 +++---------
.../UnsupportedGeneratedKeysResultSetTest.java | 6 +--
.../DatabaseCommunicationEngineFactoryTest.java | 17 +++----
.../DatabaseCommunicationEngineTest.java | 15 ++----
.../proxy/backend/context/ProxyContextTest.java | 23 ++-------
.../resource/AddResourceBackendHandlerTest.java | 3 +-
.../util/DataSourceParameterConverterTest.java | 14 +++---
.../MySQLAuthenticationEngineTest.java | 18 +------
.../MySQLAuthenticationHandlerTest.java | 19 +++-----
.../command/MySQLCommandExecutorFactoryTest.java | 7 ++-
.../execute/MySQLComStmtExecuteExecutorTest.java | 9 ++--
.../PostgreSQLAuthenticationHandlerTest.java | 5 +-
.../scaling/web/HttpServerHandlerTest.java | 27 ++--------
.../sqlbuilder/ScalingSQLBuilderFactory.java | 4 +-
.../ScalingDataSourceConfigurationWrap.java | 4 +-
.../AbstractDataConsistencyChecker.java | 10 ++--
.../job/progress/yaml/JobProgressYamlSwapper.java | 27 +++++-----
.../core/job/progress/yaml/YamlJobProgress.java | 4 +-
.../scaling/core/util/JobConfigurationUtil.java | 2 +-
.../executor/importer/AbstractImporterTest.java | 6 +--
.../executor/importer/AbstractSqlBuilderTest.java | 14 +++---
.../fixture/FixtureDataConsistencyChecker.java | 12 ++---
.../scaling/core/job/FinishedCheckJobTest.java | 10 ++--
.../scaling/core/job/progress/JobProgressTest.java | 9 ++--
.../checker/MySQLDataConsistencyChecker.java | 8 +--
.../scaling/mysql/component/MySQLImporterTest.java | 7 +--
.../checker/PostgreSQLDataConsistencyChecker.java | 6 +--
.../component/PostgreSQLImporterTest.java | 7 +--
.../component/PostgreSQLScalingSQLBuilderTest.java | 5 +-
.../postgresql/wal/WalEventConverterTest.java | 11 ++---
.../test/mysql/env/ITEnvironmentContext.java | 6 +--
.../EncryptSQLRewriterParameterizedTest.java | 8 +--
.../scenario/MixSQLRewriterParameterizedTest.java | 4 +-
.../ShardingSQLRewriterParameterizedTest.java | 2 +-
.../at/TransactionalSQLExecutionHookTest.java | 9 +---
.../impl/StandardTransactionContextsTest.java | 13 ++---
69 files changed, 234 insertions(+), 430 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
index 6c8c87a..72d054a 100644
--- a/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
+++ b/shardingsphere-agent/shardingsphere-agent-api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.agent.spi.definition;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
*/
public abstract class AbstractPluginDefinitionService implements PluginDefinitionService {
- private final Map<String, PluginInterceptorPoint.Builder> interceptorPointMap = Maps.newHashMap();
+ private final Map<String, PluginInterceptorPoint.Builder> interceptorPointMap = new HashMap<>();
/**
* Define interceptors to collection of plugin interceptor point.
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
index 20bd2e5..217c6c1 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.agent.core.plugin;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.io.ByteStreams;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -43,6 +42,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -105,7 +105,7 @@ public final class PluginLoader extends ClassLoader implements Closeable {
if (null == jarFiles) {
return;
}
- Map<String, PluginInterceptorPoint> pointMap = Maps.newHashMap();
+ Map<String, PluginInterceptorPoint> pointMap = new HashMap<>();
Set<String> ignoredPluginNames = AgentConfigurationRegistry.INSTANCE.get(AgentConfiguration.class).getIgnoredPluginNames();
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
for (File each : jarFiles) {
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
index 6dcced1..2bf4bc3 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer;
-import com.google.common.collect.Maps;
import lombok.SneakyThrows;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -41,6 +40,7 @@ import org.junit.Test;
import org.mockito.internal.util.reflection.FieldReader;
import org.mockito.internal.util.reflection.FieldSetter;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -67,7 +67,7 @@ public final class ShardingSphereTransformerTest {
objectPool.put(MockConstructorAdvice.class.getTypeName(), new MockConstructorAdvice());
objectPool.put(MockInstanceMethodAroundAdvice.class.getTypeName(), new MockInstanceMethodAroundAdvice());
objectPool.put(MockClassStaticMethodAroundAdvice.class.getTypeName(), new MockClassStaticMethodAroundAdvice());
- Map<String, PluginInterceptorPoint> interceptorPointMap = Maps.newHashMap();
+ Map<String, PluginInterceptorPoint> interceptorPointMap = new HashMap<>(2, 1);
PluginInterceptorPoint interceptorPoint = PluginInterceptorPoint.intercept("org.apache.shardingsphere.agent.core.mock.material.Material")
.aroundInstanceMethod(ElementMatchers.named("mock"))
.implement(MockInstanceMethodAroundAdvice.class.getTypeName())
diff --git a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/PluginLoaderTest.java b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/PluginLoaderTest.java
index 24c3343..973b2c5 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/PluginLoaderTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/PluginLoaderTest.java
@@ -17,15 +17,14 @@
package org.apache.shardingsphere.agent.core.plugin.loader;
-import com.google.common.collect.Maps;
import lombok.SneakyThrows;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.pool.TypePool;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.core.mock.advice.MockClassStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.mock.advice.MockClassStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.plugin.PluginLoader;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,6 +32,7 @@ import org.junit.experimental.categories.Category;
import org.mockito.internal.util.reflection.FieldReader;
import org.mockito.internal.util.reflection.FieldSetter;
+import java.util.Collections;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -59,7 +59,6 @@ public final class PluginLoaderTest {
objectPool.put(MockConstructorAdvice.class.getTypeName(), new MockConstructorAdvice());
objectPool.put(MockInstanceMethodAroundAdvice.class.getTypeName(), new MockInstanceMethodAroundAdvice());
objectPool.put(MockClassStaticMethodAroundAdvice.class.getTypeName(), new MockClassStaticMethodAroundAdvice());
- Map<String, PluginInterceptorPoint> interceptorPointMap = Maps.newHashMap();
PluginInterceptorPoint interceptorPoint = PluginInterceptorPoint.intercept("org.apache.shardingsphere.agent.core.mock.material.Material")
.aroundInstanceMethod(ElementMatchers.named("mock"))
.implement(MockInstanceMethodAroundAdvice.class.getTypeName())
@@ -71,8 +70,7 @@ public final class PluginLoaderTest {
.implement(MockConstructorAdvice.class.getTypeName())
.build()
.install();
- interceptorPointMap.put(interceptorPoint.getClassNameOfTarget(), interceptorPoint);
- FieldSetter.setField(PLUGIN_LOADER, PLUGIN_LOADER.getClass().getDeclaredField("interceptorPointMap"), interceptorPointMap);
+ FieldSetter.setField(PLUGIN_LOADER, PLUGIN_LOADER.getClass().getDeclaredField("interceptorPointMap"), Collections.singletonMap(interceptorPoint.getClassNameOfTarget(), interceptorPoint));
}
@Test
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
index 42c8396..58eacda 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
@@ -22,14 +22,15 @@ import io.opentracing.mock.MockSpan;
import io.opentracing.tag.Tags;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractCommandExecutorTaskAdviceTest;
-import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.collector.JaegerCollector;
+import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,7 +45,7 @@ public final class CommandExecutorTaskAdviceTest extends AbstractCommandExecutor
private static final CommandExecutorTaskAdvice ADVICE = new CommandExecutorTaskAdvice();
- private static final Map<String, Object> EXPECTED = Maps.newHashMap();
+ private static final Map<String, Object> EXPECTED = new HashMap<>(2, 1);
@BeforeClass
public static void setup() {
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
index 144d61c4..01c4def 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
@@ -36,6 +35,7 @@ import org.mockito.internal.util.reflection.FieldReader;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -71,8 +71,7 @@ public final class JDBCExecutorCallbackAdviceTest {
@Test
public void assertMethod() {
MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
- Map<String, Object> extraMap = Maps.newHashMap();
- extraMap.put("_root_span_", null);
+ Map<String, Object> extraMap = Collections.singletonMap("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Lists.newArrayList())));
ADVICE.beforeMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
@@ -92,8 +91,7 @@ public final class JDBCExecutorCallbackAdviceTest {
@Test
public void assertExceptionHandle() {
MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
- Map<String, Object> extraMap = Maps.newHashMap();
- extraMap.put("_root_span_", null);
+ Map<String, Object> extraMap = Collections.singletonMap("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Lists.newArrayList())));
ADVICE.beforeMethod(targetObject, executeMethod, new Object[]{executionUnit, false, extraMap}, new MethodInvocationResult());
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/advice/AbstractJDBCExecutorCallbackAdviceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
index 595db4b..e9000c9 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.agent.plugin.tracing.advice;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
@@ -35,6 +34,7 @@ import org.mockito.internal.util.reflection.FieldReader;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.Statement;
+import java.util.HashMap;
import java.util.Map;
import static org.mockito.Mockito.mock;
@@ -54,11 +54,11 @@ public abstract class AbstractJDBCExecutorCallbackAdviceTest implements AdviceTe
@Getter
private Map<String, Object> extraMap;
+ @SuppressWarnings({"rawtypes", "unchecked"})
@SneakyThrows
- @SuppressWarnings("all")
@Override
public void prepare() {
- extraMap = Maps.newHashMap();
+ extraMap = new HashMap<>();
Statement statement = mock(Statement.class);
Connection connection = mock(Connection.class);
DatabaseMetaData metaData = mock(DatabaseMetaData.class);
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDisco [...]
index b95026f..3bcdceb 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java
@@ -43,7 +43,7 @@ public final class DatabaseDiscoveryRuleStatementConverter {
*/
public static DatabaseDiscoveryRuleConfiguration convert(final Collection<DatabaseDiscoveryRuleSegment> ruleSegments) {
Collection<DatabaseDiscoveryDataSourceRuleConfiguration> dataSources = new LinkedList<>();
- Map<String, ShardingSphereAlgorithmConfiguration> discoveryTypes = new HashMap<>();
+ Map<String, ShardingSphereAlgorithmConfiguration> discoveryTypes = new HashMap<>(ruleSegments.size(), 1);
for (DatabaseDiscoveryRuleSegment each : ruleSegments) {
String type = getDatabaseDiscoveryType(each.getName(), each.getDiscoveryTypeName());
dataSources.add(new DatabaseDiscoveryDataSourceRuleConfiguration(each.getName(), new LinkedList<>(each.getDataSources()), type));
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabas [...]
index cbe0be13..e94dad6 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -23,14 +23,13 @@ import org.apache.shardingsphere.dbdiscovery.distsql.parser.segment.DatabaseDisc
import org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.AlterDatabaseDiscoveryRuleStatement;
import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
import org.apache.shardingsphere.infra.distsql.exception.resource.RequiredResourceMissedException;
-import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
+import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.Properties;
@@ -72,6 +71,6 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
private DatabaseDiscoveryRuleConfiguration createCurrentRuleConfiguration() {
DatabaseDiscoveryDataSourceRuleConfiguration dataSourceRuleConfig = new DatabaseDiscoveryDataSourceRuleConfiguration("ha_group", Collections.emptyList(), "TEST");
- return new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), new HashMap<>());
+ return new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), Collections.emptyMap());
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
index 8117a22..5f3804e 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
@@ -29,8 +29,6 @@ import org.junit.Test;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
@@ -61,8 +59,6 @@ public final class EncryptRuleQueryResultSetTest {
EncryptColumnRuleConfiguration encryptColumnRuleConfig = new EncryptColumnRuleConfiguration("user_id", "user_cipher", null, "user_plain", "test");
EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_encrypt", Collections.singleton(encryptColumnRuleConfig));
ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("md5", new Properties());
- Map<String, ShardingSphereAlgorithmConfiguration> encryptors = new HashMap<>();
- encryptors.put("test", shardingSphereAlgorithmConfig);
- return new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfig), encryptors);
+ return new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfig), Collections.singletonMap("test", shardingSphereAlgorithmConfig));
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java
index 10ac9b9..b8a65fa 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java
@@ -23,14 +23,13 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfigu
import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment;
import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment;
import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement;
-import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
+import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.distsql.exception.rule.RuleDefinitionViolationException;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.Properties;
@@ -47,7 +46,7 @@ public final class AlterEncryptRuleStatementUpdaterTest {
@Test(expected = RequiredRuleMissedException.class)
public void assertCheckSQLStatementWithoutToBeAlteredRules() throws RuleDefinitionViolationException {
- updater.checkSQLStatement("foo", createSQLStatement("MD5"), new EncryptRuleConfiguration(Collections.emptyList(), new HashMap<>()), mock(ShardingSphereResource.class));
+ updater.checkSQLStatement("foo", createSQLStatement("MD5"), new EncryptRuleConfiguration(Collections.emptyList(), Collections.emptyMap()), mock(ShardingSphereResource.class));
}
@Test(expected = InvalidAlgorithmConfigurationException.class)
@@ -63,6 +62,6 @@ public final class AlterEncryptRuleStatementUpdaterTest {
private EncryptRuleConfiguration createCurrentRuleConfiguration() {
EncryptTableRuleConfiguration tableRuleConfig = new EncryptTableRuleConfiguration("t_encrypt", Collections.emptyList());
- return new EncryptRuleConfiguration(new LinkedList<>(Collections.singleton(tableRuleConfig)), new HashMap<>());
+ return new EncryptRuleConfiguration(new LinkedList<>(Collections.singleton(tableRuleConfig)), Collections.emptyMap());
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/r [...]
index 72b68c3..6ac11f4 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java
@@ -45,7 +45,7 @@ public final class ReadwriteSplittingRuleStatementConverter {
*/
public static ReadwriteSplittingRuleConfiguration convert(final Collection<ReadwriteSplittingRuleSegment> ruleSegments) {
Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources = new LinkedList<>();
- Map<String, ShardingSphereAlgorithmConfiguration> loadBalancers = new HashMap<>();
+ Map<String, ShardingSphereAlgorithmConfiguration> loadBalancers = new HashMap<>(ruleSegments.size(), 1);
for (ReadwriteSplittingRuleSegment each : ruleSegments) {
String loadBalancerName = getLoadBalancerName(each.getName(), each.getLoadBalancer());
dataSources.add(createDataSourceRuleConfiguration(each.getName(), loadBalancerName, each));
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSetTest.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readw [...]
index 9ea9782..2f8b1cc 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingRuleQueryResultSetTest.java
@@ -28,8 +28,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
@@ -63,8 +61,6 @@ public final class ReadwriteSplittingRuleQueryResultSetTest {
Properties props = new Properties();
props.setProperty("read_weight", "2:1");
ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfiguration = new ShardingSphereAlgorithmConfiguration("random", props);
- Map<String, ShardingSphereAlgorithmConfiguration> loadBalancers = new HashMap<>();
- loadBalancers.put("test", shardingSphereAlgorithmConfiguration);
- return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceRuleConfig), loadBalancers);
+ return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceRuleConfig), Collections.singletonMap("test", shardingSphereAlgorithmConfiguration));
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphe [...]
index ae617e2..d3a7912 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
import org.apache.shardingsphere.infra.distsql.exception.resource.RequiredResourceMissedException;
-import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
+import org.apache.shardingsphere.infra.distsql.exception.rule.RequiredRuleMissedException;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
@@ -30,7 +30,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.Properties;
@@ -72,6 +71,6 @@ public final class AlterReadwriteSplittingRuleStatementUpdaterTest {
private ReadwriteSplittingRuleConfiguration createCurrentRuleConfiguration() {
ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig =
new ReadwriteSplittingDataSourceRuleConfiguration("readwrite_ds", null, "ds_write", Arrays.asList("read_ds_0", "read_ds_1"), "TEST");
- return new ReadwriteSplittingRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), new HashMap<>());
+ return new ReadwriteSplittingRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), Collections.emptyMap());
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsph [...]
index 8a99082..49c1824 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
import org.apache.shardingsphere.infra.distsql.exception.resource.RequiredResourceMissedException;
-import org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
import org.apache.shardingsphere.infra.distsql.exception.rule.DuplicateRuleException;
+import org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
@@ -30,7 +30,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.Properties;
@@ -67,6 +66,6 @@ public final class CreateReadwriteSplittingRuleStatementUpdaterTest {
private ReadwriteSplittingRuleConfiguration getCurrentRuleConfig() {
ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig
= new ReadwriteSplittingDataSourceRuleConfiguration("readwrite_ds", "", "write_ds", Arrays.asList("read_ds_0", "read_ds_1"), "TEST");
- return new ReadwriteSplittingRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), new HashMap<>());
+ return new ReadwriteSplittingRuleConfiguration(new LinkedList<>(Collections.singleton(dataSourceRuleConfig)), Collections.emptyMap());
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceRouterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceRouterTest.java
index 3edf73b..1a3744f 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceRouterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceRouterTest.java
@@ -45,9 +45,7 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -72,11 +70,9 @@ public final class PreparedShadowDataSourceRouterTest {
}
private InsertStatementContext createInsertStatementContext(final List<Object> parameters, final InsertStatement insertStatement, final ShardingSphereSchema schema) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
when(metaData.getSchema()).thenReturn(schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new InsertStatementContext(metaDataMap, parameters, insertStatement, DefaultSchema.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), parameters, insertStatement, DefaultSchema.LOGIC_NAME);
}
@Test
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/SimpleShadowDataSourceRouterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/SimpleShadowDataSourceRouterTest.java
index 08ec2f9..52701b9 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/SimpleShadowDataSourceRouterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/judge/impl/SimpleShadowDataSourceRouterTest.java
@@ -52,8 +52,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -117,11 +115,9 @@ public final class SimpleShadowDataSourceRouterTest {
}
private InsertStatementContext createInsertStatementContext(final InsertStatement insertStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
when(metaData.getSchema()).thenReturn(schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new InsertStatementContext(metaDataMap, Collections.emptyList(), insertStatement, DefaultSchema.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), Collections.emptyList(), insertStatement, DefaultSchema.LOGIC_NAME);
}
@Test
@@ -171,10 +167,8 @@ public final class SimpleShadowDataSourceRouterTest {
}
private SelectStatementContext createSelectStatementContext(final SelectStatement selectStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
when(metaData.getSchema()).thenReturn(schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new SelectStatementContext(metaDataMap, Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
+ return new SelectStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
index 863aa3c..1b96ea2 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
@@ -62,10 +62,10 @@ public final class ComplexInlineShardingAlgorithmTest {
@Test
public void assertDoSharding() {
List<String> availableTargetNames = Lists.newArrayList("t_order_0_0", "t_order_0_1", "t_order_1_0", "t_order_1_1");
- Map<String, Collection<Comparable<?>>> sharingValueMap = new HashMap<>();
+ Map<String, Collection<Comparable<?>>> sharingValueMap = new HashMap<>(2, 1);
sharingValueMap.put("type", Collections.singletonList(2));
sharingValueMap.put("order_id", Collections.singletonList(2));
- Map<String, Range<Comparable<?>>> rangeShardingValueMap = new HashMap<>();
+ Map<String, Range<Comparable<?>>> rangeShardingValueMap = Collections.emptyMap();
ComplexKeysShardingValue<Comparable<?>> shardingValue = new ComplexKeysShardingValue<>("t_order", sharingValueMap, rangeShardingValueMap);
Collection<String> actual = complexInlineShardingAlgorithm.doSharding(availableTargetNames, shardingValue);
assertTrue(actual.size() == 1 && actual.contains("t_order_0_0"));
@@ -74,11 +74,10 @@ public final class ComplexInlineShardingAlgorithmTest {
@Test
public void assertDoShardingWithMultiValue() {
List<String> availableTargetNames = Lists.newArrayList("t_order_0_0", "t_order_0_1", "t_order_1_0", "t_order_1_1");
- Map<String, Collection<Comparable<?>>> sharingValueMap = new HashMap<>();
+ Map<String, Collection<Comparable<?>>> sharingValueMap = new HashMap<>(2, 1);
sharingValueMap.put("type", Arrays.asList(1, 2));
sharingValueMap.put("order_id", Arrays.asList(1, 2));
- Map<String, Range<Comparable<?>>> rangeShardingValueMap = new HashMap<>();
- ComplexKeysShardingValue<Comparable<?>> shardingValue = new ComplexKeysShardingValue<>("t_order", sharingValueMap, rangeShardingValueMap);
+ ComplexKeysShardingValue<Comparable<?>> shardingValue = new ComplexKeysShardingValue<>("t_order", sharingValueMap, Collections.emptyMap());
Collection<String> actual = complexInlineShardingAlgorithm.doSharding(availableTargetNames, shardingValue);
assertTrue(actual.containsAll(availableTargetNames));
}
@@ -86,10 +85,7 @@ public final class ComplexInlineShardingAlgorithmTest {
@Test
public void assertDoShardingWithRangeValue() {
List<String> availableTargetNames = Lists.newArrayList("t_order_0_0", "t_order_0_1", "t_order_1_0", "t_order_1_1");
- Map<String, Collection<Comparable<?>>> sharingValueMap = new HashMap<>();
- Map<String, Range<Comparable<?>>> rangeShardingValueMap = new HashMap<>();
- rangeShardingValueMap.put("type", Range.all());
- ComplexKeysShardingValue<Comparable<?>> shardingValue = new ComplexKeysShardingValue<>("t_order", sharingValueMap, rangeShardingValueMap);
+ ComplexKeysShardingValue<Comparable<?>> shardingValue = new ComplexKeysShardingValue<>("t_order", Collections.emptyMap(), Collections.singletonMap("type", Range.all()));
Collection<String> actual = complexInlineShardingAlgorithmAllowRangeQuery.doSharding(availableTargetNames, shardingValue);
assertTrue(actual.containsAll(availableTargetNames));
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
index b7d1424..95aa55a 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
@@ -49,7 +49,6 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml.
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -112,10 +111,9 @@ public final class ShardingResultMergerEngineTest {
}
private InsertStatementContext createInsertStatementContext(final InsertStatement insertStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
when(metaData.getSchema()).thenReturn(mock(ShardingSphereSchema.class));
+ Map<String, ShardingSphereMetaData> metaDataMap = Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData);
return new InsertStatementContext(metaDataMap, Collections.emptyList(), insertStatement, DefaultSchema.LOGIC_NAME);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java
index 2e53891..66db7af 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.route.engine.type.broadcast;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
@@ -29,6 +28,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -58,7 +58,7 @@ public final class ShardingDataSourceGroupBroadcastRoutingEngineTest {
private TableRule mockTableRule(final List<String> dataSources) {
TableRule result = mock(TableRule.class);
- Map<String, List<DataNode>> dataNodeGroups = Maps.newHashMap();
+ Map<String, List<DataNode>> dataNodeGroups = new HashMap<>(dataSources.size(), 1);
for (String each : dataSources) {
dataNodeGroups.put(each, null);
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index bbf72d2..12411ed 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -64,10 +64,9 @@ public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest {
ShardingSphereSchema schema = buildSchema();
ConfigurationProperties props = new ConfigurationProperties(new Properties());
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine("MySQL");
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(Collections.emptyList(), Lists.newArrayList(shardingRule, singleTableRule));
ShardingSphereMetaData metaData = new ShardingSphereMetaData("sharding_db", mock(ShardingSphereResource.class, RETURNS_DEEP_STUBS), ruleMetaData, schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
+ Map<String, ShardingSphereMetaData> metaDataMap = Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData);
SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataMap, parameters, sqlStatementParserEngine.parse(sql, false), DefaultSchema.LOGIC_NAME);
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, sql, parameters);
RouteContext result = new SQLRouteEngine(Lists.newArrayList(shardingRule, singleTableRule), props).route(logicSQL, metaData);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
index 014781f..6790f15 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
@@ -48,10 +48,8 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import static org.mockito.Mockito.mock;
@@ -73,11 +71,9 @@ public final class ShardingInsertStatementValidatorTest {
}
private InsertStatementContext createInsertStatementContext(final List<Object> parameters, final InsertStatement insertStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
when(metaData.getSchema()).thenReturn(mock(ShardingSphereSchema.class));
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new InsertStatementContext(metaDataMap, parameters, insertStatement, DefaultSchema.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), parameters, insertStatement, DefaultSchema.LOGIC_NAME);
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index ad1d092..bf77574 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -58,7 +58,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
@@ -112,7 +111,7 @@ public final class GovernanceMetaDataContextsTest {
private OptimizeContextFactory mockOptimizeContextFactory() {
OptimizeContextFactory result = mock(OptimizeContextFactory.class);
- when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(new HashMap<>()));
+ when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
return result;
}
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepositoryTest.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/go [...]
index 16bebaa..504f96b 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepositoryTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepositoryTest.java
@@ -61,7 +61,7 @@ import org.mockito.stubbing.VoidAnswer1;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -171,9 +171,7 @@ public final class CuratorZookeeperRepositoryTest {
private void mockField() {
Field locksFiled = CuratorZookeeperRepository.class.getDeclaredField("locks");
locksFiled.setAccessible(true);
- Map<String, InterProcessLock> locks = new HashMap<>();
- locks.put("/locks/glock", interProcessLock);
- locksFiled.set(REPOSITORY, locks);
+ locksFiled.set(REPOSITORY, Collections.singletonMap("/locks/glock", interProcessLock));
}
private void mockBuilder() {
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
index 78051e3..6098f8e 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.authority.merge;
-import org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeMerger;
import org.apache.shardingsphere.authority.model.PrivilegeType;
+import org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeMerger;
import org.apache.shardingsphere.authority.provider.natived.model.privilege.NativePrivileges;
import org.apache.shardingsphere.authority.provider.natived.model.privilege.database.SchemaPrivileges;
import org.apache.shardingsphere.authority.provider.natived.model.privilege.database.TablePrivileges;
@@ -28,12 +28,12 @@ import org.junit.Test;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Optional;
-import static org.junit.Assert.assertEquals;
+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;
@@ -44,19 +44,17 @@ public final class PrivilegeMergeTest {
public void assertPrivilegeMergeResult() {
NativePrivileges privileges = buildPrivilege();
ShardingSphereUser user = new ShardingSphereUser("test", "test", "%");
- Map<ShardingSphereUser, Collection<NativePrivileges>> privilegeMap = new HashMap();
- privilegeMap.put(user, Collections.singletonList(privileges));
- DataNodeContainedRule rule = buildShardingSphereRule();
- Map<ShardingSphereUser, NativePrivileges> result = StoragePrivilegeMerger.merge(privilegeMap, "schema", Collections.singletonList(rule));
- assertEquals(1, result.size());
+ Map<ShardingSphereUser, Collection<NativePrivileges>> privilegeMap = Collections.singletonMap(user, Collections.singletonList(privileges));
+ Map<ShardingSphereUser, NativePrivileges> result = StoragePrivilegeMerger.merge(privilegeMap, "schema", Collections.singletonList(buildShardingSphereRule()));
+ assertThat(result.size(), is(1));
assertTrue(result.containsKey(user));
assertTrue(result.get(user).getAdministrativePrivileges().getPrivileges().isEmpty());
assertTrue(result.get(user).getDatabasePrivileges().getGlobalPrivileges().isEmpty());
- assertEquals(1, result.get(user).getDatabasePrivileges().getSpecificPrivileges().size());
+ assertThat(result.get(user).getDatabasePrivileges().getSpecificPrivileges().size(), is(1));
assertTrue(result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getGlobalPrivileges().isEmpty());
- assertEquals(1, result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().size());
- assertEquals("TableName assert error.", "test", result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().get("test").getTableName());
- assertEquals(1, result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().get("test").getPrivileges().size());
+ assertThat(result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().size(), is(1));
+ assertThat("TableName assert error.", result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().get("test").getTableName(), is("test"));
+ assertThat(result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().get("test").getPrivileges().size(), is(1));
assertTrue(result.get(user).getDatabasePrivileges().getSpecificPrivileges().get("schema").getSpecificPrivileges().get("test").getPrivileges().contains(PrivilegeType.SELECT));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
index f403858..759496a 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
import org.junit.BeforeClass;
@@ -34,15 +33,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -53,46 +51,41 @@ public final class NativeAuthorityProviderAlgorithmTest {
public static void setUp() {
ShardingSphereServiceLoader.register(AuthorityProvideAlgorithm.class);
}
-
+
@Test
public void testAlgorithmType() {
NativeAuthorityProviderAlgorithm algorithm = (NativeAuthorityProviderAlgorithm) TypedSPIRegistry.findRegisteredService(AuthorityProvideAlgorithm.class, "NATIVE", new Properties()).get();
assertThat(algorithm.getType(), is("NATIVE"));
}
-
+
@Test
public void testFindPrivileges() throws SQLException {
NativeAuthorityProviderAlgorithm algorithm = new NativeAuthorityProviderAlgorithm();
Collection<ShardingSphereUser> users = new LinkedList<>();
ShardingSphereUser root = new ShardingSphereUser("root", "", "localhost");
users.add(root);
- Map<String, ShardingSphereMetaData> mataDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mockShardingSphereMetaData(users);
- mataDataMap.put("db0", metaData);
- algorithm.init(mataDataMap, users);
+ algorithm.init(Collections.singletonMap("db0", metaData), users);
Optional<ShardingSpherePrivileges> privileges = algorithm.findPrivileges(new Grantee("root", "localhost"));
- assertPrivilege(privileges);
+ assertTrue(privileges.isPresent());
+ assertPrivilege(privileges.get());
}
-
+
@Test
public void testRefreshPrivileges() throws SQLException {
NativeAuthorityProviderAlgorithm algorithm = new NativeAuthorityProviderAlgorithm();
- Collection<ShardingSphereUser> users = new LinkedList<>();
- ShardingSphereUser root = new ShardingSphereUser("root", "", "localhost");
- users.add(root);
- Map<String, ShardingSphereMetaData> mataDataMap = new HashMap<>();
- ShardingSphereMetaData metaData = mockShardingSphereMetaData(users);
- mataDataMap.put("db0", metaData);
+ Collection<ShardingSphereUser> users = Collections.singletonList(new ShardingSphereUser("root", "", "localhost"));
algorithm.init(Collections.emptyMap(), users);
Optional<ShardingSpherePrivileges> privileges1 = algorithm.findPrivileges(new Grantee("root", "localhost"));
+ assertTrue(privileges1.isPresent());
assertThat(privileges1.get().hasPrivileges(Collections.singletonList(PrivilegeType.SUPER)), is(true));
- algorithm.refresh(mataDataMap, users);
+ algorithm.refresh(Collections.singletonMap("db0", mockShardingSphereMetaData(users)), users);
Optional<ShardingSpherePrivileges> privileges2 = algorithm.findPrivileges(new Grantee("root", "localhost"));
- assertPrivilege(privileges2);
+ assertTrue(privileges2.isPresent());
+ assertPrivilege(privileges2.get());
}
-
- private void assertPrivilege(final Optional<ShardingSpherePrivileges> privileges) {
- assertThat(privileges.isPresent(), is(true));
+
+ private void assertPrivilege(final ShardingSpherePrivileges privileges) {
Collection<PrivilegeType> expected = new LinkedList<>();
expected.add(PrivilegeType.SUPER);
expected.add(PrivilegeType.SELECT);
@@ -100,19 +93,17 @@ public final class NativeAuthorityProviderAlgorithmTest {
expected.add(PrivilegeType.UPDATE);
expected.add(PrivilegeType.RELOAD);
expected.add(PrivilegeType.SHUTDOWN);
- assertThat(privileges.get().hasPrivileges(expected), is(true));
+ assertThat(privileges.hasPrivileges(expected), is(true));
}
-
+
private ShardingSphereMetaData mockShardingSphereMetaData(final Collection<ShardingSphereUser> users) throws SQLException {
- ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
+ ShardingSphereMetaData result = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
DataSource dataSource = mockDataSourceForPrivileges(users);
- Collection<DataSource> dataSourceList = Collections.singletonList(dataSource);
- when(metaData.getResource().getAllInstanceDataSources()).thenReturn(dataSourceList);
- Collection<ShardingSphereRule> empty = Collections.emptyList();
- when(metaData.getRuleMetaData().getRules()).thenReturn(empty);
- return metaData;
+ when(result.getResource().getAllInstanceDataSources()).thenReturn(Collections.singletonList(dataSource));
+ when(result.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
+ return result;
}
-
+
private DataSource mockDataSourceForPrivileges(final Collection<ShardingSphereUser> users) throws SQLException {
ResultSet globalPrivilegeResultSet = mockGlobalPrivilegeResultSet();
ResultSet schemaPrivilegeResultSet = mockSchemaPrivilegeResultSet();
@@ -128,7 +119,7 @@ public final class NativeAuthorityProviderAlgorithmTest {
when(result.getConnection().getMetaData().getURL()).thenReturn("jdbc:mysql://localhost:3306/test");
return result;
}
-
+
private ResultSet mockGlobalPrivilegeResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, true, false, true, true, false);
@@ -165,7 +156,7 @@ public final class NativeAuthorityProviderAlgorithmTest {
when(result.getString("host")).thenReturn("localhost");
return result;
}
-
+
private ResultSet mockSchemaPrivilegeResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, false);
@@ -193,7 +184,7 @@ public final class NativeAuthorityProviderAlgorithmTest {
when(result.getString("host")).thenReturn("localhost");
return result;
}
-
+
private ResultSet mockTablePrivilegeResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class, RETURNS_DEEP_STUBS);
when(result.next()).thenReturn(true, false);
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
index 28e1b13..9045c02 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
@@ -52,9 +52,7 @@ import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -242,17 +240,15 @@ public final class OrderByContextEngineTest {
GroupByContext groupByContext = new GroupByContextEngine().createGroupByContext(selectStatement);
OrderByContext actualOrderByContext = new OrderByContextEngine().createOrderBy(getShardingSphereSchemaForMySQLSelectWithoutOrderBy(), selectStatement, groupByContext);
assertFalse(actualOrderByContext.isGenerated());
- assertThat(actualOrderByContext.getItems().size(), is(0));
+ assertTrue(actualOrderByContext.getItems().isEmpty());
}
private ShardingSphereSchema getShardingSphereSchemaForMySQLSelectWithoutOrderBy() {
- Map<String, TableMetaData> tables = new HashMap<>();
TableMetaData orderTable = new TableMetaData("t_order", Arrays.asList(
new ColumnMetaData("order_id", Types.INTEGER, true, true, false),
new ColumnMetaData("user_id", Types.INTEGER, false, false, false),
new ColumnMetaData("status", Types.VARCHAR, false, false, false)
), Collections.emptyList());
- tables.put("t_order", orderTable);
- return new ShardingSphereSchema(tables);
+ return new ShardingSphereSchema(Collections.singletonMap("t_order", orderTable));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
index 1f284e4..265c511 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
@@ -38,7 +38,6 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml.
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -162,8 +161,7 @@ public final class PaginationContextTest {
private void getRevisedRowCount(final SelectStatement selectStatement) {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
- metaDataMap.put(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class));
+ Map<String, ShardingSphereMetaData> metaDataMap = Collections.singletonMap(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class));
SelectStatementContext selectStatementContext = new SelectStatementContext(metaDataMap, Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
assertThat(new PaginationContext(getOffsetSegment(), getRowCountSegment(), getParameters()).getRevisedRowCount(selectStatementContext), is(50L));
}
@@ -197,8 +195,7 @@ public final class PaginationContextTest {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setGroupBy(new GroupBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.DESC))));
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.DESC))));
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
- metaDataMap.put(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class));
+ Map<String, ShardingSphereMetaData> metaDataMap = Collections.singletonMap(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class));
SelectStatementContext selectStatementContext = new SelectStatementContext(metaDataMap, Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
assertThat(new PaginationContext(getOffsetSegment(), getRowCountSegment(), getParameters()).getRevisedRowCount(selectStatementContext), is((long) Integer.MAX_VALUE));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionsContextEngineTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionsContextEngineTest.java
index 6fb782a..b860dde 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionsContextEngineTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/projection/engine/ProjectionsContextEngineTest.java
@@ -54,8 +54,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
@@ -227,12 +225,10 @@ public final class ProjectionsContextEngineTest {
}
private SelectStatementContext createSelectStatementContext(final SelectStatement selectStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- metaDataMap.put("schema", metaData);
when(metaData.getSchema()).thenReturn(schema);
when(schema.getAllColumnNames("t_order")).thenReturn(Arrays.asList("order_id", "content"));
- return new SelectStatementContext(metaDataMap, Collections.emptyList(), selectStatement, "schema");
+ return new SelectStatementContext(Collections.singletonMap("schema", metaData), Collections.emptyList(), selectStatement, "schema");
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
index c42b4c2..5108963 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementConte
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.assignment.AssignmentSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.assignment.SetAssignmentSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -42,13 +41,12 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml.
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public final class SQLStatementContextFactoryTest {
@@ -58,19 +56,11 @@ public final class SQLStatementContextFactoryTest {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setLimit(new LimitSegment(0, 10, null, null));
selectStatement.setProjections(projectionsSegment);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(createMetaDataMap(), Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(mockMetaDataMap(), Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof SelectStatementContext);
}
- private Map<String, ShardingSphereMetaData> createMetaDataMap() {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
- ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- when(metaData.getSchema()).thenReturn(mock(ShardingSphereSchema.class));
- return metaDataMap;
- }
-
@Test
public void assertSQLStatementContextCreatedWhenSQLStatementInstanceOfMySQLInsertStatement() {
MySQLInsertStatement insertStatement = new MySQLInsertStatement();
@@ -101,15 +91,19 @@ public final class SQLStatementContextFactoryTest {
private void assertSQLStatementContextCreatedWhenSQLStatementInstanceOfInsertStatement(final InsertStatement insertStatement) {
insertStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("tbl"))));
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(createMetaDataMap(), Collections.emptyList(), insertStatement, DefaultSchema.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(mockMetaDataMap(), Collections.emptyList(), insertStatement, DefaultSchema.LOGIC_NAME);
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof InsertStatementContext);
}
@Test
public void assertSQLStatementContextCreatedWhenSQLStatementNotInstanceOfSelectStatementAndInsertStatement() {
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(createMetaDataMap(), Collections.emptyList(), mock(MySQLStatement.class), DefaultSchema.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(mockMetaDataMap(), Collections.emptyList(), mock(MySQLStatement.class), DefaultSchema.LOGIC_NAME);
assertNotNull(sqlStatementContext);
assertTrue(sqlStatementContext instanceof CommonSQLStatementContext);
}
+
+ private Map<String, ShardingSphereMetaData> mockMetaDataMap() {
+ return Collections.singletonMap(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS));
+ }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
index b361b81..35ee900 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
@@ -48,9 +48,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -100,13 +98,11 @@ public final class InsertStatementContextTest {
}
private InsertStatementContext createInsertStatementContext(final List<Object> parameters, final InsertStatement insertStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(metaData.getSchema()).thenReturn(schema);
when(schema.getAllColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "status"));
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new InsertStatementContext(metaDataMap, parameters, insertStatement, DefaultSchema.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), parameters, insertStatement, DefaultSchema.LOGIC_NAME);
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
index b990d6e..11a36a3 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/SelectStatementContextTest.java
@@ -55,8 +55,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -169,9 +167,7 @@ public final class SelectStatementContextTest {
private void assertSetIndexForItemsByColumnOrderByWithAlias(final SelectStatement selectStatement) {
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList()), createOrderBy(COLUMN_ORDER_BY_WITH_ALIAS), createProjectionsContext(), null);
- Map<String, Integer> columnLabelIndexMap = new HashMap<>();
- columnLabelIndexMap.put("n", 2);
- selectStatementContext.setIndexes(columnLabelIndexMap);
+ selectStatementContext.setIndexes(Collections.singletonMap("n", 2));
assertThat(selectStatementContext.getOrderByContext().getItems().iterator().next().getIndex(), is(2));
}
@@ -203,9 +199,7 @@ public final class SelectStatementContextTest {
private void assertSetIndexForItemsByColumnOrderByWithoutAlias(final SelectStatement selectStatement) {
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList()), createOrderBy(COLUMN_ORDER_BY_WITHOUT_OWNER_ALIAS), createProjectionsContext(), null);
- Map<String, Integer> columnLabelIndexMap = new HashMap<>();
- columnLabelIndexMap.put("id", 3);
- selectStatementContext.setIndexes(columnLabelIndexMap);
+ selectStatementContext.setIndexes(Collections.singletonMap("id", 3));
assertThat(selectStatementContext.getOrderByContext().getItems().iterator().next().getIndex(), is(3));
}
@@ -243,10 +237,7 @@ public final class SelectStatementContextTest {
}
private SelectStatementContext createSelectStatementContext(final SelectStatement selectStatement) {
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
- ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- return new SelectStatementContext(metaDataMap, Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
+ return new SelectStatementContext(Collections.singletonMap(DefaultSchema.LOGIC_NAME, mock(ShardingSphereMetaData.class)), Collections.emptyList(), selectStatement, DefaultSchema.LOGIC_NAME);
}
@Test
@@ -344,9 +335,7 @@ public final class SelectStatementContextTest {
ProjectionsContext projectionsContext = new ProjectionsContext(0, 0, false, Collections.singletonList(aggregationProjection));
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList()), createOrderBy(COLUMN_ORDER_BY_WITHOUT_OWNER_ALIAS), projectionsContext, null);
- Map<String, Integer> columnLabelIndexMap = new HashMap<>();
- columnLabelIndexMap.put("id", 3);
- selectStatementContext.setIndexes(columnLabelIndexMap);
+ selectStatementContext.setIndexes(Collections.singletonMap("id", 3));
assertThat(selectStatementContext.getOrderByContext().getItems().iterator().next().getIndex(), is(3));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodesTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodesTest.java
index 4e9b347..8eb671e 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodesTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodesTest.java
@@ -150,7 +150,7 @@ public final class DataNodesTest {
}
private DataNodes getRoutedRuleDataNodes() {
- Map<String, Collection<DataNode>> nodeMap = new HashMap<>();
+ Map<String, Collection<DataNode>> nodeMap = new HashMap<>(2, 1);
nodeMap.put(logicTableName1, getExpectedDataNodes(dataSourceNames1, logicTableName1));
nodeMap.put(logicTableName2, getExpectedDataNodes(dataSourceNames2, logicTableName2));
DataNodeContainedRule rule1 = mock(DataNodeContainedRule.class);
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContextsTest.java b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContextsTest.java
index 9666b04..ef1d866 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContextsTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContextsTest.java
@@ -20,36 +20,35 @@ package org.apache.shardingsphere.infra.context.metadata.impl;
import org.apache.shardingsphere.infra.config.persist.DistMetaDataPersistService;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.DefaultSchema;
-import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class StandardMetaDataContextsTest {
-
+
@Mock
private OptimizeContextFactory optimizeContextFactory;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private ShardingSphereMetaData metaData;
+
@Test
public void assertGetDefaultMetaData() {
- ShardingSphereMetaData metaData = getShardingSphereMetaData();
StandardMetaDataContexts standardMetaDataContexts = new StandardMetaDataContexts(mock(DistMetaDataPersistService.class), Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData),
mock(ShardingSphereRuleMetaData.class), null, new ConfigurationProperties(new Properties()), optimizeContextFactory);
assertThat(standardMetaDataContexts.getDefaultMetaData(), is(metaData));
@@ -58,23 +57,9 @@ public final class StandardMetaDataContextsTest {
@Test
public void assertClose() {
ExecutorEngine executorEngine = mock(ExecutorEngine.class);
- ShardingSphereMetaData metaData = getShardingSphereMetaData();
StandardMetaDataContexts standardMetaDataContexts = new StandardMetaDataContexts(mock(DistMetaDataPersistService.class), Collections.singletonMap("logic_db", metaData),
mock(ShardingSphereRuleMetaData.class), executorEngine, new ConfigurationProperties(new Properties()), optimizeContextFactory);
standardMetaDataContexts.close();
verify(executorEngine).close();
}
-
- private ShardingSphereMetaData getShardingSphereMetaData() {
- ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList());
- ShardingSphereResource resource = new ShardingSphereResource(Collections.emptyMap(), null, null, new MySQLDatabaseType());
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- Map<String, TableMetaData> tables = new HashMap<>();
- when(metaData.getRuleMetaData()).thenReturn(ruleMetaData);
- when(metaData.getResource()).thenReturn(resource);
- when(metaData.getSchema()).thenReturn(schema);
- when(schema.getTables()).thenReturn(tables);
- return metaData;
- }
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java
index fa3ba81..10f6923 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
-import java.util.HashMap;
+import java.util.Collections;
public final class UnsupportedGeneratedKeysResultSetTest {
@@ -179,12 +179,12 @@ public final class UnsupportedGeneratedKeysResultSetTest {
@Test(expected = SQLFeatureNotSupportedException.class)
public void getObjectWithColumnIndex() throws SQLException {
- new GeneratedKeysResultSet().getObject(1, new HashMap<>());
+ new GeneratedKeysResultSet().getObject(1, Collections.emptyMap());
}
@Test(expected = SQLFeatureNotSupportedException.class)
public void getObjectWithColumnLabel() throws SQLException {
- new GeneratedKeysResultSet().getObject("", new HashMap<>());
+ new GeneratedKeysResultSet().getObject("", Collections.emptyMap());
}
@Test(expected = SQLFeatureNotSupportedException.class)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
index 20cda0c..d44618f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
@@ -34,12 +34,10 @@ import org.junit.Test;
import java.lang.reflect.Field;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -52,7 +50,7 @@ public final class DatabaseCommunicationEngineFactoryTest {
Field metaDataContexts = ProxyContext.getInstance().getClass().getDeclaredField("metaDataContexts");
metaDataContexts.setAccessible(true);
metaDataContexts.set(ProxyContext.getInstance(), new StandardMetaDataContexts(mock(DistMetaDataPersistService.class), getMetaDataMap(), mock(ShardingSphereRuleMetaData.class),
- mock(ExecutorEngine.class), new ConfigurationProperties(new Properties()), getOptimizeContextFactory()));
+ mock(ExecutorEngine.class), new ConfigurationProperties(new Properties()), mockOptimizeContextFactory()));
BackendConnection backendConnection = mock(BackendConnection.class, RETURNS_DEEP_STUBS);
when(backendConnection.getSchemaName()).thenReturn("schema");
when(backendConnection.isSerialExecute()).thenReturn(true);
@@ -65,19 +63,17 @@ public final class DatabaseCommunicationEngineFactoryTest {
return Collections.singletonMap("schema", result);
}
- private OptimizeContextFactory getOptimizeContextFactory() {
- OptimizeContextFactory optimizeContextFactory = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(optimizeContextFactory.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(new HashMap<>()));
- return optimizeContextFactory;
+ private OptimizeContextFactory mockOptimizeContextFactory() {
+ OptimizeContextFactory result = mock(OptimizeContextFactory.class);
+ when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ return result;
}
@Test
public void assertNewTextProtocolInstance() {
BackendConnection backendConnection = mock(BackendConnection.class);
when(backendConnection.getSchemaName()).thenReturn("schema");
- DatabaseCommunicationEngine engine =
- DatabaseCommunicationEngineFactory.getInstance().newTextProtocolInstance(mock(SQLStatementContext.class), "schemaName", backendConnection);
- assertNotNull(engine);
+ DatabaseCommunicationEngine engine = DatabaseCommunicationEngineFactory.getInstance().newTextProtocolInstance(mock(SQLStatementContext.class), "schemaName", backendConnection);
assertThat(engine, instanceOf(DatabaseCommunicationEngine.class));
}
@@ -87,7 +83,6 @@ public final class DatabaseCommunicationEngineFactoryTest {
when(backendConnection.getSchemaName()).thenReturn("schema");
DatabaseCommunicationEngine engine =
DatabaseCommunicationEngineFactory.getInstance().newBinaryProtocolInstance(mock(SQLStatementContext.class), "schemaName", Collections.emptyList(), backendConnection);
- assertNotNull(engine);
assertThat(engine, instanceOf(DatabaseCommunicationEngine.class));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
index ae85e79..792f3f0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryMergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryQueryResultRow;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.ColumnMetaData;
@@ -58,7 +57,6 @@ import java.sql.Statement;
import java.sql.Types;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -104,9 +102,9 @@ public final class DatabaseCommunicationEngineTest {
}
private OptimizeContextFactory mockOptimizeContextFactory() {
- OptimizeContextFactory optimizeContextFactory = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(optimizeContextFactory.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(new HashMap<>()));
- return optimizeContextFactory;
+ OptimizeContextFactory result = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
+ when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ return result;
}
@Test
@@ -142,11 +140,8 @@ public final class DatabaseCommunicationEngineTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
ColumnMetaData columnMetaData = new ColumnMetaData("order_id", Types.INTEGER, true, false, false);
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- when(schema.get("t_logic_order")).thenReturn(new TableMetaData("t_logic_order", Collections.singletonList(columnMetaData), Collections.singletonList(new IndexMetaData("order_id"))));
- DataSourcesMetaData dataSourcesMetaData = mock(DataSourcesMetaData.class);
- when(result.getResource().getDataSourcesMetaData()).thenReturn(dataSourcesMetaData);
- when(result.getSchema()).thenReturn(schema);
+ when(result.getSchema().get("t_logic_order")).thenReturn(
+ new TableMetaData("t_logic_order", Collections.singletonList(columnMetaData), Collections.singletonList(new IndexMetaData("order_id"))));
ShardingRule shardingRule = mock(ShardingRule.class);
when(shardingRule.findLogicTableByActualTable("t_order")).thenReturn(Optional.of("t_logic_order"));
when(result.getRuleMetaData().getRules()).thenReturn(Collections.singletonList(shardingRule));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index de9217a..ee7e900 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -22,21 +22,16 @@ import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
-import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
import org.apache.shardingsphere.proxy.backend.exception.NoDatabaseSelectedException;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.junit.Test;
-import javax.sql.DataSource;
import java.lang.reflect.Field;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
@@ -68,7 +63,7 @@ public final class ProxyContextTest {
@Test
public void assertSchemaExists() throws NoSuchFieldException, IllegalAccessException {
- Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap(Collections.emptyMap());
+ Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap();
Field metaDataContexts = ProxyContext.getInstance().getClass().getDeclaredField("metaDataContexts");
metaDataContexts.setAccessible(true);
metaDataContexts.set(ProxyContext.getInstance(), new StandardMetaDataContexts(mock(DistMetaDataPersistService.class),
@@ -89,7 +84,7 @@ public final class ProxyContextTest {
@Test(expected = NoDatabaseSelectedException.class)
public void assertGetSchemaWhenNotExisted() throws NoSuchFieldException, IllegalAccessException {
- Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap(Collections.emptyMap());
+ Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap();
Field metaDataContexts = ProxyContext.getInstance().getClass().getDeclaredField("metaDataContexts");
metaDataContexts.setAccessible(true);
metaDataContexts.set(ProxyContext.getInstance(), new StandardMetaDataContexts(mock(DistMetaDataPersistService.class),
@@ -99,7 +94,7 @@ public final class ProxyContextTest {
@Test
public void assertGetSchema() throws NoSuchFieldException, IllegalAccessException {
- Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap(Collections.emptyMap());
+ Map<String, ShardingSphereMetaData> metaDataMap = mockMetaDataMap();
Field metaDataContexts = ProxyContext.getInstance().getClass().getDeclaredField("metaDataContexts");
metaDataContexts.setAccessible(true);
metaDataContexts.set(ProxyContext.getInstance(), new StandardMetaDataContexts(mock(DistMetaDataPersistService.class),
@@ -120,22 +115,14 @@ public final class ProxyContextTest {
private Map<String, ShardingSphereMetaData> createMetaDataMap() {
Map<String, ShardingSphereMetaData> result = new LinkedHashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
- ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- when(metaData.getResource()).thenReturn(new ShardingSphereResource(Collections.emptyMap(), null, null, new MySQLDatabaseType()));
- when(metaData.getRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()));
- when(metaData.getSchema()).thenReturn(schema);
- when(schema.getTables()).thenReturn(new HashMap<>());
- result.put(String.format(SCHEMA_PATTERN, i), metaData);
+ result.put(String.format(SCHEMA_PATTERN, i), mock(ShardingSphereMetaData.class));
}
return result;
}
- private Map<String, ShardingSphereMetaData> mockMetaDataMap(final Map<String, DataSource> mockDataSourceMap) {
+ private Map<String, ShardingSphereMetaData> mockMetaDataMap() {
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
- when(metaData.getName()).thenReturn("schema");
when(metaData.getResource().getDatabaseType()).thenReturn(new H2DatabaseType());
- when(metaData.getResource().getDataSources()).thenReturn(mockDataSourceMap);
return Collections.singletonMap("schema", metaData);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandlerTest.java
index 7f399bd..8bd87bf 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/AddResourceBackendHandlerTest.java
@@ -40,7 +40,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Properties;
import static org.junit.Assert.assertTrue;
@@ -87,7 +86,7 @@ public final class AddResourceBackendHandlerTest {
when(metaDataContexts.getAllSchemaNames()).thenReturn(Collections.singleton("test"));
when(metaDataContexts.getMetaData("test")).thenReturn(metaData);
when(metaData.getResource()).thenReturn(resource);
- when(resource.getDataSources()).thenReturn(new HashMap<>());
+ when(resource.getDataSources()).thenReturn(Collections.emptyMap());
when(dataSourceValidator.validate(any(DataSourceConfiguration.class))).thenReturn(true);
ResponseHeader responseHeader = addResourceBackendHandler.execute("test", createAddResourceStatement());
assertTrue(responseHeader instanceof UpdateResponseHeader);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
index 6d21428..0c47251 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
@@ -88,15 +88,15 @@ public final class DataSourceParameterConverterTest {
yamlDataSourceParameter1.setUrl("jdbc:mysql://localhost:3306/t_order_item");
yamlDataSourceParameter1.setCustomPoolProps(getCustomPoolProps());
setYamlDataSourceParameterPropertyWithoutUrl(yamlDataSourceParameter1);
- Map<String, YamlDataSourceParameter> yamlDataSourceParameterMap = new HashMap<>();
+ Map<String, YamlDataSourceParameter> yamlDataSourceParameterMap = new HashMap<>(2, 1);
yamlDataSourceParameterMap.put("ds_0", yamlDataSourceParameter0);
yamlDataSourceParameterMap.put("ds_1", yamlDataSourceParameter1);
- Map<String, DataSourceParameter> actualDataSourceParameterMap = DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(yamlDataSourceParameterMap);
- assertThat(actualDataSourceParameterMap.size(), is(2));
- assertThat(actualDataSourceParameterMap.get("ds_0").getUrl(), is("jdbc:mysql://localhost:3306/t_order"));
- assertThat(actualDataSourceParameterMap.get("ds_1").getUrl(), is("jdbc:mysql://localhost:3306/t_order_item"));
- assertDataSourceParameter(actualDataSourceParameterMap.get("ds_0"));
- assertDataSourceParameter(actualDataSourceParameterMap.get("ds_1"));
+ Map<String, DataSourceParameter> actualDataSourceParameters = DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(yamlDataSourceParameterMap);
+ assertThat(actualDataSourceParameters.size(), is(2));
+ assertThat(actualDataSourceParameters.get("ds_0").getUrl(), is("jdbc:mysql://localhost:3306/t_order"));
+ assertThat(actualDataSourceParameters.get("ds_1").getUrl(), is("jdbc:mysql://localhost:3306/t_order_item"));
+ assertDataSourceParameter(actualDataSourceParameters.get("ds_0"));
+ assertDataSourceParameter(actualDataSourceParameters.get("ds_1"));
}
private void setYamlDataSourceParameterPropertyWithoutUrl(final YamlDataSourceParameter yamlDataSourceParameter) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
index c8a0f41..c9ec9d7 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
@@ -30,12 +30,9 @@ import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload;
import org.apache.shardingsphere.infra.config.persist.DistMetaDataPersistService;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
-import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationResultBuilder;
@@ -46,7 +43,6 @@ import java.lang.reflect.Field;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Optional;
import java.util.Properties;
@@ -92,7 +88,6 @@ public final class MySQLAuthenticationEngineTest {
MySQLPacketPayload payload = mock(MySQLPacketPayload.class);
ChannelHandlerContext channelHandlerContext = mock(ChannelHandlerContext.class);
Channel channel = mock(Channel.class);
- when(payload.readStringEOFByBytes()).thenReturn(authResponse);
when(payload.readStringNulByBytes()).thenReturn("root".getBytes());
when(channel.remoteAddress()).thenReturn(new InetSocketAddress("localhost", 3307));
when(channelHandlerContext.channel()).thenReturn(channel);
@@ -108,7 +103,6 @@ public final class MySQLAuthenticationEngineTest {
Channel channel = mock(Channel.class);
ChannelHandlerContext channelHandlerContext = mock(ChannelHandlerContext.class);
when(payload.readStringEOFByBytes()).thenReturn(authResponse);
- when(payload.readStringNulByBytes()).thenReturn("root".getBytes());
when(channel.remoteAddress()).thenReturn(new InetSocketAddress("localhost", 3307));
when(channelHandlerContext.channel()).thenReturn(channel);
setAuthenticationResult();
@@ -156,20 +150,10 @@ public final class MySQLAuthenticationEngineTest {
Field field = ProxyContext.getInstance().getClass().getDeclaredField("metaDataContexts");
field.setAccessible(true);
field.set(ProxyContext.getInstance(), new StandardMetaDataContexts(mock(DistMetaDataPersistService.class),
- Collections.singletonMap("sharding_db", mockShardingSphereMetaData()), mock(ShardingSphereRuleMetaData.class),
+ Collections.singletonMap("sharding_db", mock(ShardingSphereMetaData.class)), mock(ShardingSphereRuleMetaData.class),
mock(ExecutorEngine.class), new ConfigurationProperties(new Properties()), mock(OptimizeContextFactory.class)));
}
- private ShardingSphereMetaData mockShardingSphereMetaData() {
- ShardingSphereMetaData result = mock(ShardingSphereMetaData.class);
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- when(result.getResource()).thenReturn(new ShardingSphereResource(Collections.emptyMap(), null, null, new MySQLDatabaseType()));
- when(result.getRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()));
- when(result.getSchema()).thenReturn(schema);
- when(schema.getTables()).thenReturn(new HashMap<>());
- return result;
- }
-
private MySQLPacketPayload getPayload(final String username, final String database, final byte[] authResponse) {
MySQLPacketPayload result = mock(MySQLPacketPayload.class);
when(result.readInt4()).thenReturn(MySQLCapabilityFlag.CLIENT_CONNECT_WITH_DB.getValue());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
index 2a37bf6..cfec72f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
@@ -30,13 +30,10 @@ import org.apache.shardingsphere.infra.config.persist.DistMetaDataPersistService
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
-import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.check.SQLChecker;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
@@ -44,6 +41,8 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.util.Collections;
@@ -57,6 +56,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class MySQLAuthenticationHandlerTest {
private static final String SCHEMA_PATTERN = "db%s";
@@ -148,20 +148,15 @@ public final class MySQLAuthenticationHandlerTest {
Map<String, ShardingSphereMetaData> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class);
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- when(metaData.getResource()).thenReturn(new ShardingSphereResource(Collections.emptyMap(), null, null, new MySQLDatabaseType()));
when(metaData.getRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()));
- when(metaData.getSchema()).thenReturn(schema);
- when(schema.getTables()).thenReturn(new HashMap<>());
result.put(String.format(SCHEMA_PATTERN, i), metaData);
}
return result;
}
-
+
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final ShardingSphereUser user) {
- AuthorityRuleConfiguration authorityRuleConfiguration = new AuthorityRuleConfiguration(Collections.singletonList(user), new ShardingSphereAlgorithmConfiguration("NATIVE", new Properties()));
- AuthorityRule rule = new AuthorityRuleBuilder().build(authorityRuleConfiguration, Collections.emptyMap());
- ShardingSphereRuleMetaData metaData = new ShardingSphereRuleMetaData(Collections.singletonList(authorityRuleConfiguration), Collections.singletonList(rule));
- return metaData;
+ AuthorityRuleConfiguration ruleConfig = new AuthorityRuleConfiguration(Collections.singletonList(user), new ShardingSphereAlgorithmConfiguration("NATIVE", new Properties()));
+ AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig, Collections.emptyMap());
+ return new ShardingSphereRuleMetaData(Collections.singletonList(ruleConfig), Collections.singletonList(rule));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
index 1a91875..5546901 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecutorFactoryTest.java
@@ -57,7 +57,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -94,9 +93,9 @@ public final class MySQLCommandExecutorFactoryTest {
}
private OptimizeContextFactory mockOptimizeContextFactory() {
- OptimizeContextFactory optimizeContextFactory = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(optimizeContextFactory.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(new HashMap<>()));
- return optimizeContextFactory;
+ OptimizeContextFactory result = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
+ when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ return result;
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
index 4aa4a33..424cf39 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutorTest.java
@@ -45,7 +45,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -78,11 +77,11 @@ public final class MySQLComStmtExecuteExecutorTest {
when(result.getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
return result;
}
-
+
private OptimizeContextFactory mockOptimizeContextFactory() {
- OptimizeContextFactory optimizeContextFactory = mock(OptimizeContextFactory.class, RETURNS_DEEP_STUBS);
- when(optimizeContextFactory.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(new HashMap<>()));
- return optimizeContextFactory;
+ OptimizeContextFactory result = mock(OptimizeContextFactory.class);
+ when(result.getSchemaMetadatas()).thenReturn(new FederateSchemaMetadatas(Collections.emptyMap()));
+ return result;
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
index 4c10a23..74f097b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
@@ -142,7 +142,7 @@ public final class PostgreSQLAuthenticationHandlerTest {
when(metaData.getResource()).thenReturn(new ShardingSphereResource(Collections.emptyMap(), null, null, new MySQLDatabaseType()));
when(metaData.getRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()));
when(metaData.getSchema()).thenReturn(schema);
- when(schema.getTables()).thenReturn(new HashMap<>());
+ when(schema.getTables()).thenReturn(Collections.emptyMap());
result.put(String.format(SCHEMA_PATTERN, i), metaData);
}
return result;
@@ -151,8 +151,7 @@ public final class PostgreSQLAuthenticationHandlerTest {
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final ShardingSphereUser user) {
AuthorityRuleConfiguration authorityRuleConfiguration = new AuthorityRuleConfiguration(Collections.singletonList(user), new ShardingSphereAlgorithmConfiguration("NATIVE", new Properties()));
AuthorityRule rule = new AuthorityRuleBuilder().build(authorityRuleConfiguration, Collections.emptyMap());
- ShardingSphereRuleMetaData metaData = new ShardingSphereRuleMetaData(Collections.singletonList(authorityRuleConfiguration), Collections.singletonList(rule));
- return metaData;
+ return new ShardingSphereRuleMetaData(Collections.singletonList(authorityRuleConfiguration), Collections.singleton(rule));
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
index 839c6a3..726e856 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.scaling.web;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.gson.Gson;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -46,6 +44,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -95,7 +94,7 @@ public final class HttpServerHandlerTest {
@Test
@SuppressWarnings("unchecked")
public void assertListJobs() {
- when(scalingAPI.list()).thenReturn(mockJobInfos());
+ when(scalingAPI.list()).thenReturn(Collections.singletonList(new JobInfo(1L)));
ResponseContent<?> responseContent = execute("/scaling/job/list");
assertThat(((List<JobContext>) responseContent.getModel()).size(), is(1));
}
@@ -103,7 +102,7 @@ public final class HttpServerHandlerTest {
@Test
@SuppressWarnings("unchecked")
public void assertGetJobProgress() {
- when(scalingAPI.getProgress(1L)).thenReturn(mockJobProgress());
+ when(scalingAPI.getProgress(1L)).thenReturn(Collections.singletonMap(1, new JobProgress()));
ResponseContent<?> responseContent = execute("/scaling/job/progress/1");
Map<String, Map<String, String>> map = (Map<String, Map<String, String>>) responseContent.getModel();
assertThat(map.get("1").get("status"), is("RUNNING"));
@@ -117,7 +116,7 @@ public final class HttpServerHandlerTest {
@Test
public void assertDataConsistencyCheck() {
- when(scalingAPI.dataConsistencyCheck(1L)).thenReturn(mockDataConsistency());
+ when(scalingAPI.dataConsistencyCheck(1L)).thenReturn(Collections.singletonMap("t_order", new DataConsistencyCheckResult(1, 1)));
ResponseContent<?> responseContent = execute("/scaling/job/check/1");
assertTrue(responseContent.isSuccess());
}
@@ -160,22 +159,4 @@ public final class HttpServerHandlerTest {
FullHttpResponse fullHttpResponse = argumentCaptor.getValue();
return new Gson().fromJson(fullHttpResponse.content().toString(CharsetUtil.UTF_8), ResponseContent.class);
}
-
- private List<JobInfo> mockJobInfos() {
- List<JobInfo> result = Lists.newArrayList();
- result.add(new JobInfo(1L));
- return result;
- }
-
- private Map<Integer, JobProgress> mockJobProgress() {
- Map<Integer, JobProgress> result = Maps.newHashMap();
- result.put(1, new JobProgress());
- return result;
- }
-
- private Map<String, DataConsistencyCheckResult> mockDataConsistency() {
- Map<String, DataConsistencyCheckResult> result = Maps.newHashMap();
- result.put("t_order", new DataConsistencyCheckResult(1, 1));
- return result;
- }
}
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 1d81f66..ddfe2e2 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
@@ -17,13 +17,13 @@
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;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -41,6 +41,6 @@ public final class ScalingSQLBuilderFactory {
@SneakyThrows(ReflectiveOperationException.class)
public static ScalingSQLBuilder newInstance(final String databaseType) {
ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(databaseType);
- return scalingEntry.getSQLBuilderClass().getConstructor(Map.class).newInstance(Maps.newHashMap());
+ return scalingEntry.getSQLBuilderClass().getConstructor(Map.class).newInstance(new HashMap<>());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
index 992af3d..ec1d610 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/datasource/ScalingDataSourceConfigurationWrap.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.scaling.core.config.datasource;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
+import java.util.HashMap;
import java.util.Map;
@Getter
@@ -47,7 +47,7 @@ public class ScalingDataSourceConfigurationWrap {
private static class DataSourceConfigurationHolder {
- private static final Map<String, Class<?>> INSTANCES = Maps.newHashMap();
+ private static final Map<String, Class<?>> INSTANCES = new HashMap<>();
static {
INSTANCES.put(StandardJDBCDataSourceConfiguration.TYPE.toLowerCase(), StandardJDBCDataSourceConfiguration.class);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/AbstractDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/AbstractDataConsistencyChecker.java
index e683c5a..d004fb8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/AbstractDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/AbstractDataConsistencyChecker.java
@@ -49,7 +49,7 @@ public abstract class AbstractDataConsistencyChecker implements DataConsistencyC
private final JobContext jobContext;
@Override
- public Map<String, DataConsistencyCheckResult> countCheck() {
+ public final Map<String, DataConsistencyCheckResult> countCheck() {
return jobContext.getTaskConfigs()
.stream().flatMap(each -> each.getDumperConfig().getTableNameMap().values().stream()).collect(Collectors.toSet())
.stream().collect(Collectors.toMap(Function.identity(), this::countCheck, (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
@@ -68,7 +68,7 @@ public abstract class AbstractDataConsistencyChecker implements DataConsistencyC
private long count(final DataSource dataSource, final String table) {
try (Connection connection = dataSource.getConnection();
- PreparedStatement preparedStatement = connection.prepareStatement(getSqlBuilder().buildCountSQL(table));
+ PreparedStatement preparedStatement = connection.prepareStatement(getSQLBuilder().buildCountSQL(table));
ResultSet resultSet = preparedStatement.executeQuery()) {
resultSet.next();
return resultSet.getLong(1);
@@ -77,13 +77,13 @@ public abstract class AbstractDataConsistencyChecker implements DataConsistencyC
}
}
- protected DataSourceWrapper getSourceDataSource() {
+ protected final DataSourceWrapper getSourceDataSource() {
return dataSourceFactory.newInstance(jobContext.getJobConfig().getRuleConfig().getSource().unwrap());
}
- protected DataSourceWrapper getTargetDataSource() {
+ protected final DataSourceWrapper getTargetDataSource() {
return dataSourceFactory.newInstance(jobContext.getJobConfig().getRuleConfig().getTarget().unwrap());
}
- protected abstract ScalingSQLBuilder getSqlBuilder();
+ protected abstract ScalingSQLBuilder getSQLBuilder();
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/JobProgressYamlSwapper.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/JobProgressYamlSwapper.java
index 7996273..3e4f81f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/JobProgressYamlSwapper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/JobProgressYamlSwapper.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.scaling.core.job.progress.yaml;
import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.scaling.core.job.JobStatus;
import org.apache.shardingsphere.scaling.core.job.position.FinishedPosition;
import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
@@ -29,21 +28,22 @@ import org.apache.shardingsphere.scaling.core.job.task.incremental.IncrementalTa
import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTaskProgress;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
- *Job progress yaml swapper.
+ *Job progress YAML swapper.
*/
public final class JobProgressYamlSwapper {
/**
- * Swap to yaml.
+ * Swap to YAML.
*
* @param jobProgress job progress
- * @return yaml job progress
+ * @return YAML job progress
*/
public YamlJobProgress swapToYaml(final JobProgress jobProgress) {
YamlJobProgress result = new YamlJobProgress();
@@ -77,10 +77,10 @@ public final class JobProgressYamlSwapper {
private Map<String, YamlJobProgress.YamlIncremental> getYamlIncremental(final Map<String, IncrementalTaskProgress> incrementalTaskProgressMap) {
return incrementalTaskProgressMap.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry -> {
- YamlJobProgress.YamlIncremental yamlIncremental = new YamlJobProgress.YamlIncremental();
- yamlIncremental.setPosition(entry.getValue().getPosition().toString());
- yamlIncremental.setDelay(entry.getValue().getIncrementalTaskDelay());
- return yamlIncremental;
+ YamlJobProgress.YamlIncremental result = new YamlJobProgress.YamlIncremental();
+ result.setPosition(entry.getValue().getPosition().toString());
+ result.setDelay(entry.getValue().getIncrementalTaskDelay());
+ return result;
}));
}
@@ -100,11 +100,9 @@ public final class JobProgressYamlSwapper {
}
private Map<String, InventoryTaskProgress> getInventoryTaskProgressMap(final YamlJobProgress.YamlInventory inventory) {
- Map<String, InventoryTaskProgress> result = Maps.newHashMap();
- result.putAll(Arrays.stream(inventory.getFinished())
- .collect(Collectors.toMap(each -> each, each -> new InventoryTaskProgress(new FinishedPosition()))));
- result.putAll(inventory.getUnfinished().entrySet().stream()
- .collect(Collectors.toMap(Entry::getKey, getInventoryTaskProgressFunction())));
+ Map<String, InventoryTaskProgress> result = new HashMap<>();
+ result.putAll(Arrays.stream(inventory.getFinished()).collect(Collectors.toMap(each -> each, each -> new InventoryTaskProgress(new FinishedPosition()))));
+ result.putAll(inventory.getUnfinished().entrySet().stream().collect(Collectors.toMap(Entry::getKey, getInventoryTaskProgressFunction())));
return result;
}
@@ -113,8 +111,7 @@ public final class JobProgressYamlSwapper {
}
private Map<String, IncrementalTaskProgress> getIncrementalTaskProgressMap(final String databaseType, final Map<String, YamlJobProgress.YamlIncremental> incremental) {
- return incremental.entrySet().stream()
- .collect(Collectors.toMap(Entry::getKey, getIncrementalTaskProgressFunction(databaseType)));
+ return incremental.entrySet().stream().collect(Collectors.toMap(Entry::getKey, getIncrementalTaskProgressFunction(databaseType)));
}
private Function<Entry<String, YamlJobProgress.YamlIncremental>, IncrementalTaskProgress> getIncrementalTaskProgressFunction(final String databaseType) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/YamlJobProgress.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/YamlJobProgress.java
index f677266..0b4e0f5 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/YamlJobProgress.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/progress/yaml/YamlJobProgress.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.scaling.core.job.progress.yaml;
-import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.scaling.core.job.task.incremental.IncrementalTaskDelay;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -45,7 +45,7 @@ public final class YamlJobProgress {
private String[] finished = new String[0];
- private Map<String, String> unfinished = Maps.newHashMap();
+ private Map<String, String> unfinished = new HashMap<>();
}
@Getter
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/util/JobConfigurationUtil.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/util/JobConfigurationUtil.java
index fa47667..a02077d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/util/JobConfigurationUtil.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/util/JobConfigurationUtil.java
@@ -120,7 +120,7 @@ public final class JobConfigurationUtil {
private static Map<String, String> getShouldScalingActualDataNodes(final Set<String> modifiedDataSources,
final Map<String, ShardingTableRuleConfiguration> oldShardingRuleConfigMap,
final Map<String, ShardingTableRuleConfiguration> newShardingRuleConfigMap) {
- Map<String, String> result = Maps.newHashMap();
+ Map<String, String> result = new HashMap<>();
newShardingRuleConfigMap.keySet().forEach(each -> {
if (!oldShardingRuleConfigMap.containsKey(each)) {
return;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
index 8edfed7..92c0d59 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.scaling.core.executor.importer;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.shardingsphere.scaling.core.common.channel.Channel;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
@@ -42,6 +41,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -189,9 +189,7 @@ public final class AbstractImporterTest {
private ImporterConfiguration mockImporterConfiguration() {
ImporterConfiguration result = new ImporterConfiguration();
result.setDataSourceConfig(dataSourceConfig);
- Map<String, Set<String>> shardingColumnsMap = Maps.newHashMap();
- shardingColumnsMap.put("test_table", Sets.newHashSet("user"));
- result.setShardingColumnsMap(shardingColumnsMap);
+ result.setShardingColumnsMap(Collections.singletonMap("test_table", Sets.newHashSet("user")));
return result;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractSqlBuilderTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractSqlBuilderTest.java
index aca5c0c..6c73a6f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractSqlBuilderTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractSqlBuilderTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.scaling.core.executor.importer;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
@@ -28,43 +27,44 @@ import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
import org.junit.Test;
import java.util.Collection;
+import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public final class AbstractSqlBuilderTest {
- private final ScalingSQLBuilder scalingSqlBuilder = new FixtureSQLBuilder(Maps.newHashMap());
+ private final ScalingSQLBuilder scalingSQLBuilder = new FixtureSQLBuilder(Collections.emptyMap());
@Test
public void assertBuildInsertSQL() {
- String actual = scalingSqlBuilder.buildInsertSQL(mockDataRecord("t1"));
+ String actual = scalingSQLBuilder.buildInsertSQL(mockDataRecord("t1"));
assertThat(actual, is("INSERT INTO `t1`(`id`,`sc`,`c1`,`c2`,`c3`) VALUES(?,?,?,?,?)"));
}
@Test
public void assertBuildUpdateSQLWithPrimaryKey() {
- String actual = scalingSqlBuilder.buildUpdateSQL(mockDataRecord("t2"), RecordUtil.extractPrimaryColumns(mockDataRecord("t2")));
+ String actual = scalingSQLBuilder.buildUpdateSQL(mockDataRecord("t2"), RecordUtil.extractPrimaryColumns(mockDataRecord("t2")));
assertThat(actual, is("UPDATE `t2` SET `c1` = ?,`c2` = ?,`c3` = ? WHERE `id` = ?"));
}
@Test
public void assertBuildUpdateSQLWithShardingColumns() {
DataRecord dataRecord = mockDataRecord("t2");
- String actual = scalingSqlBuilder.buildUpdateSQL(dataRecord, mockConditionColumns(dataRecord));
+ String actual = scalingSQLBuilder.buildUpdateSQL(dataRecord, mockConditionColumns(dataRecord));
assertThat(actual, is("UPDATE `t2` SET `c1` = ?,`c2` = ?,`c3` = ? WHERE `id` = ? and `sc` = ?"));
}
@Test
public void assertBuildDeleteSQLWithPrimaryKey() {
- String actual = scalingSqlBuilder.buildDeleteSQL(mockDataRecord("t3"), RecordUtil.extractPrimaryColumns(mockDataRecord("t3")));
+ String actual = scalingSQLBuilder.buildDeleteSQL(mockDataRecord("t3"), RecordUtil.extractPrimaryColumns(mockDataRecord("t3")));
assertThat(actual, is("DELETE FROM `t3` WHERE `id` = ?"));
}
@Test
public void assertBuildDeleteSQLWithConditionColumns() {
DataRecord dataRecord = mockDataRecord("t3");
- String actual = scalingSqlBuilder.buildDeleteSQL(dataRecord, mockConditionColumns(dataRecord));
+ String actual = scalingSQLBuilder.buildDeleteSQL(dataRecord, mockConditionColumns(dataRecord));
assertThat(actual, is("DELETE FROM `t3` WHERE `id` = ? and `sc` = ?"));
}
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 232226c..95b5946 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
@@ -17,13 +17,12 @@
package org.apache.shardingsphere.scaling.core.fixture;
-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.consistency.AbstractDataConsistencyChecker;
-import org.apache.shardingsphere.scaling.core.job.check.consistency.DataConsistencyCheckResult;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
public final class FixtureDataConsistencyChecker extends AbstractDataConsistencyChecker {
@@ -33,17 +32,12 @@ public final class FixtureDataConsistencyChecker extends AbstractDataConsistency
}
@Override
- public Map<String, DataConsistencyCheckResult> countCheck() {
- return super.countCheck();
- }
-
- @Override
public Map<String, Boolean> dataCheck() {
return Collections.emptyMap();
}
@Override
- protected ScalingSQLBuilder getSqlBuilder() {
- return new FixtureSQLBuilder(Maps.newHashMap());
+ protected ScalingSQLBuilder getSQLBuilder() {
+ return new FixtureSQLBuilder(new HashMap<>());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
index 777279e..73c7f6f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
@@ -18,10 +18,9 @@
package org.apache.shardingsphere.scaling.core.job;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.governance.repository.api.config.RegistryCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
+import org.apache.shardingsphere.governance.repository.api.config.RegistryCenterConfiguration;
import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPI;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
@@ -41,6 +40,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import java.util.Collections;
import java.util.Map;
import static org.mockito.Mockito.never;
@@ -84,7 +84,7 @@ public final class FinishedCheckJobTest {
public void assertExecuteWithWorkflow() {
when(governanceRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT)).thenReturn(Lists.newArrayList("1"));
when(scalingAPI.getJobConfig(1L)).thenReturn(mockJobConfigWithWorkflow());
- when(scalingAPI.getProgress(1L)).thenReturn(Maps.newHashMap());
+ when(scalingAPI.getProgress(1L)).thenReturn(Collections.emptyMap());
when(scalingAPI.dataConsistencyCheck(1L)).thenReturn(mockDataConsistencyCheck());
finishedCheckJob.execute(null);
}
@@ -95,11 +95,9 @@ public final class FinishedCheckJobTest {
}
private Map<String, DataConsistencyCheckResult> mockDataConsistencyCheck() {
- Map<String, DataConsistencyCheckResult> result = Maps.newHashMap();
DataConsistencyCheckResult checkResult = new DataConsistencyCheckResult(1, 1);
checkResult.setDataValid(true);
- result.put("t_order", checkResult);
- return result;
+ return Collections.singletonMap("t_order", checkResult);
}
private static ServerConfiguration mockServerConfig() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgressTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgressTest.java
index 2a8facc..85a71cb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgressTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/progress/JobProgressTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.scaling.core.job.progress;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.scaling.core.job.JobStatus;
import org.apache.shardingsphere.scaling.core.job.position.FinishedPosition;
import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
@@ -26,6 +25,8 @@ import org.apache.shardingsphere.scaling.core.job.task.incremental.IncrementalTa
import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTaskProgress;
import org.junit.Test;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -69,13 +70,11 @@ public final class JobProgressTest {
}
private Map<String, IncrementalTaskProgress> mockIncrementalTaskProgressMap() {
- Map<String, IncrementalTaskProgress> result = Maps.newHashMap();
- result.put("ds0", new IncrementalTaskProgress(new PlaceholderPosition()));
- return result;
+ return Collections.singletonMap("ds0", new IncrementalTaskProgress(new PlaceholderPosition()));
}
private Map<String, InventoryTaskProgress> mockInventoryTaskProgressMap() {
- Map<String, InventoryTaskProgress> result = Maps.newHashMap();
+ Map<String, InventoryTaskProgress> result = new HashMap<>(4, 1);
result.put("ds0.t_1", new InventoryTaskProgress(new FinishedPosition()));
result.put("ds0.t_2", new InventoryTaskProgress(new FinishedPosition()));
result.put("ds1.t_1", new InventoryTaskProgress(new PlaceholderPosition()));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/checker/MySQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/checker/MySQLDataConsistencyChecker.java
index 82f7d8a..b92cd74 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/checker/MySQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/checker/MySQLDataConsistencyChecker.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.scaling.mysql.component.checker;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceWrapper;
import org.apache.shardingsphere.scaling.core.common.exception.DataCheckFailException;
import org.apache.shardingsphere.scaling.core.job.JobContext;
@@ -30,6 +29,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -85,7 +85,7 @@ public final class MySQLDataConsistencyChecker extends AbstractDataConsistencyCh
}
private long sumCrc32(final DataSource dataSource, final String tableName, final String column) {
- String sql = getSqlBuilder().buildSumCrc32SQL(tableName, column);
+ String sql = getSQLBuilder().buildSumCrc32SQL(tableName, column);
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql);
ResultSet resultSet = preparedStatement.executeQuery()) {
@@ -97,7 +97,7 @@ public final class MySQLDataConsistencyChecker extends AbstractDataConsistencyCh
}
@Override
- protected MySQLScalingSQLBuilder getSqlBuilder() {
- return new MySQLScalingSQLBuilder(Maps.newHashMap());
+ protected MySQLScalingSQLBuilder getSQLBuilder() {
+ return new MySQLScalingSQLBuilder(new HashMap<>());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
index 10cea7d..0ab8b90 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
@@ -17,17 +17,18 @@
package org.apache.shardingsphere.scaling.mysql.component;
-import com.google.common.collect.Maps;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
+import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.mysql.binlog.BinlogPosition;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import java.util.Collections;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -43,7 +44,7 @@ public final class MySQLImporterTest {
@Test
public void assertCreateSqlBuilder() {
MySQLImporter mysqlImporter = new MySQLImporter(importerConfig, dataSourceManager);
- String insertSQL = mysqlImporter.createSQLBuilder(Maps.newHashMap()).buildInsertSQL(mockDataRecord());
+ String insertSQL = mysqlImporter.createSQLBuilder(Collections.emptyMap()).buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO `t_order`(`id`,`name`) VALUES(?,?) ON DUPLICATE KEY UPDATE `name`=VALUES(`name`)"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/checker/PostgreSQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/checker/PostgreSQLDataConsistencyChecker.java
index 6e14615..6e4895f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/checker/PostgreSQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/checker/PostgreSQLDataConsistencyChecker.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.scaling.postgresql.component.checker;
-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.consistency.AbstractDataConsistencyChecker;
import org.apache.shardingsphere.scaling.postgresql.component.PostgreSQLScalingSQLBuilder;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -41,7 +41,7 @@ public final class PostgreSQLDataConsistencyChecker extends AbstractDataConsiste
}
@Override
- protected ScalingSQLBuilder getSqlBuilder() {
- return new PostgreSQLScalingSQLBuilder(Maps.newHashMap());
+ protected ScalingSQLBuilder getSQLBuilder() {
+ return new PostgreSQLScalingSQLBuilder(new HashMap<>());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporterTest.java
index d7d26dd..a3c0dad 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporterTest.java
@@ -17,11 +17,10 @@
package org.apache.shardingsphere.scaling.postgresql.component;
-import com.google.common.collect.Maps;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
+import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.postgresql.wal.WalPosition;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,6 +28,8 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.postgresql.replication.LogSequenceNumber;
+import java.util.Collections;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -43,7 +44,7 @@ public final class PostgreSQLImporterTest {
@Test
public void assertCreateSQLBuilder() {
- String insertSQL = new PostgreSQLImporter(importerConfig, dataSourceManager).createSQLBuilder(Maps.newHashMap()).buildInsertSQL(mockDataRecord());
+ String insertSQL = new PostgreSQLImporter(importerConfig, dataSourceManager).createSQLBuilder(Collections.emptyMap()).buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO \"t_order\"(\"id\",\"name\") VALUES(?,?) ON CONFLICT (id) DO NOTHING"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilderTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilderTest.java
index 7c0a12f..997bb2f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilderTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLScalingSQLBuilderTest.java
@@ -17,13 +17,14 @@
package org.apache.shardingsphere.scaling.postgresql.component;
-import com.google.common.collect.Maps;
import org.apache.shardingsphere.scaling.core.common.record.Column;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
import org.apache.shardingsphere.scaling.postgresql.wal.WalPosition;
import org.junit.Test;
import org.postgresql.replication.LogSequenceNumber;
+import java.util.Collections;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -31,7 +32,7 @@ public final class PostgreSQLScalingSQLBuilderTest {
@Test
public void assertBuildInsertSQL() {
- String actual = new PostgreSQLScalingSQLBuilder(Maps.newHashMap()).buildInsertSQL(mockDataRecord());
+ String actual = new PostgreSQLScalingSQLBuilder(Collections.emptyMap()).buildInsertSQL(mockDataRecord());
assertThat(actual, is("INSERT INTO \"t_order\"(\"id\",\"name\") VALUES(?,?) ON CONFLICT (id) DO NOTHING"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
index be77448..788297f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
@@ -18,15 +18,14 @@
package org.apache.shardingsphere.scaling.postgresql.wal;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
-import org.apache.shardingsphere.scaling.core.config.datasource.StandardJDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
import org.apache.shardingsphere.scaling.core.common.record.DataRecord;
import org.apache.shardingsphere.scaling.core.common.record.PlaceholderRecord;
import org.apache.shardingsphere.scaling.core.common.record.Record;
+import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
+import org.apache.shardingsphere.scaling.core.config.datasource.StandardJDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.postgresql.wal.event.AbstractRowEvent;
import org.apache.shardingsphere.scaling.postgresql.wal.event.DeleteRowEvent;
import org.apache.shardingsphere.scaling.postgresql.wal.event.PlaceholderEvent;
@@ -39,7 +38,7 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Map;
+import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -59,9 +58,7 @@ public final class WalEventConverterTest {
private DumperConfiguration mockDumperConfiguration() {
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceConfig(new StandardJDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
- Map<String, String> tableNameMap = Maps.newHashMap();
- tableNameMap.put("t_order", "t_order");
- result.setTableNameMap(tableNameMap);
+ result.setTableNameMap(Collections.singletonMap("t_order", "t_order"));
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
index c8678e3..f824ad0 100644
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
+++ b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
@@ -54,7 +54,7 @@ public final class ITEnvironmentContext {
public ITEnvironmentContext() {
testCases = loadTestCases();
- Map<String, YamlTableRuleConfiguration> sourceTableRules = createSourceTableRules(testCases);
+ Map<String, YamlTableRuleConfiguration> sourceTableRules = createSourceTableRules();
scalingConfiguration = createScalingConfiguration(sourceTableRules);
sourceDataSource = SourceConfiguration.createHostDataSource(sourceTableRules);
targetDataSource = TargetConfiguration.createHostDataSource();
@@ -67,8 +67,8 @@ public final class ITEnvironmentContext {
}
}
- private Map<String, YamlTableRuleConfiguration> createSourceTableRules(final DataSet dataSet) {
- Map<String, YamlTableRuleConfiguration> result = new HashMap<>();
+ private Map<String, YamlTableRuleConfiguration> createSourceTableRules() {
+ Map<String, YamlTableRuleConfiguration> result = new HashMap<>(testCases.getTypes().size(), 1);
for (Type type : testCases.getTypes()) {
YamlTableRuleConfiguration tableRule = new YamlTableRuleConfiguration();
tableRule.setLogicTable(type.getTableName());
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
index 09cd962..a3b146c 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
@@ -54,8 +54,6 @@ import java.net.URL;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Optional;
import static org.mockito.Mockito.mock;
@@ -85,10 +83,8 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine(databaseType);
ShardingSphereSchema schema = mockSchema();
ConfigurationProperties props = new ConfigurationProperties(ruleConfigurations.getProps());
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = new ShardingSphereMetaData("sharding_db", mock(ShardingSphereResource.class), new ShardingSphereRuleMetaData(Collections.emptyList(), rules), schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataMap, getTestParameters().getInputParameters(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), getTestParameters().getInputParameters(),
sqlStatementParserEngine.parse(getTestParameters().getInputSQL(), false), DefaultSchema.LOGIC_NAME);
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
RouteContext routeContext = new SQLRouteEngine(rules, props).route(logicSQL, metaData);
@@ -102,7 +98,7 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
Optional<SingleTableRule> singleTableRule = rules.stream().filter(each -> each instanceof SingleTableRule).map(each -> (SingleTableRule) each).findFirst();
if (singleTableRule.isPresent()) {
singleTableRule.get().addSingleTableDataNode("t_account", "encrypt_ds");
- singleTableRule.get().addSingleTableDataNode("t_account_bak", "encrypt_ds");
+ singleTableRule.get().addSingleTableDataNode("t_account_bak", "encrypt_ds");
}
}
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
index 30e8a41..35f213b 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
@@ -85,10 +85,8 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine(databaseType);
ShardingSphereSchema schema = mockSchema();
ConfigurationProperties props = new ConfigurationProperties(ruleConfigurations.getProps());
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
ShardingSphereMetaData metaData = new ShardingSphereMetaData("sharding_db", Mockito.mock(ShardingSphereResource.class), new ShardingSphereRuleMetaData(Collections.emptyList(), rules), schema);
- metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataMap, getTestParameters().getInputParameters(),
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(Collections.singletonMap(DefaultSchema.LOGIC_NAME, metaData), getTestParameters().getInputParameters(),
sqlStatementParserEngine.parse(getTestParameters().getInputSQL(), false), DefaultSchema.LOGIC_NAME);
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
RouteContext routeContext = new SQLRouteEngine(rules, props).route(logicSQL, metaData);
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
index b3ceb90..cf4617c 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
@@ -88,7 +88,7 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
new YamlDataSourceConfigurationSwapper().swapToDataSources(yamlRootRuleConfigs.getDataSources()));
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine(databaseType);
ShardingSphereSchema schema = mockSchema();
- Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>();
+ Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>(2, 1);
ShardingSphereMetaData metaData = new ShardingSphereMetaData("sharding_db", mock(ShardingSphereResource.class), new ShardingSphereRuleMetaData(Collections.emptyList(), rules), schema);
metaDataMap.put(DefaultSchema.LOGIC_NAME, metaData);
metaDataMap.put("sharding_db", metaData);
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHookTest.java b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHookTest.java
index 07c1786..3d53487 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHookTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHookTest.java
@@ -21,14 +21,12 @@ import io.seata.core.context.RootContext;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -39,18 +37,13 @@ import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
public final class TransactionalSQLExecutionHookTest {
- private final Map<String, Object> shardingExecuteDataMap = new HashMap<>();
+ private final Map<String, Object> shardingExecuteDataMap = Collections.singletonMap("SEATA_TX_XID", "test-XID");
private final TransactionalSQLExecutionHook executionHook = new TransactionalSQLExecutionHook();
@Mock
private DataSourceMetaData dataSourceMetaData;
- @Before
- public void setUp() {
- shardingExecuteDataMap.put("SEATA_TX_XID", "test-XID");
- }
-
@After
public void tearDown() {
RootContext.unbind();
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/impl/StandardTransactionContextsTest.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/impl/StandardTransactionContextsTest.java
index f805ac6..c0d4ce6 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/impl/StandardTransactionContextsTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/impl/StandardTransactionContextsTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
import org.junit.Test;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -43,8 +43,7 @@ public final class StandardTransactionContextsTest {
@Test
public void assertGetDefaultTransactionManagerEngine() {
- Map<String, ShardingTransactionManagerEngine> actualEngine = new HashMap<>();
- actualEngine.put(DefaultSchema.LOGIC_NAME, new ShardingTransactionManagerEngine());
+ Map<String, ShardingTransactionManagerEngine> actualEngine = Collections.singletonMap(DefaultSchema.LOGIC_NAME, new ShardingTransactionManagerEngine());
StandardTransactionContexts standardTransactionContexts = new StandardTransactionContexts(actualEngine);
Map<String, ShardingTransactionManagerEngine> engines = standardTransactionContexts.getEngines();
assertThat(engines.size(), is(1));
@@ -56,9 +55,7 @@ public final class StandardTransactionContextsTest {
@Test
public void assertClose() throws Exception {
ShardingTransactionManagerEngine shardingTransactionManagerEngine = mock(ShardingTransactionManagerEngine.class);
- Map<String, ShardingTransactionManagerEngine> actualEngine = new HashMap<>();
- actualEngine.put(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine);
- StandardTransactionContexts standardTransactionContexts = new StandardTransactionContexts(actualEngine);
+ StandardTransactionContexts standardTransactionContexts = new StandardTransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine));
standardTransactionContexts.close();
verify(shardingTransactionManagerEngine).close();
}
@@ -67,9 +64,7 @@ public final class StandardTransactionContextsTest {
public void assertCloseThrowsException() throws Exception {
ShardingTransactionManagerEngine shardingTransactionManagerEngine = mock(ShardingTransactionManagerEngine.class);
doThrow(new RuntimeException("")).when(shardingTransactionManagerEngine).close();
- Map<String, ShardingTransactionManagerEngine> actualEngine = new HashMap<>();
- actualEngine.put(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine);
- StandardTransactionContexts standardTransactionContexts = new StandardTransactionContexts(actualEngine);
+ StandardTransactionContexts standardTransactionContexts = new StandardTransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine));
standardTransactionContexts.close();
}
}