(shardingsphere) branch master updated: Refactor BootstrapInitializer (#31932)

[jianglongtao]

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 5c2eaf439af Refactor BootstrapInitializer (#31932)
5c2eaf439af is described below

commit 5c2eaf439afc66d58dd0da01c2a7996f2f850604
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jun 30 18:51:15 2024 +0800

    Refactor BootstrapInitializer (#31932)
---
 .../proxy/initializer/BootstrapInitializer.java              | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git 
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
 
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
index c2e94efd9bd..428bd797cf3 100644
--- 
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
+++ 
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
@@ -17,8 +17,6 @@
 
 package org.apache.shardingsphere.proxy.initializer;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
 import 
org.apache.shardingsphere.infra.instance.metadata.InstanceMetaDataBuilder;
@@ -39,8 +37,6 @@ import java.sql.SQLException;
 /**
  * Bootstrap initializer.
  */
-@RequiredArgsConstructor
-@Slf4j
 public final class BootstrapInitializer {
     
     /**
@@ -60,13 +56,9 @@ public final class BootstrapInitializer {
     }
     
     private ContextManager createContextManager(final ProxyConfiguration 
proxyConfig, final ModeConfiguration modeConfig, final int port, final boolean 
force) throws SQLException {
+        InstanceMetaData instanceMetaData = 
TypedSPILoader.getService(InstanceMetaDataBuilder.class, "Proxy").build(port);
         ContextManagerBuilderParameter param = new 
ContextManagerBuilderParameter(modeConfig, 
proxyConfig.getDatabaseConfigurations(), 
proxyConfig.getGlobalConfiguration().getDataSources(),
-                proxyConfig.getGlobalConfiguration().getRules(), 
proxyConfig.getGlobalConfiguration().getProperties(), 
proxyConfig.getGlobalConfiguration().getLabels(),
-                createInstanceMetaData(port), force);
+                proxyConfig.getGlobalConfiguration().getRules(), 
proxyConfig.getGlobalConfiguration().getProperties(), 
proxyConfig.getGlobalConfiguration().getLabels(), instanceMetaData, force);
         return TypedSPILoader.getService(ContextManagerBuilder.class, null == 
modeConfig ? null : modeConfig.getType()).build(param, new EventBusContext());
     }
-    
-    private InstanceMetaData createInstanceMetaData(final int port) {
-        return TypedSPILoader.getService(InstanceMetaDataBuilder.class, 
"Proxy").build(port);
-    }
 }