This is an automated email from the ASF dual-hosted git repository.
kimmking 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 f5f3d02 Minor refactor of GovernanceSchemaContexts (#7156)
f5f3d02 is described below
commit f5f3d0228c9c3b84d65631c5aabfb8d569fc0d54
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 31 01:02:17 2020 +0800
Minor refactor of GovernanceSchemaContexts (#7156)
* refactor GovernanceSchemaContexts.createDataSourcesMap
* refactor ProxyGovernanceSchemaContexts
* refactor ProxyGovernanceSchemaContexts
* refactor GovernanceSchemaContexts
* fix checkstyle
---
.../core/schema/GovernanceSchemaContexts.java | 6 ++---
.../fixture/GovernanceSchemaContextsFixture.java | 8 +++----
.../schema/JDBCGovernanceSchemaContexts.java | 13 +++++------
.../internal/util/DataSourceConverter.java | 6 ++---
.../schema/JDBCGovernanceSchemaContextsTest.java | 4 ++--
.../proxy/config/util/DataSourceConverter.java | 2 +-
.../schema/ProxyGovernanceSchemaContexts.java | 27 +++++++++++-----------
7 files changed, 32 insertions(+), 34 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java
index 85f751e..695a670 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java
@@ -333,9 +333,9 @@ public abstract class GovernanceSchemaContexts implements
SchemaContexts {
return result;
}
- protected abstract Map<String, DataSource>
getAddedDataSources(SchemaContext oldSchemaContext, Map<String,
DataSourceConfiguration> newDataSources);
+ protected abstract Map<String, DataSource>
getAddedDataSources(SchemaContext oldSchemaContext, Map<String,
DataSourceConfiguration> newDataSourceConfigs);
- protected abstract Map<String, DataSource>
getModifiedDataSources(SchemaContext oldSchemaContext, Map<String,
DataSourceConfiguration> newDataSources);
+ protected abstract Map<String, DataSource>
getModifiedDataSources(SchemaContext oldSchemaContext, Map<String,
DataSourceConfiguration> newDataSourceConfigs);
- protected abstract Map<String, Map<String, DataSource>>
createDataSourcesMap(Map<String, Map<String, DataSourceConfiguration>>
dataSourcesMap);
+ protected abstract Map<String, Map<String, DataSource>>
createDataSourcesMap(Map<String, Map<String, DataSourceConfiguration>>
dataSourcesConfigs);
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java
index 2d266ec..0f329bb 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java
@@ -41,12 +41,12 @@ public final class GovernanceSchemaContextsFixture extends
GovernanceSchemaConte
}
@Override
- protected Map<String, DataSource> getAddedDataSources(final SchemaContext
oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSources) {
+ protected Map<String, DataSource> getAddedDataSources(final SchemaContext
oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSourceConfigs) {
return Collections.singletonMap("ds_2",
buildDataSource(getDataSourceParameter()));
}
@Override
- protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSources) {
+ protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSourceConfigs) {
return Collections.singletonMap("ds_1",
buildDataSource(getDataSourceParameter()));
}
@@ -59,8 +59,8 @@ public final class GovernanceSchemaContextsFixture extends
GovernanceSchemaConte
}
@Override
- protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesMap) {
- Map<String, Map<String, DataSourceParameter>> dataSourceParametersMap
= createDataSourceParametersMap(dataSourcesMap);
+ protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesConfigs) {
+ Map<String, Map<String, DataSourceParameter>> dataSourceParametersMap
= createDataSourceParametersMap(dataSourcesConfigs);
Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(dataSourceParametersMap.size(), 1);
for (Entry<String, Map<String, DataSourceParameter>> entry :
dataSourceParametersMap.entrySet()) {
result.put(entry.getKey(), createDataSources(entry.getValue()));
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContexts.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContexts.java
index bad3438..1a19622 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContexts.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContexts.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.driver.governance.internal.schema;
import com.google.common.collect.Maps;
-import org.apache.commons.collections4.map.LinkedMap;
import
org.apache.shardingsphere.driver.governance.internal.util.DataSourceConverter;
import org.apache.shardingsphere.governance.core.facade.GovernanceFacade;
import
org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts;
@@ -49,9 +48,9 @@ public final class JDBCGovernanceSchemaContexts extends
GovernanceSchemaContexts
}
@Override
- protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSources) {
- Map<String, DataSourceConfiguration> modifiedDataSourceConfigs =
-
newDataSources.entrySet().stream().filter(this::isModifiedDataSource).collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue, (key, repeatKey) -> key, LinkedHashMap::new));
+ protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSourceConfigs) {
+ Map<String, DataSourceConfiguration> modifiedDataSourceConfigs =
newDataSourceConfigs.entrySet().stream()
+
.filter(this::isModifiedDataSource).collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue, (key, repeatKey) -> key, LinkedHashMap::new));
return DataSourceConverter.getDataSourceMap(modifiedDataSourceConfigs);
}
@@ -61,9 +60,9 @@ public final class JDBCGovernanceSchemaContexts extends
GovernanceSchemaContexts
}
@Override
- protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesMap) {
- Map<String, Map<String, DataSource>> result = new
LinkedMap<>(dataSourcesMap.size(), 1);
- for (Entry<String, Map<String, DataSourceConfiguration>> entry :
dataSourcesMap.entrySet()) {
+ protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesConfigs) {
+ Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(dataSourcesConfigs.size(), 1);
+ for (Entry<String, Map<String, DataSourceConfiguration>> entry :
dataSourcesConfigs.entrySet()) {
result.put(entry.getKey(),
DataSourceConverter.getDataSourceMap(entry.getValue()));
}
return result;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/DataSourceConverter.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/DataSourceConverter.java
index dfd995b..f253161 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/DataSourceConverter.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/DataSourceConverter.java
@@ -36,11 +36,11 @@ public final class DataSourceConverter {
/**
* Get data source map.
*
- * @param dataSourceConfigurationMap data source configuration map
+ * @param dataSourceConfigMap data source configuration map
* @return data source map
*/
- public static Map<String, DataSource> getDataSourceMap(final Map<String,
DataSourceConfiguration> dataSourceConfigurationMap) {
- return
dataSourceConfigurationMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> entry.getValue().createDataSource(), (key, repeatKey) -> key,
LinkedHashMap::new));
+ public static Map<String, DataSource> getDataSourceMap(final Map<String,
DataSourceConfiguration> dataSourceConfigMap) {
+ return
dataSourceConfigMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> entry.getValue().createDataSource(), (key, repeatKey) -> key,
LinkedHashMap::new));
}
/**
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContextsTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContextsTest.java
index 74c4a58..ec5c6fe 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContextsTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContextsTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.governance.internal.schema;
-import org.apache.commons.collections4.map.LinkedMap;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.driver.governance.internal.util.DataSourceConverter;
import
org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent;
@@ -40,6 +39,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import javax.sql.DataSource;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
@@ -61,7 +61,7 @@ public final class JDBCGovernanceSchemaContextsTest {
public void setUp() {
when(registryCenter.loadDisabledDataSources()).thenReturn(Collections.emptyList());
when(facade.getRegistryCenter()).thenReturn(registryCenter);
- schemaContexts = new JDBCGovernanceSchemaContexts(new
StandardSchemaContexts(new LinkedMap<>(), new Authentication(),
+ schemaContexts = new JDBCGovernanceSchemaContexts(new
StandardSchemaContexts(new LinkedHashMap<>(), new Authentication(),
new ConfigurationProperties(new Properties()), new
H2DatabaseType()), facade);
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverter.java
b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverter.java
index 1bf9e68..5a3b6ce 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverter.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverter.java
@@ -45,7 +45,7 @@ public final class DataSourceConverter {
*/
public static Map<String, DataSourceParameter>
getDataSourceParameterMap(final Map<String, DataSourceConfiguration>
dataSourceConfigurationMap) {
return dataSourceConfigurationMap.entrySet().stream()
- .collect(Collectors.toMap(Entry::getKey, entry ->
createDataSourceParameter(entry.getValue()), (oldVal, currVal) -> oldVal,
LinkedHashMap::new));
+ .collect(Collectors.toMap(Entry::getKey, entry ->
createDataSourceParameter(entry.getValue()), (oldValue, currentValue) ->
oldValue, LinkedHashMap::new));
}
/**
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/ProxyGovernanceSchemaContexts.java
b/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/ProxyGovernanceSchemaContexts.java
index 8a1fb38..6ade69c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/ProxyGovernanceSchemaContexts.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/ProxyGovernanceSchemaContexts.java
@@ -52,8 +52,8 @@ public final class ProxyGovernanceSchemaContexts extends
GovernanceSchemaContext
}
@Override
- protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSources) {
- Map<String, DataSourceParameter> newDataSourceParameters =
DataSourceConverter.getDataSourceParameterMap(newDataSources);
+ protected Map<String, DataSource> getModifiedDataSources(final
SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration>
newDataSourceConfigs) {
+ Map<String, DataSourceParameter> newDataSourceParameters =
DataSourceConverter.getDataSourceParameterMap(newDataSourceConfigs);
Map<String, DataSourceParameter> parameters = new
LinkedHashMap<>(newDataSourceParameters.size(), 1);
for (Entry<String, DataSourceParameter> entry :
newDataSourceParameters.entrySet()) {
if
(isModifiedDataSource(oldSchemaContext.getSchema().getDataSources(),
entry.getKey(), entry.getValue())) {
@@ -68,27 +68,26 @@ public final class ProxyGovernanceSchemaContexts extends
GovernanceSchemaContext
}
@Override
- protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesMap) {
- Map<String, Map<String, DataSourceParameter>> dataSourceParametersMap
= createDataSourceParametersMap(dataSourcesMap);
- Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(dataSourceParametersMap.size(), 1);
- for (Entry<String, Map<String, DataSourceParameter>> entry :
dataSourceParametersMap.entrySet()) {
+ protected Map<String, Map<String, DataSource>> createDataSourcesMap(final
Map<String, Map<String, DataSourceConfiguration>> dataSourcesConfigs) {
+ Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(dataSourcesConfigs.size(), 1);
+ for (Entry<String, Map<String, DataSourceParameter>> entry :
createDataSourceParametersMap(dataSourcesConfigs).entrySet()) {
result.put(entry.getKey(), createDataSources(entry.getValue()));
}
return result;
}
- private Map<String, DataSource> createDataSources(final Map<String,
DataSourceParameter> dataSourceParameters) {
- Map<String, DataSource> result = new
LinkedHashMap<>(dataSourceParameters.size(), 1);
- for (Entry<String, DataSourceParameter> entry:
dataSourceParameters.entrySet()) {
- result.put(entry.getKey(),
backendDataSourceFactory.build(entry.getKey(), entry.getValue()));
+ private Map<String, Map<String, DataSourceParameter>>
createDataSourceParametersMap(final Map<String, Map<String,
DataSourceConfiguration>> dataSourcesConfigs) {
+ Map<String, Map<String, DataSourceParameter>> result = new
LinkedHashMap<>(dataSourcesConfigs.size(), 1);
+ for (Entry<String, Map<String, DataSourceConfiguration>> entry :
dataSourcesConfigs.entrySet()) {
+ result.put(entry.getKey(),
DataSourceConverter.getDataSourceParameterMap(entry.getValue()));
}
return result;
}
- private Map<String, Map<String, DataSourceParameter>>
createDataSourceParametersMap(final Map<String, Map<String,
DataSourceConfiguration>> dataSources) {
- Map<String, Map<String, DataSourceParameter>> result = new
LinkedHashMap<>(dataSources.size(), 1);
- for (Entry<String, Map<String, DataSourceConfiguration>> entry :
dataSources.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceParameterMap(entry.getValue()));
+ private Map<String, DataSource> createDataSources(final Map<String,
DataSourceParameter> dataSourceParameters) {
+ Map<String, DataSource> result = new
LinkedHashMap<>(dataSourceParameters.size(), 1);
+ for (Entry<String, DataSourceParameter> entry:
dataSourceParameters.entrySet()) {
+ result.put(entry.getKey(),
backendDataSourceFactory.build(entry.getKey(), entry.getValue()));
}
return result;
}
