Refactor GovernanceSchemaContexts.getAddedDataSources

shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.governance.core.schema;
 
+import com.google.common.collect.Maps;
 import com.google.common.eventbus.Subscribe;
 import org.apache.shardingsphere.governance.core.common.event.auth.AuthenticationChangedEvent;
 import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent;
@@ -332,7 +333,10 @@ public abstract class GovernanceSchemaContexts implements SchemaContexts {
         return result;
     }
     
-    protected abstract Map<String, DataSource> getAddedDataSources(SchemaContext oldSchemaContext, Map<String, DataSourceConfiguration> newDataSourceConfigs);
+    private Map<String, DataSource> getAddedDataSources(final SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSources) {
+        Map<String, DataSourceConfiguration> newDataSourceConfigs = Maps.filterKeys(newDataSources, each -> !oldSchemaContext.getSchema().getDataSources().containsKey(each));
+        return DataSourceConverter.getDataSourceMap(newDataSourceConfigs);
+    }
     
     protected abstract Map<String, DataSource> getModifiedDataSources(SchemaContext oldSchemaContext, Map<String, DataSourceConfiguration> newDataSourceConfigs);
     

shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/schema/JDBCGovernanceSchemaContexts.java

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.driver.governance.internal.schema;
 
-import com.google.common.collect.Maps;
 import org.apache.shardingsphere.governance.core.facade.GovernanceFacade;
 import org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts;
 import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -41,12 +40,6 @@ public final class JDBCGovernanceSchemaContexts extends GovernanceSchemaContexts
         super(schemaContexts, governanceFacade);
     }
     
-    @Override
-    protected Map<String, DataSource> getAddedDataSources(final SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSources) {
-        Map<String, DataSourceConfiguration> newDataSourceConfigs = Maps.filterKeys(newDataSources, each -> !oldSchemaContext.getSchema().getDataSources().containsKey(each));
-        return DataSourceConverter.getDataSourceMap(newDataSourceConfigs);
-    }
-    
     @Override
     protected Map<String, DataSource> getModifiedDataSources(final SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSourceConfigs) {
         Map<String, DataSourceConfiguration> modifiedDataSourceConfigs = newDataSourceConfigs.entrySet().stream()

shardingsphere-proxy/shardingsphere-proxy-governance/src/main/java/org/apache/shardingsphere/proxy/governance/schema/ProxyGovernanceSchemaContexts.java

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.proxy.governance.schema;
 
-import com.google.common.collect.Maps;
 import org.apache.shardingsphere.governance.core.facade.GovernanceFacade;
 import org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts;
 import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -45,12 +44,6 @@ public final class ProxyGovernanceSchemaContexts extends GovernanceSchemaContext
         backendDataSourceFactory = JDBCRawBackendDataSourceFactory.getInstance();
     }
     
-    @Override
-    protected Map<String, DataSource> getAddedDataSources(final SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSources) {
-        Map<String, DataSourceConfiguration> newDataSourceConfigs = Maps.filterKeys(newDataSources, each -> !oldSchemaContext.getSchema().getDataSources().containsKey(each));
-        return createDataSources(DataSourceConverter.getDataSourceParameterMap(newDataSourceConfigs));
-    }
-    
     @Override
     protected Map<String, DataSource> getModifiedDataSources(final SchemaContext oldSchemaContext, final Map<String, DataSourceConfiguration> newDataSourceConfigs) {
         Map<String, DataSourceParameter> newDataSourceParameters = DataSourceConverter.getDataSourceParameterMap(newDataSourceConfigs);