You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by do...@apache.org on 2021/04/23 12:15:42 UTC
[shardingsphere] branch master updated: Merge
GovernanceListenerManager and RegistryListenerManager (#10160)
This is an automated email from the ASF dual-hosted git repository.
dongzonglei 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 50501eb Merge GovernanceListenerManager and RegistryListenerManager (#10160)
50501eb is described below
commit 50501eb93f32e830af9d5c926e73cd0dddaa9d09
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Apr 23 20:15:04 2021 +0800
Merge GovernanceListenerManager and RegistryListenerManager (#10160)
* Rename RegistryListenerManager.userChangedListener
* Merge GovernanceListenerManager and RegistryListenerManager
* revert dependency
---
.../governance/core/facade/GovernanceFacade.java | 11 +++--
.../facade/listener/GovernanceListenerManager.java | 42 -------------------
.../registry/listener/RegistryListenerManager.java | 6 +--
.../core/facade/GovernanceFacadeTest.java | 8 ++--
.../listener/GovernanceListenerManagerTest.java | 48 ----------------------
5 files changed, 12 insertions(+), 103 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 230fa7a..0378e16 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
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.governance.core.facade;
import lombok.Getter;
-import org.apache.shardingsphere.governance.core.facade.listener.GovernanceListenerManager;
import org.apache.shardingsphere.governance.core.facade.repository.GovernanceRepositoryFacade;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
+import org.apache.shardingsphere.governance.core.registry.listener.RegistryListenerManager;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -45,7 +45,7 @@ public final class GovernanceFacade implements AutoCloseable {
@Getter
private RegistryCenter registryCenter;
- private GovernanceListenerManager listenerManager;
+ private RegistryListenerManager listenerManager;
/**
* Initialize governance facade.
@@ -57,9 +57,8 @@ public final class GovernanceFacade implements AutoCloseable {
isOverwrite = config.isOverwrite();
repositoryFacade = new GovernanceRepositoryFacade(config);
registryCenter = new RegistryCenter(repositoryFacade.getRegistryRepository());
- listenerManager = new GovernanceListenerManager(repositoryFacade.getRegistryRepository(),
- schemaNames.isEmpty() ? registryCenter.getAllSchemaNames()
- : Stream.of(registryCenter.getAllSchemaNames(), schemaNames).flatMap(Collection::stream).distinct().collect(Collectors.toList()));
+ listenerManager = new RegistryListenerManager(repositoryFacade.getRegistryRepository(), schemaNames.isEmpty()
+ ? registryCenter.getAllSchemaNames() : Stream.of(registryCenter.getAllSchemaNames(), schemaNames).flatMap(Collection::stream).distinct().collect(Collectors.toList()));
}
/**
@@ -86,7 +85,7 @@ public final class GovernanceFacade implements AutoCloseable {
registryCenter.persistInstanceOnline();
registryCenter.persistDataNodes();
registryCenter.persistPrimaryNodes();
- listenerManager.init();
+ listenerManager.initListeners();
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManager.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManager.java
deleted file mode 100644
index 4b7ba76..0000000
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManager.java
+++ /dev/null
@@ -1,42 +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.governance.core.facade.listener;
-
-import org.apache.shardingsphere.governance.core.registry.listener.RegistryListenerManager;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
-
-import java.util.Collection;
-
-/**
- * Governance listener manager.
- */
-public final class GovernanceListenerManager {
-
- private final RegistryListenerManager registryListenerManager;
-
- public GovernanceListenerManager(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
- registryListenerManager = new RegistryListenerManager(registryRepository, schemaNames);
- }
-
- /**
- * Initialize all governance listeners.
- */
- public void init() {
- registryListenerManager.initListeners();
- }
-}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
index 29ace4a..1455e2f 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
@@ -38,7 +38,7 @@ public final class RegistryListenerManager {
private final PropertiesChangedListener propertiesChangedListener;
- private final UserChangedListener authenticationChangedListener;
+ private final UserChangedListener userChangedListener;
private final PrivilegeNodeChangedListener privilegeNodeChangedListener;
@@ -48,7 +48,7 @@ public final class RegistryListenerManager {
lockChangedListener = new LockChangedListener(registryRepository);
metaDataListener = new MetaDataListener(registryRepository, schemaNames);
propertiesChangedListener = new PropertiesChangedListener(registryRepository);
- authenticationChangedListener = new UserChangedListener(registryRepository);
+ userChangedListener = new UserChangedListener(registryRepository);
privilegeNodeChangedListener = new PrivilegeNodeChangedListener(registryRepository);
}
@@ -61,7 +61,7 @@ public final class RegistryListenerManager {
lockChangedListener.watch(Type.ADDED, Type.DELETED);
metaDataListener.watch();
propertiesChangedListener.watch(Type.UPDATED);
- authenticationChangedListener.watch(Type.UPDATED);
+ userChangedListener.watch(Type.UPDATED);
privilegeNodeChangedListener.watch(Type.UPDATED);
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index c567c04..3f1ddbc 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.governance.core.facade;
-import org.apache.shardingsphere.governance.core.facade.listener.GovernanceListenerManager;
import org.apache.shardingsphere.governance.core.facade.repository.GovernanceRepositoryFacade;
import org.apache.shardingsphere.governance.core.facade.util.FieldUtil;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
+import org.apache.shardingsphere.governance.core.registry.listener.RegistryListenerManager;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
@@ -53,7 +53,7 @@ public final class GovernanceFacadeTest {
private RegistryCenter registryCenter;
@Mock
- private GovernanceListenerManager listenerManager;
+ private RegistryListenerManager listenerManager;
@Before
public void setUp() {
@@ -75,7 +75,7 @@ public final class GovernanceFacadeTest {
verify(registryCenter).persistGlobalConfiguration(Collections.singleton(user), props, false);
verify(registryCenter).persistInstanceOnline();
verify(registryCenter).persistDataNodes();
- verify(listenerManager).init();
+ verify(listenerManager).initListeners();
}
@Test
@@ -83,7 +83,7 @@ public final class GovernanceFacadeTest {
governanceFacade.onlineInstance();
verify(registryCenter).persistInstanceOnline();
verify(registryCenter).persistDataNodes();
- verify(listenerManager).init();
+ verify(listenerManager).initListeners();
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManagerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManagerTest.java
deleted file mode 100644
index 7aa5158..0000000
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/listener/GovernanceListenerManagerTest.java
+++ /dev/null
@@ -1,48 +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.governance.core.facade.listener;
-
-import org.apache.shardingsphere.governance.core.facade.util.FieldUtil;
-import org.apache.shardingsphere.governance.core.registry.listener.RegistryListenerManager;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.Collections;
-
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public final class GovernanceListenerManagerTest {
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Mock
- private RegistryListenerManager registryListenerManager;
-
- @Test
- public void assertInit() {
- GovernanceListenerManager actual = new GovernanceListenerManager(registryRepository, Collections.emptyList());
- FieldUtil.setField(actual, "registryListenerManager", registryListenerManager);
- actual.init();
- verify(registryListenerManager).initListeners();
- }
-}