From 06a3f5d5521942516f3270f83e0baf576b2bef0f Mon Sep 17 00:00:00 2001 From: terrymanu Date: Mon, 26 Mar 2018 17:01:16 +0800 Subject: [PATCH] For #673: HashMap = LinkedHashMap for test case --- .../core/rewrite/SQLRewriteEngine.java | 16 ++++++++-------- .../sharding/YamlShardingRuleConfiguration.java | 9 ++++----- .../spring/boot/SpringBootConfiguration.java | 4 ++-- .../executor/threadlocal/ExecutorDataMap.java | 4 ++-- .../type/batch/BatchPreparedStatementUnit.java | 4 ++-- .../OrchestrationSpringBootConfiguration.java | 4 ++-- .../internal/OrchestrationFacade.java | 4 ++-- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java b/sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java index 0cba01dee5..4cbc90b338 100644 --- a/sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java +++ b/sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java @@ -233,26 +233,26 @@ public final class SQLRewriteEngine { private Map getTableTokens(final TableUnit tableUnit) { String logicTableName = tableUnit.getLogicTableName().toLowerCase(); - Map tableTokens = new HashMap<>(); - tableTokens.put(logicTableName, tableUnit.getActualTableName()); + Map result = new HashMap<>(); + result.put(logicTableName, tableUnit.getActualTableName()); Optional bindingTableRule = shardingRule.findBindingTableRule(logicTableName); if (bindingTableRule.isPresent()) { - tableTokens.putAll(getBindingTableTokens(tableUnit, bindingTableRule.get())); + result.putAll(getBindingTableTokens(tableUnit, bindingTableRule.get())); } - return tableTokens; + return result; } private Map getTableTokens(final CartesianTableReference cartesianTableReference) { - Map tableTokens = new HashMap<>(); + Map result = new HashMap<>(); for (TableUnit each : cartesianTableReference.getTableUnits()) { String logicTableName = each.getLogicTableName().toLowerCase(); - tableTokens.put(logicTableName, each.getActualTableName()); + result.put(logicTableName, each.getActualTableName()); Optional bindingTableRule = shardingRule.findBindingTableRule(logicTableName); if (bindingTableRule.isPresent()) { - tableTokens.putAll(getBindingTableTokens(each, bindingTableRule.get())); + result.putAll(getBindingTableTokens(each, bindingTableRule.get())); } } - return tableTokens; + return result; } private Map getBindingTableTokens(final TableUnit tableUnit, final BindingTableRule bindingTableRule) { diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java b/sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java index 7d22aea837..49707b68d3 100644 --- a/sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java +++ b/sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingRuleConfiguration.java @@ -25,13 +25,12 @@ import lombok.Setter; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; /** * Sharding rule configuration for yaml. @@ -44,7 +43,7 @@ public class YamlShardingRuleConfiguration { private String defaultDataSourceName; - private Map tables = new HashMap<>(); + private Map tables = new LinkedHashMap<>(); private List bindingTables = new ArrayList<>(); @@ -54,9 +53,9 @@ public class YamlShardingRuleConfiguration { private String defaultKeyGeneratorClass; - private Map masterSlaveRules = new HashMap<>(); + private Map masterSlaveRules = new LinkedHashMap<>(); - private Map configMap = new ConcurrentHashMap<>(); + private Map configMap = new LinkedHashMap<>(); private Properties props = new Properties(); diff --git a/sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java b/sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java index 1f9033b126..2531be90fb 100644 --- a/sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java +++ b/sharding-jdbc-core-spring/sharding-jdbc-core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.core.env.Environment; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -52,7 +52,7 @@ public class SpringBootConfiguration implements EnvironmentAware { @Autowired private SpringBootMasterSlaveRuleConfigurationProperties masterSlaveProperties; - private final Map dataSourceMap = new HashMap<>(); + private final Map dataSourceMap = new LinkedHashMap<>(); /** * Get data source bean. diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java index ff58ad2993..15af289bb9 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/threadlocal/ExecutorDataMap.java @@ -20,7 +20,7 @@ package io.shardingjdbc.core.executor.threadlocal; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -35,7 +35,7 @@ public final class ExecutorDataMap { @Override protected Map initialValue() { - return new HashMap<>(); + return new LinkedHashMap<>(); } }; diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java index cf550402a3..6c997a81e5 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/executor/type/batch/BatchPreparedStatementUnit.java @@ -24,7 +24,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import java.sql.PreparedStatement; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -40,7 +40,7 @@ public final class BatchPreparedStatementUnit implements BaseStatementUnit { private final PreparedStatement statement; - private final Map jdbcAndActualAddBatchCallTimesMap = new HashMap<>(); + private final Map jdbcAndActualAddBatchCallTimesMap = new LinkedHashMap<>(); @Getter(AccessLevel.NONE) private int actualCallAddBatchTimes; diff --git a/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java b/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java index 2121857f26..b38ac9a636 100644 --- a/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java +++ b/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -48,7 +48,7 @@ import java.util.Map; @EnableConfigurationProperties({SpringBootShardingRuleConfigurationProperties.class, SpringBootMasterSlaveRuleConfigurationProperties.class, SpringBootOrchestrationConfigurationProperties.class}) public class OrchestrationSpringBootConfiguration implements EnvironmentAware { - private final Map dataSourceMap = new HashMap<>(); + private final Map dataSourceMap = new LinkedHashMap<>(); @Autowired private SpringBootShardingRuleConfigurationProperties shardingProperties; diff --git a/sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java b/sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java index 89fc2fcc54..afde053cde 100644 --- a/sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java +++ b/sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java @@ -36,7 +36,7 @@ import io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperRegistryCenter; import lombok.extern.slf4j.Slf4j; import javax.sql.DataSource; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; @@ -128,7 +128,7 @@ public final class OrchestrationFacade implements AutoCloseable { } private Map getActualDataSourceMapForMasterSlave(final Map dataSourceMap) { - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); for (Entry entry : dataSourceMap.entrySet()) { if (entry.getValue() instanceof MasterSlaveDataSource) { MasterSlaveDataSource masterSlaveDataSource = (MasterSlaveDataSource) entry.getValue(); -- GitLab