This is an automated email from the ASF dual-hosted git repository.
totalo 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 590d367177a Rename ClusterContextManagerBuilder to
ContextManagerCoordinator (#21984)
590d367177a is described below
commit 590d367177a8ced2b044f88a6afb57b2f9455fa0
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Nov 7 12:59:04 2022 +0800
Rename ClusterContextManagerBuilder to ContextManagerCoordinator (#21984)
---
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 4 ++--
...textManagerCoordinator.java => ContextManagerCoordinator.java} | 6 +++---
...gerCoordinatorTest.java => ContextManagerCoordinatorTest.java} | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 5db88afa790..27ac8cef90e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.ClusterContextManagerCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.ContextManagerCoordinator;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.workerid.generator.ClusterWorkerIdGenerator;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -87,7 +87,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
final ContextManagerBuilderParameter
parameter, final ContextManager contextManager) {
contextManager.getInstanceContext().getInstance().setLabels(parameter.getLabels());
contextManager.getInstanceContext().getAllClusterInstances().addAll(registryCenter.getComputeNodeStatusService().loadAllComputeNodeInstances());
- new ClusterContextManagerCoordinator(persistService, registryCenter,
contextManager);
+ new ContextManagerCoordinator(persistService, registryCenter,
contextManager);
registryCenter.onlineInstance(contextManager.getInstanceContext().getInstance());
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinator.java
similarity index 98%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinator.java
index 889f30c62a4..72cf8d595ae 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinator.java
@@ -75,10 +75,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Cluster context manager coordinator.
+ * Context manager coordinator.
*/
@SuppressWarnings("UnstableApiUsage")
-public final class ClusterContextManagerCoordinator {
+public final class ContextManagerCoordinator {
private final MetaDataPersistService persistService;
@@ -86,7 +86,7 @@ public final class ClusterContextManagerCoordinator {
private final ContextManager contextManager;
- public ClusterContextManagerCoordinator(final MetaDataPersistService
persistService, final RegistryCenter registryCenter, final ContextManager
contextManager) {
+ public ContextManagerCoordinator(final MetaDataPersistService
persistService, final RegistryCenter registryCenter, final ContextManager
contextManager) {
this.persistService = persistService;
this.registryCenter = registryCenter;
this.contextManager = contextManager;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinatorTest.java
similarity index 98%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinatorTest.java
index 9771c988729..16792cfeacb 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ContextManagerCoordinatorTest.java
@@ -115,9 +115,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class ClusterContextManagerCoordinatorTest {
+public final class ContextManagerCoordinatorTest {
- private ClusterContextManagerCoordinator coordinator;
+ private ContextManagerCoordinator coordinator;
private ContextManager contextManager;
@@ -135,7 +135,7 @@ public final class ClusterContextManagerCoordinatorTest {
contextManager = new
ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
contextManager.renewMetaDataContexts(new
MetaDataContexts(contextManager.getMetaDataContexts().getPersistService(), new
ShardingSphereMetaData(createDatabases(),
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new
ConfigurationProperties(new Properties()))));
- coordinator = new ClusterContextManagerCoordinator(persistService, new
RegistryCenter(mock(ClusterPersistRepository.class),
+ coordinator = new ContextManagerCoordinator(persistService, new
RegistryCenter(mock(ClusterPersistRepository.class),
new EventBusContext(), mock(ProxyInstanceMetaData.class),
null), contextManager);
}
@@ -161,7 +161,7 @@ public final class ClusterContextManagerCoordinatorTest {
}
@Test
- public void assertRenewForDatabaseAdded() throws SQLException {
+ public void assertRenewForDatabaseAdded() {
when(persistService.getDataSourceService().load("db_added")).thenReturn(createDataSourcePropertiesMap());
when(persistService.getDatabaseRulePersistService().load("db_added")).thenReturn(Collections.emptyList());
coordinator.renew(new DatabaseAddedEvent("db_added"));
