This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 c6886d0 #7318, remove governance updater (#8680)
c6886d0 is described below
commit c6886d080a8d68b56c91f794d303079fd7caff2a
Author: Zhang Yonglun <[email protected]>
AuthorDate: Thu Dec 17 21:55:54 2020 +0800
#7318, remove governance updater (#8680)
---
.../governance/core/facade/GovernanceFacade.java | 12 -----
.../impl/GovernanceBootstrapInitializer.java | 3 +-
.../proxy/config/ProxyConfigurationUpdater.java | 52 ----------------------
3 files changed, 1 insertion(+), 66 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
index b5363f4..a23020f 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
@@ -97,18 +97,6 @@ public final class GovernanceFacade implements AutoCloseable
{
listenerManager.init();
}
- /**
- * Update configurations.
- *
- * @param dataSourceConfigMap schema data source configuration map
- * @param schemaRuleMap schema rule map
- */
- public void updateConfigurations(final Map<String, Map<String,
DataSourceConfiguration>> dataSourceConfigMap, final Map<String,
Collection<RuleConfiguration>> schemaRuleMap) {
- for (Entry<String, Map<String, DataSourceConfiguration>> entry :
dataSourceConfigMap.entrySet()) {
- configCenter.persistConfigurations(entry.getKey(),
dataSourceConfigMap.get(entry.getKey()), schemaRuleMap.get(entry.getKey()),
true);
- }
- }
-
@Override
public void close() {
repositoryFacade.close();
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
index 96d2f9f..62087a0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
@@ -33,7 +33,6 @@ import org.apache.shardingsphere.infra.lock.LockContext;
import org.apache.shardingsphere.infra.lock.LockStrategyType;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
-import org.apache.shardingsphere.proxy.config.ProxyConfigurationUpdater;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
import
org.apache.shardingsphere.proxy.config.util.DataSourceParameterConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
@@ -52,7 +51,7 @@ import java.util.stream.Collectors;
*/
public final class GovernanceBootstrapInitializer extends
AbstractBootstrapInitializer {
- private final GovernanceFacade governanceFacade =
ProxyConfigurationUpdater.getGovernanceFacade();
+ private final GovernanceFacade governanceFacade = new GovernanceFacade();
@Override
protected ProxyConfiguration getProxyConfiguration(final
YamlProxyConfiguration yamlConfig) {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationUpdater.java
deleted file mode 100644
index 62fdac6..0000000
---
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationUpdater.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.proxy.config;
-
-import org.apache.shardingsphere.governance.core.facade.GovernanceFacade;
-import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Proxy configuration updater.
- */
-public final class ProxyConfigurationUpdater {
-
- private static final GovernanceFacade GOVERNANCE_FACADE = new
GovernanceFacade();
-
- /**
- * Get governance facade.
- *
- * @return governance facade
- */
- public static GovernanceFacade getGovernanceFacade() {
- return GOVERNANCE_FACADE;
- }
-
- /**
- * Update configurations.
- *
- * @param dataSourceConfigMap data source config map
- * @param schemaRuleMap schema rule map
- */
- public static void update(final Map<String, Map<String,
DataSourceConfiguration>> dataSourceConfigMap, final Map<String,
Collection<RuleConfiguration>> schemaRuleMap) {
- GOVERNANCE_FACADE.updateConfigurations(dataSourceConfigMap,
schemaRuleMap);
- }
-}
