[shardingsphere] branch master updated: Remove governance related from StandardBootstrapInitializer (#11501)

[wuweijie]

This is an automated email from the ASF dual-hosted git repository.

wuweijie 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 e332d94  Remove governance related from StandardBootstrapInitializer 
(#11501)
e332d94 is described below

commit e332d94e817cccd07b2d6ea2e78a206654872d85
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Sun Jul 25 18:02:45 2021 +0800

    Remove governance related from StandardBootstrapInitializer (#11501)
    
    * Remove governance related from StandardBootstrapInitializer
    
    * Fix test cases
---
 .../initializer/impl/StandardBootstrapInitializer.java | 18 ++----------------
 .../impl/StandardBootstrapInitializerTest.java         |  2 --
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
index f92afd9..c2b4b4d 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
@@ -17,21 +17,14 @@
 
 package org.apache.shardingsphere.proxy.initializer.impl;
 
-import 
org.apache.shardingsphere.governance.context.transaction.GovernanceTransactionContexts;
-import 
org.apache.shardingsphere.governance.core.yaml.pojo.YamlGovernanceConfiguration;
-import 
org.apache.shardingsphere.governance.core.yaml.swapper.GovernanceConfigurationYamlSwapper;
 import 
org.apache.shardingsphere.infra.config.persist.repository.ConfigCenterRepository;
 import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
 import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
 import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.swapper.YamlProxyConfigurationSwapper;
-import org.apache.shardingsphere.scaling.core.api.ScalingWorker;
 import org.apache.shardingsphere.scaling.core.config.ScalingContext;
-import org.apache.shardingsphere.scaling.core.config.ServerConfiguration;
 import org.apache.shardingsphere.transaction.context.TransactionContexts;
 
-import java.util.Optional;
-
 /**
  * Standard bootstrap initializer.
  */
@@ -56,18 +49,11 @@ public final class StandardBootstrapInitializer extends 
AbstractBootstrapInitial
     
     @Override
     protected TransactionContexts decorateTransactionContexts(final 
TransactionContexts transactionContexts, final String xaTransactionMangerType) {
-        return new GovernanceTransactionContexts(transactionContexts, 
xaTransactionMangerType);
+        return transactionContexts;
     }
     
     @Override
     protected void initScalingWorker(final YamlProxyConfiguration yamlConfig) {
-        Optional<ServerConfiguration> scalingConfig = 
getScalingConfiguration(yamlConfig);
-        scalingConfig.ifPresent(optional -> 
initScaling(yamlConfig.getServerConfiguration().getGovernance(), optional));
-    }
-    
-    private void initScaling(final YamlGovernanceConfiguration 
governanceConfig, final ServerConfiguration scalingConfig) {
-        scalingConfig.setGovernanceConfig(new 
GovernanceConfigurationYamlSwapper().swapToObject(governanceConfig));
-        ScalingContext.getInstance().init(scalingConfig);
-        ScalingWorker.init();
+        getScalingConfiguration(yamlConfig).ifPresent(optional -> 
ScalingContext.getInstance().init(optional));
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
index edbd38b..c1596dc 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.proxy.initializer.impl;
 
 import 
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration;
 import 
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
-import 
org.apache.shardingsphere.governance.context.transaction.GovernanceTransactionContexts;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;
 import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
 import 
org.apache.shardingsphere.infra.config.persist.repository.ConfigCenterRepository;
@@ -200,7 +199,6 @@ public final class StandardBootstrapInitializerTest extends 
AbstractBootstrapIni
         TransactionContexts transactionContexts = 
mock(TransactionContexts.class);
         TransactionContexts actualTransactionContexts = 
getInitializer().decorateTransactionContexts(transactionContexts, 
XATransactionManagerType.ATOMIKOS.getType());
         assertNotNull(actualTransactionContexts);
-        assertThat(actualTransactionContexts, 
instanceOf(GovernanceTransactionContexts.class));
         assertThat(actualTransactionContexts.getEngines(), 
is(transactionContexts.getEngines()));
         
assertThat(actualTransactionContexts.getDefaultTransactionManagerEngine(), 
is(transactionContexts.getDefaultTransactionManagerEngine()));
     }