Rename ContextManagerAware.setContextManager() (#31219)

apache · May 12, 2024 · 3018c65 · 3018c65
1 parent d6e24f0
commit 3018c65
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerAware.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerAware.java
@@ -23,9 +23,9 @@
 public interface ContextManagerAware {
 
     /**
-     * Set context manager aware.
+     * Set context manager.
      *
      * @param contextManager context manager
      */
-    void setContextManagerAware(ContextManager contextManager);
+    void setContextManager(ContextManager contextManager);
 }
diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -75,7 +75,7 @@ private InstanceContext buildInstanceContext(final RegistryCenter registryCenter
     }
 
     private void setContextManagerAware(final ContextManager contextManager) {
-        ((ContextManagerAware) contextManager.getInstanceContext().getModeContextManager()).setContextManagerAware(contextManager);
+        ((ContextManagerAware) contextManager.getInstanceContext().getModeContextManager()).setContextManager(contextManager);
     }
 
     private void registerOnline(final RegistryCenter registryCenter, final ContextManagerBuilderParameter param, final ContextManager contextManager) {

diff --git a/...c/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java b/...c/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.mode.manager.cluster;
 
+import lombok.Setter;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
@@ -42,6 +43,7 @@
 /**
  * Cluster mode context manager.
  */
+@Setter
 public final class ClusterModeContextManager implements ModeContextManager, ContextManagerAware {
 
     private ContextManager contextManager;
@@ -154,9 +156,4 @@ public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRule
     public void alterProperties(final Properties props) {
         contextManager.getMetaDataContexts().getPersistService().getPropsService().persist(props);
     }
-
-    @Override
-    public void setContextManagerAware(final ContextManager contextManager) {
-        this.contextManager = contextManager;
-    }
 }
diff --git a/...va/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/...va/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -67,7 +67,7 @@ private void registerSubscriber(final ContextManager contextManager) {
     }
 
     private void setContextManagerAware(final ContextManager contextManager) {
-        ((StandaloneModeContextManager) contextManager.getInstanceContext().getModeContextManager()).setContextManagerAware(contextManager);
+        ((StandaloneModeContextManager) contextManager.getInstanceContext().getModeContextManager()).setContextManager(contextManager);
     }
 
     @Override

diff --git a/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java b/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -18,6 +18,7 @@
 package org.apache.shardingsphere.mode.manager.standalone;
 
 import com.google.common.base.Strings;
+import lombok.Setter;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.connection.refresher.util.TableRefreshUtils;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
@@ -59,6 +60,7 @@
 /**
  * Standalone mode context manager.
  */
+@Setter
 public final class StandaloneModeContextManager implements ModeContextManager, ContextManagerAware {
 
     private final RuleConfigurationEventBuilder ruleConfigurationEventBuilder = new RuleConfigurationEventBuilder();
@@ -318,9 +320,4 @@ public void alterProperties(final Properties props) {
     private void clearServiceCache() {
         OrderedServicesCache.clearCache();
     }
-
-    @Override
-    public void setContextManagerAware(final ContextManager contextManager) {
-        this.contextManager = contextManager;
-    }
 }
diff --git a/...ardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java b/...ardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
@@ -112,7 +112,7 @@ private ContextManager mockContextManager() {
         ContextManager result = new ContextManager(new MetaDataContexts(metaDataPersistService, new ShardingSphereMetaData()),
                 new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), mock(WorkerIdGenerator.class),
                         new ModeConfiguration("Standalone", null), standaloneModeContextManager, mock(LockContext.class), new EventBusContext()));
-        standaloneModeContextManager.setContextManagerAware(result);
+        standaloneModeContextManager.setContextManager(result);
         return result;
     }
 }