This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 be7a23a0c36 Remove useless new LinkedList on test cases (#38367)
be7a23a0c36 is described below
commit be7a23a0c36a880063c822d1ae2b0307cb68d9fa
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 7 13:23:27 2026 +0800
Remove useless new LinkedList on test cases (#38367)
* Remove unsless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
* Remove useless new LinkedList on test cases
---
.../changed/BroadcastRuleChangedProcessorTest.java | 2 +-
.../BroadcastTableChangedProcessorTest.java | 2 +-
.../ShadowRuleConfigurationCheckerTest.java | 19 +++++-----
.../update/AlterShadowRuleExecutorTest.java | 3 +-
.../update/DropShadowAlgorithmExecutorTest.java | 7 ++--
.../handler/update/DropShadowRuleExecutorTest.java | 4 +--
.../DatabaseRuleConfigurationCheckEngineTest.java | 5 ++-
.../infra/metadata/ShardingSphereMetaDataTest.java | 19 ++++------
.../changed/SingleTableChangedProcessorTest.java | 2 +-
.../ShowUnloadedSingleTablesExecutorTest.java | 10 +++---
.../rule/DatabaseRuleConfigurationManagerTest.java | 41 +++++++---------------
.../yaml/YamlProxyServerConfigurationTest.java | 3 +-
.../PostgreSQLComDescribeExecutorTest.java | 6 ++--
13 files changed, 48 insertions(+), 75 deletions(-)
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastRuleChangedProcessorTest.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastRuleChangedProcessorTest.java
index 4c29bad837e..fc9e006025b 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastRuleChangedProcessorTest.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastRuleChangedProcessorTest.java
@@ -73,7 +73,7 @@ class BroadcastRuleChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
BroadcastRuleConfiguration currentRuleConfig = new
BroadcastRuleConfiguration(new LinkedList<>(Collections.singleton("foo_tbl")));
- BroadcastRuleConfiguration toBeChangedItemConfig = new
BroadcastRuleConfiguration(new LinkedList<>(Collections.singleton("bar_tbl")));
+ BroadcastRuleConfiguration toBeChangedItemConfig = new
BroadcastRuleConfiguration(Collections.singleton("bar_tbl"));
processor.changeRuleItemConfiguration("unused", currentRuleConfig,
toBeChangedItemConfig);
assertThat(currentRuleConfig.getTables(),
is(Collections.singletonList("bar_tbl")));
}
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastTableChangedProcessorTest.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastTableChangedProcessorTest.java
index d1004a92e2b..8e5d32d0a66 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastTableChangedProcessorTest.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/rule/changed/BroadcastTableChangedProcessorTest.java
@@ -64,7 +64,7 @@ class BroadcastTableChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
BroadcastRuleConfiguration currentRuleConfig =
createCurrentRuleConfiguration();
- BroadcastRuleConfiguration toBeChangedItemConfig = new
BroadcastRuleConfiguration(new LinkedList<>(Collections.singleton("bar_tbl")));
+ BroadcastRuleConfiguration toBeChangedItemConfig = new
BroadcastRuleConfiguration(Collections.singleton("bar_tbl"));
processor.changeRuleItemConfiguration(null, currentRuleConfig,
toBeChangedItemConfig);
assertThat(currentRuleConfig.getTables(),
is(Collections.singletonList("bar_tbl")));
}
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationCheckerTest.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationCheckerTest.java
index 61622519af1..3208fa17be2 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationCheckerTest.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationCheckerTest.java
@@ -39,12 +39,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -69,7 +68,7 @@ class ShadowRuleConfigurationCheckerTest {
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDefaultShadowAlgorithmName("bar-algo");
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -85,7 +84,7 @@ class ShadowRuleConfigurationCheckerTest {
PropertiesBuilder.build(new Property("column", "foo_id"), new
Property("operation", "insert"), new Property("regex", "[1]")))));
result.setDefaultShadowAlgorithmName("foo-algo");
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -100,7 +99,7 @@ class ShadowRuleConfigurationCheckerTest {
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDefaultShadowAlgorithmName("foo-algo");
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("bar_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("bar_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -115,7 +114,7 @@ class ShadowRuleConfigurationCheckerTest {
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDefaultShadowAlgorithmName("foo-algo");
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("bar-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("bar-algo"))));
return result;
}
@@ -129,7 +128,7 @@ class ShadowRuleConfigurationCheckerTest {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "no_prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -143,7 +142,7 @@ class ShadowRuleConfigurationCheckerTest {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "no_shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -156,7 +155,7 @@ class ShadowRuleConfigurationCheckerTest {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
@@ -170,7 +169,7 @@ class ShadowRuleConfigurationCheckerTest {
result.setShadowAlgorithms(Collections.singletonMap("foo-algo", new
AlgorithmConfiguration("SQL_HINT", new Properties())));
result.setDefaultShadowAlgorithmName("foo-algo");
result.setDataSources(Collections.singleton(new
ShadowDataSourceConfiguration("foo_ds", "prod_ds", "shadow_ds")));
- result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"), new
LinkedList<>(Collections.singleton("foo-algo")))));
+ result.setTables(Collections.singletonMap("foo_tbl", new
ShadowTableConfiguration(Collections.singletonList("foo_ds"),
Collections.singleton("foo-algo"))));
return result;
}
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
index e646a112f54..be6f4e67da6 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
@@ -49,7 +49,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -136,7 +135,7 @@ class AlterShadowRuleExecutorTest {
ShadowRuleConfiguration ruleConfig = new ShadowRuleConfiguration();
ruleConfig.getShadowAlgorithms().put("used_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
ruleConfig.getShadowAlgorithms().put("unused_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
- ruleConfig.getTables().put("t_order", new ShadowTableConfiguration(new
ArrayList<>(Collections.singleton("initRuleName1")), new
ArrayList<>(Collections.singleton("used_algorithm"))));
+ ruleConfig.getTables().put("t_order", new
ShadowTableConfiguration(Collections.singleton("initRuleName1"),
Collections.singleton("used_algorithm")));
ruleConfig.setDefaultShadowAlgorithmName("used_algorithm");
executor.setRule(createRule(ruleConfig));
ShadowRuleConfiguration actual =
executor.buildToBeDroppedRuleConfiguration(new ShadowRuleConfiguration());
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
index c130bfddb21..d2b347910d3 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
@@ -41,7 +41,6 @@ import org.mockito.quality.Strictness;
import java.util.Arrays;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.Properties;
import java.util.stream.Stream;
@@ -80,7 +79,7 @@ class DropShadowAlgorithmExecutorTest {
void assertCheckBeforeUpdate() {
ShadowRuleConfiguration ruleConfig = new ShadowRuleConfiguration();
ruleConfig.getShadowAlgorithms().put("droppable_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
- ruleConfig.getTables().put("t_order_empty", new
ShadowTableConfiguration(new LinkedList<>(), new
LinkedList<>(Collections.singleton("droppable_algorithm"))));
+ ruleConfig.getTables().put("t_order_empty", new
ShadowTableConfiguration(Collections.emptyList(),
Collections.singleton("droppable_algorithm")));
executor.setRule(createRule(ruleConfig));
assertDoesNotThrow(() -> executor.checkBeforeUpdate(new
DropShadowAlgorithmStatement(false,
Collections.singleton("droppable_algorithm"))));
}
@@ -131,8 +130,8 @@ class DropShadowAlgorithmExecutorTest {
inUsedAlgorithmConfig.getShadowAlgorithms().put("in_used_algorithm",
new AlgorithmConfiguration("SQL_HINT", new Properties()));
inUsedAlgorithmConfig.getShadowAlgorithms().put("algorithm_from_empty_table",
new AlgorithmConfiguration("SQL_HINT", new Properties()));
inUsedAlgorithmConfig.getTables().put("t_order",
- new ShadowTableConfiguration(new
LinkedList<>(Collections.singleton("shadow_group")), new
LinkedList<>(Collections.singleton("in_used_algorithm"))));
- inUsedAlgorithmConfig.getTables().put("t_order_empty", new
ShadowTableConfiguration(new LinkedList<>(), new
LinkedList<>(Collections.singleton("algorithm_from_empty_table"))));
+ new
ShadowTableConfiguration(Collections.singleton("shadow_group"),
Collections.singleton("in_used_algorithm")));
+ inUsedAlgorithmConfig.getTables().put("t_order_empty", new
ShadowTableConfiguration(Collections.emptyList(),
Collections.singleton("algorithm_from_empty_table")));
ShadowRuleConfiguration defaultAlgorithmConfig = new
ShadowRuleConfiguration();
defaultAlgorithmConfig.getShadowAlgorithms().put("default_shadow_algorithm",
new AlgorithmConfiguration("SQL_HINT", new Properties()));
defaultAlgorithmConfig.setDefaultShadowAlgorithmName("default_shadow_algorithm");
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
index bdbea6cef17..d9c2db3aef9 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
@@ -126,9 +126,9 @@ class DropShadowRuleExecutorTest {
result.getDataSources().add(new
ShadowDataSourceConfiguration("shadow_group", "production_0", "shadow_0"));
result.getDataSources().add(new
ShadowDataSourceConfiguration("shadow_group_1", "production_1", "shadow_1"));
result.getTables().put("t_order",
- new ShadowTableConfiguration(new
ArrayList<>(Collections.singleton("shadow_group")), new
ArrayList<>(Collections.singleton("only_drop_algorithm"))));
+ new ShadowTableConfiguration(new
ArrayList<>(Collections.singleton("shadow_group")),
Collections.singleton("only_drop_algorithm")));
result.getTables().put("t_order_item",
- new ShadowTableConfiguration(new
ArrayList<>(Arrays.asList("shadow_group", "shadow_group_1")), new
ArrayList<>(Collections.singleton("shared_algorithm"))));
+ new ShadowTableConfiguration(new
ArrayList<>(Arrays.asList("shadow_group", "shadow_group_1")),
Collections.singleton("shared_algorithm")));
result.getShadowAlgorithms().put("only_drop_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
result.getShadowAlgorithms().put("shared_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
result.getShadowAlgorithms().put("unused_algorithm", new
AlgorithmConfiguration("SQL_HINT", new Properties()));
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/rule/checker/DatabaseRuleConfigurationCheckEngineTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/rule/checker/DatabaseRuleConfigurationCheckEngineTest.java
index 8cd59483640..3e003184671 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/config/rule/checker/DatabaseRuleConfigurationCheckEngineTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/config/rule/checker/DatabaseRuleConfigurationCheckEngineTest.java
@@ -37,10 +37,9 @@ import org.mockito.quality.Strictness;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedList;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
@@ -94,7 +93,7 @@ class DatabaseRuleConfigurationCheckEngineTest {
.thenReturn(Collections.singletonMap(FixtureRuleConfiguration.class, checker));
Collection<String> requiredDataSources = Arrays.asList("foo_ds",
"bar_ds");
when(checker.getRequiredDataSourceNames(any())).thenReturn(requiredDataSources);
-
when(resourceMetaData.getNotExistedDataSources(requiredDataSources)).thenReturn(new
LinkedList<>(Collections.singleton("foo_ds")));
+
when(resourceMetaData.getNotExistedDataSources(requiredDataSources)).thenReturn(Collections.singleton("foo_ds"));
when(resourceMetaData.getStorageUnits()).thenReturn(Collections.singletonMap("bar_ds",
mock(StorageUnit.class, RETURNS_DEEP_STUBS)));
DataSourceMapperRuleAttribute dataSourceMapperRuleAttribute =
mock(DataSourceMapperRuleAttribute.class);
when(dataSourceMapperRuleAttribute.getDataSourceMapper()).thenReturn(Collections.singletonMap("foo_ds",
Collections.singleton("some_logic_name")));
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
index 41128ffe2bb..098affe41dc 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
@@ -43,14 +43,12 @@ import org.mockito.quality.Strictness;
import javax.sql.DataSource;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -72,8 +70,7 @@ class ShardingSphereMetaDataTest {
DatabaseType databaseType = database.getProtocolType();
ConfigurationProperties configProps = new ConfigurationProperties(new
Properties());
when(ShardingSphereDatabaseFactory.create("foo_db", databaseType,
configProps)).thenReturn(database);
- Collection<ShardingSphereDatabase> databases = new
LinkedList<>(Collections.singleton(database));
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database),
mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
metaData.addDatabase("foo_db", databaseType, configProps);
assertThat(metaData.getDatabase("foo_db"), is(database));
}
@@ -88,7 +85,7 @@ class ShardingSphereMetaDataTest {
when(databaseRule1.getAttributes()).thenReturn(new
RuleAttributes(staticDataSourceRuleAttribute));
ShardingSphereRule databaseRule2 = mock(ShardingSphereRule.class,
withSettings().extraInterfaces(AutoCloseable.class));
when(databaseRule2.getAttributes()).thenReturn(new RuleAttributes());
- ShardingSphereMetaData metaData = new ShardingSphereMetaData(new
LinkedList<>(Collections.singleton(mockDatabase(resourceMetaData, dataSource,
databaseRule1, databaseRule2))),
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(mockDatabase(resourceMetaData,
dataSource, databaseRule1, databaseRule2)),
mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), new
ConfigurationProperties(new Properties()));
metaData.dropDatabase("foo_db");
assertTrue(metaData.getAllDatabases().isEmpty());
@@ -103,9 +100,8 @@ class ShardingSphereMetaDataTest {
void assertContainsDatabase() {
ShardingSphereRule globalRule = mock(ShardingSphereRule.class);
ShardingSphereDatabase database =
mockDatabase(mock(ResourceMetaData.class, RETURNS_DEEP_STUBS), new
MockedDataSource(), globalRule);
- Collection<ShardingSphereDatabase> databases = new
LinkedList<>(Collections.singleton(database));
ConfigurationProperties configProps = new ConfigurationProperties(new
Properties());
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database),
mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
assertTrue(metaData.containsDatabase("foo_db"));
}
@@ -122,9 +118,8 @@ class ShardingSphereMetaDataTest {
void assertGetDatabase() {
ShardingSphereRule globalRule = mock(ShardingSphereRule.class);
ShardingSphereDatabase database =
mockDatabase(mock(ResourceMetaData.class, RETURNS_DEEP_STUBS), new
MockedDataSource(), globalRule);
- Collection<ShardingSphereDatabase> databases = new
LinkedList<>(Collections.singleton(database));
ConfigurationProperties configProps = new ConfigurationProperties(new
Properties());
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database),
mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(globalRule)), configProps);
assertThat(metaData.getDatabase("foo_db"), is(database));
}
@@ -142,8 +137,8 @@ class ShardingSphereMetaDataTest {
void assertCloseClosesAllRules() throws Exception {
GlobalRule closableGlobalRule = mock(GlobalRule.class,
withSettings().extraInterfaces(AutoCloseable.class));
ShardingSphereDatabase database =
mockDatabase(mock(ResourceMetaData.class), new MockedDataSource(),
mock(ShardingSphereRule.class));
- ShardingSphereMetaData metaData = new ShardingSphereMetaData(new
LinkedList<>(Collections.singleton(database)),
- mock(ResourceMetaData.class), new
RuleMetaData(Collections.singleton(closableGlobalRule)), new
ConfigurationProperties(new Properties()));
+ ShardingSphereMetaData metaData = new ShardingSphereMetaData(
+ Collections.singleton(database), mock(), new
RuleMetaData(Collections.singleton(closableGlobalRule)), new
ConfigurationProperties(new Properties()));
metaData.close();
verify((AutoCloseable) closableGlobalRule).close();
}
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/changed/SingleTableChangedProcessorTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/changed/SingleTableChangedProcessorTest.java
index af5a9232c5d..739acfc9cc2 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/changed/SingleTableChangedProcessorTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/rule/changed/SingleTableChangedProcessorTest.java
@@ -64,7 +64,7 @@ class SingleTableChangedProcessorTest {
@Test
void assertChangeRuleItemConfiguration() {
SingleRuleConfiguration currentRuleConfig = new
SingleRuleConfiguration(new LinkedList<>(Collections.singleton("foo_tbl")),
null);
- SingleRuleConfiguration toBeChangedItemConfig = new
SingleRuleConfiguration(new LinkedList<>(Collections.singleton("bar_tbl")),
null);
+ SingleRuleConfiguration toBeChangedItemConfig = new
SingleRuleConfiguration(Collections.singleton("bar_tbl"), null);
processor.changeRuleItemConfiguration(null, currentRuleConfig,
toBeChangedItemConfig);
assertThat(currentRuleConfig.getTables(),
is(Collections.singletonList("bar_tbl")));
}
diff --git
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
index 005b3e4fce9..89a5c8fabd6 100644
---
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
+++
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
@@ -165,17 +165,17 @@ class ShowUnloadedSingleTablesExecutorTest {
private static Stream<Arguments> getRowsArguments() {
Map<String, Collection<DataNode>> allLoadedActualDataNodes = new
HashMap<>(
- Collections.singletonMap("t_order", new
LinkedList<>(Collections.singleton(new DataNode("ds_0", (String) null,
"t_order")))));
+ Collections.singletonMap("t_order", Collections.singleton(new
DataNode("ds_0", (String) null, "t_order"))));
Map<String, Collection<DataNode>> allLoadedRuleDataNodes = new
HashMap<>(
- Collections.singletonMap("t_order", new
LinkedList<>(Collections.singleton(new DataNode("ds_0", (String) null,
"t_order")))));
+ Collections.singletonMap("t_order", Collections.singleton(new
DataNode("ds_0", (String) null, "t_order"))));
Map<String, Collection<DataNode>> partiallyLoadedActualDataNodes = new
HashMap<>(
Collections.singletonMap("t_order", new
LinkedList<>(Arrays.asList(new DataNode("ds_0", "public", "t_order"), new
DataNode("ds_1", "public", "t_order")))));
Map<String, Collection<DataNode>> partiallyLoadedRuleDataNodes = new
HashMap<>(
- Collections.singletonMap("t_order", new
LinkedList<>(Collections.singleton(new DataNode("ds_0", "public",
"t_order")))));
+ Collections.singletonMap("t_order", Collections.singleton(new
DataNode("ds_0", "public", "t_order"))));
Map<String, Collection<DataNode>> unmatchedActualDataNodes = new
HashMap<>(
- Collections.singletonMap("t_order_item", new
LinkedList<>(Collections.singleton(new DataNode("ds_2", (String) null,
"t_order_item")))));
+ Collections.singletonMap("t_order_item",
Collections.singleton(new DataNode("ds_2", (String) null, "t_order_item"))));
Map<String, Collection<DataNode>> unmatchedRuleDataNodes = new
HashMap<>(
- Collections.singletonMap("t_order", new
LinkedList<>(Collections.singleton(new DataNode("ds_0", (String) null,
"t_order")))));
+ Collections.singletonMap("t_order", Collections.singleton(new
DataNode("ds_0", (String) null, "t_order"))));
return Stream.of(
Arguments.of("all loaded tables are excluded", false,
allLoadedActualDataNodes, allLoadedRuleDataNodes,
Collections.<List<String>>emptyList()),
Arguments.of("partially loaded table keeps remaining nodes",
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
index 60ad6453d25..aafd6d8a8e5 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManagerTest.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.mode.metadata.manager.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
import
org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.rule.PartialRuleUpdateSupported;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -72,10 +71,8 @@ class DatabaseRuleConfigurationManagerTest {
ShardingSphereRule nonClosableRule = mock(ShardingSphereRule.class);
when(nonClosableRule.getConfiguration()).thenReturn(mock(RuleConfiguration.class,
withSettings().extraInterfaces(Cloneable.class)));
RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(Arrays.asList(closableRule, nonClosableRule)));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
ShardingSphereRule rebuiltRule = mock(ShardingSphereRule.class);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
@@ -93,10 +90,8 @@ class DatabaseRuleConfigurationManagerTest {
DatabaseRuleConfiguration ruleConfig =
mockDatabaseRuleConfiguration(false);
ShardingSphereRule partialRule = mock(ShardingSphereRule.class,
withSettings().extraInterfaces(PartialRuleUpdateSupported.class));
when(partialRule.getConfiguration()).thenReturn(ruleConfig);
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
- when(database.getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.singleton(partialRule)));
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.singleton(partialRule)));
new DatabaseRuleConfigurationManager(metaDataContexts, mock(),
mock()).refresh(DATABASE_NAME, ruleConfig);
verify((PartialRuleUpdateSupported)
partialRule).updateConfiguration(ruleConfig);
verify(metaDataContexts, never()).update(any(MetaDataContexts.class));
@@ -107,11 +102,9 @@ class DatabaseRuleConfigurationManagerTest {
DatabaseRuleConfiguration ruleConfig =
mockDatabaseRuleConfiguration(true);
ShardingSphereRule partialRule = mock(ShardingSphereRule.class,
withSettings().extraInterfaces(PartialRuleUpdateSupported.class));
when(partialRule.getConfiguration()).thenReturn(ruleConfig);
- RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(Collections.singleton(partialRule)));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
+ RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(partialRule));
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
(mock, context) ->
when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false),
any(Collection.class),
eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
@@ -129,11 +122,9 @@ class DatabaseRuleConfigurationManagerTest {
when(partialRule.getConfiguration()).thenReturn(ruleConfig);
PartialRuleUpdateSupported updater = (PartialRuleUpdateSupported)
partialRule;
when(updater.partialUpdate(ruleConfig)).thenReturn(true);
- RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(Collections.singleton(partialRule)));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
+ RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(partialRule));
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
(mock, context) ->
when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false),
any(Collection.class),
eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
@@ -149,10 +140,8 @@ class DatabaseRuleConfigurationManagerTest {
ShardingSphereRule otherRule = mock(ShardingSphereRule.class);
when(otherRule.getConfiguration()).thenReturn(mock(RuleConfiguration.class,
withSettings().extraInterfaces(Cloneable.class)));
RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(otherRule));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
ShardingSphereRule rebuiltRule = mock(ShardingSphereRule.class);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
@@ -169,10 +158,8 @@ class DatabaseRuleConfigurationManagerTest {
ShardingSphereRule existingRule = mock(ShardingSphereRule.class);
when(existingRule.getConfiguration()).thenReturn(ruleConfig);
RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(existingRule));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
ShardingSphereRule rebuiltRule = mock(ShardingSphereRule.class);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
@@ -189,13 +176,11 @@ class DatabaseRuleConfigurationManagerTest {
ShardingSphereRule rule = mock(ShardingSphereRule.class);
when(rule.getConfiguration()).thenReturn(ruleConfig);
RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(rule));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
- (mock, context) ->
when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false),
any(Collection.class), eq(metaDataContexts))).thenThrow(new
SQLException("failed")))) {
+ (mock, context) ->
when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false),
any(Collection.class), eq(metaDataContexts))).thenThrow(SQLException.class))) {
assertThrows(SQLException.class, () -> new
DatabaseRuleConfigurationManager(metaDataContexts, mock(),
mock()).refresh(DATABASE_NAME, ruleConfig));
}
}
@@ -208,11 +193,9 @@ class DatabaseRuleConfigurationManagerTest {
PartialRuleUpdateSupported updater = (PartialRuleUpdateSupported)
closableRule;
when(updater.partialUpdate(ruleConfig)).thenReturn(true);
doThrow(Exception.class).when((AutoCloseable) closableRule).close();
- RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(Collections.singleton(closableRule)));
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData()).thenReturn(ruleMetaData);
+ RuleMetaData ruleMetaData = new
RuleMetaData(Collections.singleton(closableRule));
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME)).thenReturn(database);
+
when(metaDataContexts.getMetaData().getDatabase(DATABASE_NAME).getRuleMetaData()).thenReturn(ruleMetaData);
try (
MockedConstruction<MetaDataContextsFactory> ignored =
mockConstruction(MetaDataContextsFactory.class,
(mock, context) ->
when(mock.createByAlterRule(eq(DATABASE_NAME), eq(false),
any(Collection.class),
eq(metaDataContexts))).thenReturn(mock(MetaDataContexts.class)))) {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfigurationTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfigurationTest.java
index 264b98389d4..1e1f9c996ae 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfigurationTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfigurationTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.Properties;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -36,7 +35,7 @@ class YamlProxyServerConfigurationTest {
@Test
void assertSetRulesIgnoresNull() {
YamlProxyServerConfiguration actual = new
YamlProxyServerConfiguration();
- Collection<YamlRuleConfiguration> expectedRules = new
LinkedList<>(Collections.singleton(mock(YamlRuleConfiguration.class)));
+ Collection<YamlRuleConfiguration> expectedRules =
Collections.singleton(mock(YamlRuleConfiguration.class));
actual.setRules(expectedRules);
actual.setRules(null);
assertThat(actual.getRules(), sameInstance(expectedRules));
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
index 199d593bedb..8125cc00138 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
@@ -224,7 +224,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getName()).thenReturn(statementId);
String sql = "INSERT INTO public.t_small (col1, col2) VALUES (?, ?)
RETURNING *, col1 + col2 expr_sum";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
- List<PostgreSQLBinaryColumnType> parameterTypes = new
ArrayList<>(Arrays.asList(PostgreSQLBinaryColumnType.INT4,
PostgreSQLBinaryColumnType.UNSPECIFIED));
+ List<PostgreSQLBinaryColumnType> parameterTypes =
Arrays.asList(PostgreSQLBinaryColumnType.INT4,
PostgreSQLBinaryColumnType.UNSPECIFIED);
SQLStatementContext sqlStatementContext =
mock(InsertStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
ShardingSphereTable table = new ShardingSphereTable("t_small",
@@ -456,7 +456,7 @@ class PostgreSQLComDescribeExecutorTest {
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
SQLStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
- List<PostgreSQLBinaryColumnType> parameterTypes = new
ArrayList<>(Collections.singleton(PostgreSQLBinaryColumnType.INT4));
+ List<PostgreSQLBinaryColumnType> parameterTypes =
Collections.singletonList(PostgreSQLBinaryColumnType.INT4);
List<Integer> parameterIndexes = IntStream.range(0,
sqlStatement.getParameterCount()).boxed().collect(Collectors.toList());
PostgreSQLServerPreparedStatement preparedStatement =
mock(PostgreSQLServerPreparedStatement.class);
when(preparedStatement.describeRows()).thenReturn(Optional.empty(),
Optional.of(PostgreSQLNoDataPacket.getInstance()));
@@ -493,7 +493,7 @@ class PostgreSQLComDescribeExecutorTest {
SQLStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
prepareJDBCBackendConnectionWithParamTypes(sql, new
int[]{Types.INTEGER, Types.SMALLINT}, new String[]{"int4", "int2"});
- List<PostgreSQLBinaryColumnType> parameterTypes = new
ArrayList<>(Arrays.asList(PostgreSQLBinaryColumnType.INT4,
PostgreSQLBinaryColumnType.UNSPECIFIED));
+ List<PostgreSQLBinaryColumnType> parameterTypes =
Arrays.asList(PostgreSQLBinaryColumnType.INT4,
PostgreSQLBinaryColumnType.UNSPECIFIED);
List<Integer> parameterIndexes = IntStream.range(0,
sqlStatement.getParameterCount()).boxed().collect(Collectors.toList());
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
