This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 9cdd92fa7cf Use Collections.singletonMap to instead of single
element's map creation (#24347)
9cdd92fa7cf is described below
commit 9cdd92fa7cf7437f096c33187bda01cadc3e1479
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 25 13:53:55 2023 +0800
Use Collections.singletonMap to instead of single element's map creation
(#24347)
---
.../tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java | 4 +---
.../user-manual/shardingsphere-jdbc/java-api/algorithm.cn.md | 10 +++++-----
.../user-manual/shardingsphere-jdbc/java-api/algorithm.en.md | 10 +++++-----
.../dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java | 5 ++---
.../update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java | 7 +++----
.../handler/query/ShowReadwriteSplittingRuleExecutorTest.java | 4 +---
.../schema/loader/datatype/dialect/OracleDataTypeLoader.java | 6 ++----
.../impl/DataSourceGeneratedDatabaseConfigurationTest.java | 5 +----
.../infra/datasource/props/DataSourcePropertiesTest.java | 2 +-
.../props/custom/CustomDataSourcePropertiesTest.java | 10 ++--------
.../metadata/database/schema/util/IndexMetaDataUtilTest.java | 4 +---
.../driver/jdbc/core/connection/ConnectionManagerTest.java | 9 ++-------
.../pipeline/core/execute/ShardingSphereDataCollectorTest.java | 6 ++----
.../org/apache/shardingsphere/mode/manager/ContextManager.java | 8 ++------
.../shardingsphere/mode/metadata/MetaDataContextsTest.java | 5 ++---
.../subscriber/ConfigurationChangedSubscriberTest.java | 4 +---
.../subscriber/ProcessListChangedSubscriberTest.java | 4 +---
.../subscriber/ResourceMetaDataChangedSubscriberTest.java | 4 +---
.../mode/repository/cluster/nacos/NacosRepositoryTest.java | 4 +---
.../proxy/backend/handler/cdc/CDCBackendHandlerTest.java | 5 +----
.../database/DatabaseOperateBackendHandlerFactoryTest.java | 5 +----
.../handler/admin/executor/MySQLAdminExecutorCreatorTest.java | 7 ++-----
.../mysql/authentication/MySQLAuthenticationEngineTest.java | 4 +---
.../test/e2e/transaction/engine/base/TransactionBaseE2EIT.java | 2 +-
.../scenario/migration/api/impl/MigrationJobAPITest.java | 4 +---
25 files changed, 43 insertions(+), 95 deletions(-)
diff --git
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
index 7d201f516ec..02c40843766 100644
---
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
@@ -38,7 +38,6 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import static org.mockito.Mockito.mock;
@@ -94,8 +93,7 @@ public abstract class AbstractJDBCExecutorCallbackAdviceTest
implements AdviceTe
Map<String, DataSourceMetaData> cachedDatasourceMetaData =
(Map<String, DataSourceMetaData>) Plugins.getMemberAccessor()
.get(JDBCExecutorCallback.class.getDeclaredField("CACHED_DATASOURCE_METADATA"),
mockedJDBCExecutorCallback);
cachedDatasourceMetaData.put("mock_url", new MockDataSourceMetaData());
- storageTypes = new LinkedHashMap<>(1, 1);
- storageTypes.put(dataSourceName, new MySQLDatabaseType());
+ storageTypes = Collections.singletonMap(dataSourceName, new
MySQLDatabaseType());
Plugins.getMemberAccessor().set(JDBCExecutorCallback.class.getDeclaredField("storageTypes"),
mockedJDBCExecutorCallback, storageTypes);
targetObject = (TargetAdviceObject) mockedJDBCExecutorCallback;
}
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.cn.md
index 3a517d58715..d8bd8659bc9 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.cn.md
@@ -18,7 +18,7 @@
ruleConfiguration.getShardingAlgorithms().put("algorithmName", new AlgorithmConf
```java
// encryptorName 由用户指定，需要和加密规则中的 encryptorName 属性一致
// type 和
props，请参考加密内置算法：https://shardingsphere.apache.org/document/current/cn/user-manual/common-config/builtin-algorithm/encrypt/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new LinkedHashMap<>(1,
1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("encryptorName", new AlgorithmConfiguration("xxx", new
Properties()));
```
@@ -27,7 +27,7 @@ algorithmConfigs.put("encryptorName", new
AlgorithmConfiguration("xxx", new Prop
```java
// loadBalancerName 由用户指定，需要和读写分离规则中的 loadBalancerName 属性一致
// type 和
props，请参考读写分离负载均衡内置算法：https://shardingsphere.apache.org/document/current/cn/user-manual/common-config/builtin-algorithm/load-balance/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("loadBalancerName", new AlgorithmConfiguration("xxx", new
Properties()));
```
@@ -36,7 +36,7 @@ algorithmConfigs.put("loadBalancerName", new
AlgorithmConfiguration("xxx", new P
```java
// shadowAlgorithmName 由用户指定，需要和影子库规则中的 shadowAlgorithmNames 属性一致
// type 和
props，请参考影子库内置算法：https://shardingsphere.apache.org/document/current/cn/user-manual/common-config/builtin-algorithm/shadow/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("shadowAlgorithmName", new AlgorithmConfiguration("xxx",
new Properties()));
```
@@ -44,7 +44,7 @@ algorithmConfigs.put("shadowAlgorithmName", new
AlgorithmConfiguration("xxx", ne
```java
// discoveryTypeName 由用户指定，需要和数据库发现规则中的 discoveryTypeName 属性一致
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("discoveryTypeName", new AlgorithmConfiguration("xxx",
new Properties()));
```
@@ -53,6 +53,6 @@ algorithmConfigs.put("discoveryTypeName", new
AlgorithmConfiguration("xxx", new
```java
// maskAlgorithmName 由用户指定，需要和脱敏规则中的 maskAlgorithm 属性一致
// type 和
props，请参考脱敏内置算法：https://shardingsphere.apache.org/document/current/cn/user-manual/common-config/builtin-algorithm/mask/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new LinkedHashMap<>(1,
1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("maskAlgorithmName", new AlgorithmConfiguration("xxx",
new Properties()));
```
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.en.md
index fc5b2eaf01b..ff2770f35e3 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/algorithm.en.md
@@ -18,7 +18,7 @@
ruleConfiguration.getShardingAlgorithms().put("algorithmName", new AlgorithmConf
```java
// encryptorName is specified by users, and its property should be consistent
with that of encryptorName in encryption rules.
// type and props, please refer to the built-in encryption algorithm:
https://shardingsphere.apache.org/document/current/en/user-manual/common-config/builtin-algorithm/encrypt/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new LinkedHashMap<>(1,
1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("encryptorName", new AlgorithmConfiguration("xxx", new
Properties()));
```
@@ -27,7 +27,7 @@ algorithmConfigs.put("encryptorName", new
AlgorithmConfiguration("xxx", new Prop
```java
// loadBalancerName is specified by users, and its property has to be
consistent with that of loadBalancerName in read/write splitting rules.
// type and props, please refer to the built-in read/write splitting algorithm
load balancer:
https://shardingsphere.apache.org/document/current/en/user-manual/common-config/builtin-algorithm/load-balance/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("loadBalancerName", new AlgorithmConfiguration("xxx", new
Properties()));
```
@@ -36,7 +36,7 @@ algorithmConfigs.put("loadBalancerName", new
AlgorithmConfiguration("xxx", new P
```java
// shadowAlgorithmName is specified by users, and its property has to be
consistent with that of shadowAlgorithmNames in shadow DB rules.
// type and props, please refer to the built-in shadow DB algorithm:
https://shardingsphere.apache.org/document/current/en/user-manual/common-config/builtin-algorithm/shadow/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("shadowAlgorithmName", new AlgorithmConfiguration("xxx",
new Properties()));
```
@@ -44,7 +44,7 @@ algorithmConfigs.put("shadowAlgorithmName", new
AlgorithmConfiguration("xxx", ne
```
// discoveryTypeName is specified by users, and its property has to be
consistent with that of discoveryTypeName in database discovery rules.
-Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>(1, 1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("discoveryTypeName", new AlgorithmConfiguration("xxx",
new Properties()));
```
@@ -53,6 +53,6 @@ algorithmConfigs.put("discoveryTypeName", new
AlgorithmConfiguration("xxx", new
```java
// maskAlgorithmName is specified by users, and its property should be
consistent with that of maskAlgorithm in mask rules.
// type and props, please refer to the built-in mask algorithm:
https://shardingsphere.apache.org/document/current/en/user-manual/common-config/builtin-algorithm/mask/
-Map<String, AlgorithmConfiguration> algorithmConfigs = new LinkedHashMap<>(1,
1);
+Map<String, AlgorithmConfiguration> algorithmConfigs = new HashMap<>();
algorithmConfigs.put("maskAlgorithmName", new AlgorithmConfiguration("xxx",
new Properties()));
```
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
index 1bf4b50ed8d..86ca026b617 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
@@ -28,6 +28,7 @@ import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePrecondition
import javax.sql.DataSource;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -129,9 +130,7 @@ public final class DatabaseDiscoveryDataSourceRule {
* @return data source mapper
*/
public Map<String, Collection<String>> getDataSourceMapper() {
- Map<String, Collection<String>> result = new HashMap<>(1, 1);
- result.put(groupName, getActualDataSourceNames());
- return result;
+ return Collections.singletonMap(groupName, getActualDataSourceNames());
}
private Collection<String> getActualDataSourceNames() {
diff --git
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
index 0bc98280372..e765495e5a3 100644
---
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
+++
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -138,10 +138,9 @@ public final class
DropDatabaseDiscoveryRuleStatementUpdaterTest {
private DatabaseDiscoveryRuleConfiguration
createCurrentRuleConfiguration() {
DatabaseDiscoveryDataSourceRuleConfiguration dataSourceRuleConfig =
new DatabaseDiscoveryDataSourceRuleConfiguration("ha_group",
Collections.emptyList(), "ha_heartbeat", "readwrite_ds_MGR");
- Map<String, AlgorithmConfiguration> discoveryTypes = new
LinkedHashMap<>(1, 1);
- discoveryTypes.put("readwrite_ds_MGR", new
AlgorithmConfiguration("readwrite_ds_MGR", new Properties()));
- Map<String, DatabaseDiscoveryHeartBeatConfiguration>
discoveryHeartbeats = new LinkedHashMap<>(1, 1);
- discoveryHeartbeats.put("unused_heartbeat", new
DatabaseDiscoveryHeartBeatConfiguration(new Properties()));
+ Map<String, AlgorithmConfiguration> discoveryTypes = new
HashMap<>(Collections.singletonMap("readwrite_ds_MGR", new
AlgorithmConfiguration("readwrite_ds_MGR", new Properties())));
+ Map<String, DatabaseDiscoveryHeartBeatConfiguration>
discoveryHeartbeats = new HashMap<>(
+ Collections.singletonMap("unused_heartbeat", new
DatabaseDiscoveryHeartBeatConfiguration(new Properties())));
return new DatabaseDiscoveryRuleConfiguration(new
LinkedList<>(Collections.singleton(dataSourceRuleConfig)), discoveryHeartbeats,
discoveryTypes);
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
index 5cf54ab3c9a..20bbb6334ab 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
+++
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
@@ -190,9 +190,7 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
}
private Map<String, Map<String, String>> exportDynamicDataSources() {
- Map<String, Map<String, String>> result = new HashMap<>(1, 1);
- result.put("readwrite_ds", getAutoAwareDataSources());
- return result;
+ return Collections.singletonMap("readwrite_ds",
getAutoAwareDataSources());
}
private Map<String, String> getAutoAwareDataSources() {
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/dialect/OracleDataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/dialect/OracleDataTypeLoader.java
index 8e7663fe583..2d43396579e 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/dialect/OracleDataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/dialect/OracleDataTypeLoader.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.loader.datatype.
import java.sql.SQLException;
import java.sql.Types;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.Map;
/**
@@ -31,9 +31,7 @@ public final class OracleDataTypeLoader implements
DialectDataTypeLoader {
@Override
public Map<String, Integer> load() throws SQLException {
- Map<String, Integer> result = new HashMap<>(1, 1);
- result.putIfAbsent("NUMBER", Types.NUMERIC);
- return result;
+ return Collections.singletonMap("NUMBER", Types.NUMERIC);
}
@Override
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
index 22102e4b23e..17b6f9cbcac 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
import org.junit.Test;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -78,8 +77,6 @@ public final class
DataSourceGeneratedDatabaseConfigurationTest {
private Map<String, DataSourceConfiguration> createDataSources() {
PoolConfiguration poolConfig = new PoolConfiguration(2000L, 1000L,
1000L, 2, 1, false, new Properties());
DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration(new
ConnectionConfiguration("jdbc:mock://127.0.0.1/normal_db", "root", ""),
poolConfig);
- Map<String, DataSourceConfiguration> result = new HashMap<>(1, 1);
- result.put("normal_db", dataSourceConfig);
- return result;
+ return Collections.singletonMap("normal_db", dataSourceConfig);
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
index 6b8f48a03ab..9e3f232857b 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
@@ -133,7 +133,7 @@ public final class DataSourcePropertiesTest {
}
private Map<String, Object> createUserProperties(final String username) {
- Map<String, Object> result = new LinkedHashMap<>(1, 1);
+ Map<String, Object> result = new LinkedHashMap<>(2, 1);
result.put("username", username);
result.put("dataSourceProperties", getDataSourceProperties());
return result;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/custom/CustomDataSourcePropertiesTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/custom/CustomDataSourcePropertiesTest.java
index 6657af92b3e..832b7ac0464 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/custom/CustomDataSourcePropertiesTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/custom/CustomDataSourcePropertiesTest.java
@@ -33,7 +33,7 @@ public final class CustomDataSourcePropertiesTest {
@Test
public void assertGetProperties() {
Map<String, Object> actual = new CustomDataSourceProperties(
- createProperties(), Arrays.asList("username", "password",
"closed"), Collections.singletonList("closed"),
createPropertySynonyms()).getProperties();
+ createProperties(), Arrays.asList("username", "password",
"closed"), Collections.singletonList("closed"),
Collections.singletonMap("username", "user")).getProperties();
assertThat(actual.size(), is(3));
assertThat(actual.get("foo"), is("bar"));
assertThat(((Properties) actual.get("fooProperties")).size(), is(2));
@@ -45,7 +45,7 @@ public final class CustomDataSourcePropertiesTest {
}
private Map<String, Object> createProperties() {
- Map<String, Object> result = new LinkedHashMap<>(3, 1);
+ Map<String, Object> result = new LinkedHashMap<>(8, 1);
result.put("user", "root");
result.put("password", "root");
result.put("closed", false);
@@ -56,10 +56,4 @@ public final class CustomDataSourcePropertiesTest {
result.put("barProperties.bar2", "barValue2");
return result;
}
-
- private Map<String, String> createPropertySynonyms() {
- Map<String, String> result = new LinkedHashMap<>(1, 1);
- result.put("username", "user");
- return result;
- }
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
index e9cc1472d56..0da9d1e9a9a 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
@@ -37,7 +37,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.LinkedHashMap;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -93,8 +92,7 @@ public final class IndexMetaDataUtilTest {
private ShardingSphereDatabase buildDatabase() {
ShardingSphereTable table = new ShardingSphereTable(TABLE_NAME,
Collections.emptyList(), Collections.singleton(new
ShardingSphereIndex(INDEX_NAME)), Collections.emptyList());
Map<String, ShardingSphereTable> tables =
Collections.singletonMap(TABLE_NAME, table);
- Map<String, ShardingSphereSchema> schemas = new LinkedHashMap<>(1, 1);
- schemas.put(DefaultDatabase.LOGIC_NAME, new
ShardingSphereSchema(tables, Collections.emptyMap()));
+ Map<String, ShardingSphereSchema> schemas =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME, new
ShardingSphereSchema(tables, Collections.emptyMap()));
return new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class),
mock(ShardingSphereRuleMetaData.class), schemas);
}
}
diff --git
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
index 84c32a1c0f1..c4e2d6254ba 100644
---
a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
+++
b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
@@ -108,17 +108,12 @@ public final class ConnectionManagerTest {
private MetaDataPersistService mockMetaDataPersistService() {
MetaDataPersistService result = mock(MetaDataPersistService.class,
RETURNS_DEEP_STUBS);
-
when(result.getDataSourceService().load(DefaultDatabase.LOGIC_NAME)).thenReturn(createDataSourcePropertiesMap());
+ when(result.getDataSourceService().load(DefaultDatabase.LOGIC_NAME))
+
.thenReturn(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, new
DataSourceProperties(HikariDataSource.class.getName(), createProperties())));
when(result.getGlobalRuleService().loadUsers()).thenReturn(Collections.singletonList(new
ShardingSphereUser("root", "root", "localhost")));
return result;
}
- private Map<String, DataSourceProperties> createDataSourcePropertiesMap() {
- Map<String, DataSourceProperties> result = new LinkedHashMap<>(1, 1);
- result.put(DefaultDatabase.LOGIC_NAME, new
DataSourceProperties(HikariDataSource.class.getName(), createProperties()));
- return result;
- }
-
private Map<String, Object> createProperties() {
Map<String, Object> result = new LinkedHashMap<>(3, 1);
result.put("jdbcUrl",
"jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false");
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
index 16ffd99bd84..6731613fde2 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/execute/ShardingSphereDataCollectorTest.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.junit.Test;
import java.sql.Types;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
@@ -72,9 +72,7 @@ public final class ShardingSphereDataCollectorTest {
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
when(database.getName()).thenReturn("logic_db");
- Map<String, ShardingSphereDatabase> databases = new HashMap<>(1, 1);
- databases.put("logic_db", database);
- when(result.getDatabases()).thenReturn(databases);
+
when(result.getDatabases()).thenReturn(Collections.singletonMap("logic_db",
database));
when(result.getDatabase("logic_db")).thenReturn(database);
when(result.containsDatabase("logic_db")).thenReturn(true);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 6bdaff0721f..73f1a009d6a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -293,14 +293,12 @@ public final class ContextManager implements
AutoCloseable {
* @return ShardingSphere databases
*/
public synchronized Map<String, ShardingSphereDatabase>
renewDatabase(final ShardingSphereDatabase database, final SwitchingResource
resource) {
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
Map<String, DataSource> newDataSource =
database.getResourceMetaData().getDataSources().entrySet().stream().filter(entry
-> !resource.getStaleDataSources().containsKey(entry.getKey()))
.collect(Collectors.toMap(Entry::getKey,
Entry::getValue, (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
- result.put(database.getName().toLowerCase(),
+ return Collections.singletonMap(database.getName().toLowerCase(),
new ShardingSphereDatabase(database.getName(),
database.getProtocolType(), new
ShardingSphereResourceMetaData(database.getName(), newDataSource),
database.getRuleMetaData(), database.getSchemas()));
- return result;
}
/**
@@ -405,11 +403,9 @@ public final class ContextManager implements AutoCloseable
{
* @return ShardingSphere databases
*/
public synchronized Map<String, ShardingSphereDatabase>
newShardingSphereDatabase(final ShardingSphereDatabase originalDatabase) {
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put(originalDatabase.getName().toLowerCase(), new
ShardingSphereDatabase(originalDatabase.getName(),
+ return
Collections.singletonMap(originalDatabase.getName().toLowerCase(), new
ShardingSphereDatabase(originalDatabase.getName(),
originalDatabase.getProtocolType(),
originalDatabase.getResourceMetaData(), originalDatabase.getRuleMetaData(),
metaDataContexts.getPersistService().getDatabaseMetaDataService().loadSchemas(originalDatabase.getName())));
- return result;
}
/**
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
index 5908351ba4c..1be3cd1d133 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsTest.java
@@ -29,7 +29,7 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.util.LinkedHashMap;
+import java.util.Collections;
import java.util.Map;
import java.util.Properties;
@@ -45,8 +45,7 @@ public final class MetaDataContextsTest {
@Test
public void assertGetDefaultMetaData() {
- Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1,
1);
- databases.put(DefaultDatabase.LOGIC_NAME, database);
+ Map<String, ShardingSphereDatabase> databases =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database);
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(new Properties()));
assertThat(new MetaDataContexts(mock(MetaDataPersistService.class),
metaData).getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME), is(database));
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index 8e01ab07389..5877ff0a991 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -120,9 +120,7 @@ public final class ConfigurationChangedSubscriberTest {
when(database.getRuleMetaData().getRules()).thenReturn(new
LinkedList<>());
when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().findRules(ResourceHeldRule.class)).thenReturn(Collections.emptyList());
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("db", database);
- return result;
+ return Collections.singletonMap("db", database);
}
@Test
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
index 984f6191024..0ffd4d2d5ea 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
@@ -95,9 +95,7 @@ public final class ProcessListChangedSubscriberTest {
when(database.getRuleMetaData().getRules()).thenReturn(new
LinkedList<>());
when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().findRules(ResourceHeldRule.class)).thenReturn(Collections.emptyList());
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("db", database);
- return result;
+ return Collections.singletonMap("db", database);
}
@Test
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
index 8ba530131b2..fe82b05b872 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
@@ -102,9 +102,7 @@ public final class ResourceMetaDataChangedSubscriberTest {
when(database.getRuleMetaData().getRules()).thenReturn(new
LinkedList<>());
when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().findRules(ResourceHeldRule.class)).thenReturn(Collections.emptyList());
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("db", database);
- return result;
+ return Collections.singletonMap("db", database);
}
@Test
diff --git
a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
index 9f62317ce72..c53d87b20cc 100644
---
a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
+++
b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
@@ -145,9 +145,7 @@ public final class NacosRepositoryTest {
instance.setIp(ip);
instance.setEphemeral(false);
String key = "/test/children/keys/persistent/0";
- Map<String, String> metaDataMap = new HashMap<>(1, 1);
- metaDataMap.put(key, "value0");
- instance.setMetadata(metaDataMap);
+ instance.setMetadata(new HashMap<>(Collections.singletonMap(key,
"value0")));
List<Instance> instances = new LinkedList<>();
buildParentPath(key, instances);
instances.add(instance);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/cdc/CDCBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/cdc/CDCBackendHandlerTest.java
index c382e5b439a..4492318719f 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/cdc/CDCBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/cdc/CDCBackendHandlerTest.java
@@ -51,7 +51,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -85,9 +84,7 @@ public final class CDCBackendHandlerTest {
when(database.getProtocolType()).thenReturn(new MySQLDatabaseType());
Set<ShardingSphereRule> shardingRule =
Collections.singleton(mock(ShardingRule.class));
when(database.getRuleMetaData().getRules()).thenReturn(shardingRule);
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("sharding_db", database);
- return result;
+ return Collections.singletonMap("sharding_db", database);
}
@AfterClass
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
index deb84e90a13..55efc107c12 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
@@ -49,7 +49,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
@@ -147,9 +146,7 @@ public final class DatabaseOperateBackendHandlerFactoryTest
{
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getProtocolType()).thenReturn(new MySQLDatabaseType());
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("db", database);
- return result;
+ return Collections.singletonMap("db", database);
}
private void setGovernanceMetaDataContexts(final boolean isGovernance) {
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLAdminExecutorCreatorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLAdminExecutorCreatorTest.java
index 52e75430a87..554947641b0 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLAdminExecutorCreatorTest.java
@@ -56,7 +56,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
@@ -244,10 +243,9 @@ public final class MySQLAdminExecutorCreatorTest {
@Test
public void assertCreateWithOtherSelectStatementForDatabaseName() {
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
ShardingSphereResourceMetaData resourceMetaData = new
ShardingSphereResourceMetaData("sharding_db", Collections.singletonMap("ds",
new MockedDataSource()));
ShardingSphereDatabase database = new ShardingSphereDatabase("db_0",
mock(DatabaseType.class), resourceMetaData,
mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- result.put("db_0", database);
+ Map<String, ShardingSphereDatabase> result =
Collections.singletonMap("db_0", database);
initProxyContext(result);
MySQLSelectStatement mySQLSelectStatement =
mock(MySQLSelectStatement.class);
when(mySQLSelectStatement.getFrom()).thenReturn(null);
@@ -261,10 +259,9 @@ public final class MySQLAdminExecutorCreatorTest {
@Test
public void assertCreateWithOtherSelectStatementForNullDatabaseName() {
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
ShardingSphereResourceMetaData resourceMetaData = new
ShardingSphereResourceMetaData("sharding_db", Collections.singletonMap("ds_0",
new MockedDataSource()));
ShardingSphereDatabase database = new ShardingSphereDatabase("db_0",
mock(DatabaseType.class), resourceMetaData,
mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- result.put("db_0", database);
+ Map<String, ShardingSphereDatabase> result =
Collections.singletonMap("db_0", database);
initProxyContext(result);
MySQLSelectStatement mySQLSelectStatement =
mock(MySQLSelectStatement.class);
when(mySQLSelectStatement.getFrom()).thenReturn(null);
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
index ac4a3752960..dbd942e875c 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationEngineTest.java
@@ -52,7 +52,6 @@ import org.mockito.internal.configuration.plugins.Plugins;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -245,8 +244,7 @@ public final class MySQLAuthenticationEngineTest {
private ContextManager mockContextManager(final AuthorityRule rule) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>(1,
1);
- databases.put("sharding_db", mock(ShardingSphereDatabase.class));
+ Map<String, ShardingSphereDatabase> databases =
Collections.singletonMap("sharding_db", mock(ShardingSphereDatabase.class));
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData(databases,
new ShardingSphereRuleMetaData(Collections.singleton(rule)),
new ConfigurationProperties(new Properties())));
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index 9b5646b0e36..2fa61d11e5f 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -108,7 +108,7 @@ public abstract class TransactionBaseE2EIT extends
BaseE2EIT {
private Map<String, String> executeShowTransactionRule(final Connection
connection) throws SQLException {
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery("SHOW TRANSACTION RULE;");
- Map<String, String> result = new HashMap<>(1, 1);
+ Map<String, String> result = new HashMap<>();
while (resultSet.next()) {
String defaultType =
resultSet.getString(TransactionTestConstants.DEFAULT_TYPE);
String providerType =
resultSet.getString(TransactionTestConstants.PROVIDER_TYPE);
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
index 3375cc519ea..f44ff7cfdc2 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
@@ -98,9 +98,7 @@ public final class MigrationJobAPITest {
props.put("jdbcUrl", jdbcUrl);
props.put("username", "root");
props.put("password", "root");
- Map<String, DataSourceProperties> expect = new LinkedHashMap<>(1, 1);
- expect.put("ds_0", new
DataSourceProperties("com.zaxxer.hikari.HikariDataSource", props));
- jobAPI.addMigrationSourceResources(expect);
+ jobAPI.addMigrationSourceResources(Collections.singletonMap("ds_0",
new DataSourceProperties("com.zaxxer.hikari.HikariDataSource", props)));
}
@AfterClass
