You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/06/29 12:51:15 UTC
[shardingsphere] branch master updated: Remove useless code (#26695)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 849f7b98c41 Remove useless code (#26695)
849f7b98c41 is described below
commit 849f7b98c415ad5394e22fee96f026a850b617e0
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Thu Jun 29 20:51:07 2023 +0800
Remove useless code (#26695)
---
.../ConfigurationChangedSubscriberTest.java | 33 ----------------------
1 file changed, 33 deletions(-)
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 778e88cae67..29c77c633a0 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
@@ -31,7 +31,6 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -62,7 +61,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import javax.sql.DataSource;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
@@ -172,35 +170,4 @@ class ConfigurationChangedSubscriberTest {
subscriber.renew(new PropertiesChangedEvent(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_SHOW.getKey(), Boolean.TRUE.toString()))));
assertThat(contextManager.getMetaDataContexts().getMetaData().getProps().getProps().getProperty(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.TRUE.toString()));
}
-
- private Map<String, DataSource> initContextManager() {
- Map<String, DataSource> result = getDataSourceMap();
- ShardingSphereResourceMetaData resourceMetaData = new ShardingSphereResourceMetaData("sharding_db", result);
- ShardingSphereDatabase database = new ShardingSphereDatabase("db", new MySQLDatabaseType(), resourceMetaData, mock(ShardingSphereRuleMetaData.class), Collections.emptyMap());
- contextManager.getMetaDataContexts().getMetaData().getDatabases().put("db", database);
- return result;
- }
-
- private Map<String, DataSource> getDataSourceMap() {
- Map<String, DataSource> result = new LinkedHashMap<>(3, 1F);
- result.put("ds_0", new MockedDataSource());
- result.put("ds_1", new MockedDataSource());
- result.put("db", new MockedDataSource());
- return result;
- }
-
- private Map<String, DataSourceProperties> getVersionChangedDataSourcePropertiesMap() {
- Map<String, DataSourceProperties> result = new LinkedHashMap<>(3, 1F);
- result.put("primary_ds", DataSourcePropertiesCreator.create(new MockedDataSource()));
- result.put("ds_0", DataSourcePropertiesCreator.create(new MockedDataSource()));
- result.put("ds_1", DataSourcePropertiesCreator.create(getChangedDataSource()));
- return result;
- }
-
- private MockedDataSource getChangedDataSource() {
- MockedDataSource result = new MockedDataSource();
- result.setMaxPoolSize(5);
- result.setUsername("username");
- return result;
- }
}