You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/12/01 06:02:17 UTC
[shardingsphere] branch master updated: #7318,
move eventbus to infra (#8433)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 8a4bedb #7318, move eventbus to infra (#8433)
8a4bedb is described below
commit 8a4bedb1e0b1300e0ad6b5e1cef7919091834650
Author: Zhang Yonglun <zh...@apache.org>
AuthorDate: Tue Dec 1 14:01:51 2020 +0800
#7318, move eventbus to infra (#8433)
---
.../context/metadata/GovernanceMetaDataContexts.java | 8 ++++----
.../context/transaction/GovernanceTransactionContexts.java | 4 ++--
.../governance/core/config/ConfigCenter.java | 4 ++--
.../listener/PostGovernanceRepositoryEventListener.java | 4 ++--
.../shardingsphere/governance/core/lock/LockCenter.java | 4 ++--
.../governance/core/registry/RegistryCenter.java | 4 ++--
.../governance/core/state/GovernedStateContext.java | 4 ++--
.../infra/eventbus/ShardingSphereEventBus.java | 14 +++++++-------
.../infra/eventbus/ShardingSphereEventBusTest.java | 6 +++---
.../internal/metadata/GovernanceSchemaChangedNotifier.java | 4 ++--
.../proxy/backend/text/admin/RDLBackendHandler.java | 10 +++++-----
11 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 00f6729..087cbe6 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.context.metadata;
import com.google.common.collect.Maps;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.event.model.auth.AuthenticationChangedEvent;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangeCompletedEvent;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangedEvent;
@@ -73,7 +73,7 @@ public final class GovernanceMetaDataContexts implements MetaDataContexts {
public GovernanceMetaDataContexts(final MetaDataContexts metaDataContexts, final GovernanceFacade governanceFacade) {
this.governanceFacade = governanceFacade;
this.metaDataContexts = metaDataContexts;
- GovernanceEventBus.getInstance().register(this);
+ ShardingSphereEventBus.getInstance().register(this);
disableDataSources();
persistMetaData();
}
@@ -155,7 +155,7 @@ public final class GovernanceMetaDataContexts implements MetaDataContexts {
metaDataContexts = new StandardMetaDataContexts(
metaDataMap, metaDataContexts.getExecutorEngine(), metaDataContexts.getAuthentication(), metaDataContexts.getProps(), metaDataContexts.getDatabaseType());
governanceFacade.getConfigCenter().persistSchema(event.getSchemaName(), metaDataContexts.getMetaDataMap().get(event.getSchemaName()).getSchema());
- GovernanceEventBus.getInstance().post(
+ ShardingSphereEventBus.getInstance().post(
new DataSourceChangeCompletedEvent(event.getSchemaName(), metaDataContexts.getDatabaseType(), metaDataMap.get(event.getSchemaName()).getResource().getDataSources()));
}
@@ -244,7 +244,7 @@ public final class GovernanceMetaDataContexts implements MetaDataContexts {
newMetaDataMap.put(schemaName, getChangedMetaData(metaDataContexts.getMetaDataMap().get(schemaName), event.getDataSourceConfigurations()));
metaDataContexts = new StandardMetaDataContexts(
newMetaDataMap, metaDataContexts.getExecutorEngine(), metaDataContexts.getAuthentication(), metaDataContexts.getProps(), metaDataContexts.getDatabaseType());
- GovernanceEventBus.getInstance().post(
+ ShardingSphereEventBus.getInstance().post(
new DataSourceChangeCompletedEvent(event.getSchemaName(), metaDataContexts.getDatabaseType(), newMetaDataMap.get(event.getSchemaName()).getResource().getDataSources()));
}
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
index 7a74385..2b5adc4 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.context.transaction;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangeCompletedEvent;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
@@ -34,7 +34,7 @@ public final class GovernanceTransactionContexts implements TransactionContexts
public GovernanceTransactionContexts(final TransactionContexts contexts) {
this.contexts = contexts;
- GovernanceEventBus.getInstance().register(this);
+ ShardingSphereEventBus.getInstance().register(this);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
index 8544360..0487b94 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -24,7 +24,7 @@ import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.encrypt.algorithm.config.AlgorithmProvidedEncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourcePersistEvent;
import org.apache.shardingsphere.governance.core.event.model.rule.RuleConfigurationsPersistEvent;
import org.apache.shardingsphere.governance.core.event.model.schema.SchemaNamePersistEvent;
@@ -77,7 +77,7 @@ public final class ConfigCenter {
public ConfigCenter(final ConfigurationRepository repository) {
node = new ConfigCenterNode();
this.repository = repository;
- GovernanceEventBus.getInstance().register(this);
+ ShardingSphereEventBus.getInstance().register(this);
}
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/listener/PostGovernanceRepositoryEventListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/listener/PostGovernanceRepositoryEventListener.java
index 5e9a2ab..c2cb3ae 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/listener/PostGovernanceRepositoryEventListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/listener/PostGovernanceRepositoryEventListener.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import java.util.Arrays;
import java.util.Collection;
@@ -51,7 +51,7 @@ public abstract class PostGovernanceRepositoryEventListener<T> implements Govern
governanceRepository.watch(watchKey, dataChangedEvent -> {
if (types.contains(dataChangedEvent.getType())) {
Optional<T> event = createEvent(dataChangedEvent);
- event.ifPresent(GovernanceEventBus.getInstance()::post);
+ event.ifPresent(ShardingSphereEventBus.getInstance()::post);
}
});
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/LockCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/LockCenter.java
index 41d1013..73636c61 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/LockCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/LockCenter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.lock;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockAddedEvent;
import org.apache.shardingsphere.governance.core.lock.node.LockNode;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
@@ -48,7 +48,7 @@ public final class LockCenter {
this.lockNode = new LockNode();
this.governedState = new GovernedState();
this.registryRepository.initLock(lockNode.getGlobalLockNodePath());
- GovernanceEventBus.getInstance().register(this);
+ ShardingSphereEventBus.getInstance().register(this);
}
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
index a22f0ec..7565430 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
@@ -40,7 +40,7 @@ public final class RegistryCenter {
node = new RegistryCenterNode();
repository = registryRepository;
instance = GovernanceInstance.getInstance();
- GovernanceEventBus.getInstance().register(this);
+ ShardingSphereEventBus.getInstance().register(this);
}
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/state/GovernedStateContext.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/state/GovernedStateContext.java
index 0b72091..635373c 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/state/GovernedStateContext.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/state/GovernedStateContext.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.state;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.state.StateEvent;
import org.apache.shardingsphere.infra.state.StateContext;
@@ -31,7 +31,7 @@ public final class GovernedStateContext {
* Start up governed state machine.
*/
public static void startUp() {
- GovernanceEventBus.getInstance().register(new GovernedStateContext());
+ ShardingSphereEventBus.getInstance().register(new GovernedStateContext());
}
/**
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBus.java
similarity index 76%
rename from shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBus.java
index 5c1da90..4e37ba5 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBus.java
@@ -15,28 +15,28 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.event;
+package org.apache.shardingsphere.infra.eventbus;
import com.google.common.eventbus.EventBus;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Governance event bus.
+ * ShardingSphere event bus.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class GovernanceEventBus {
+public final class ShardingSphereEventBus {
/**
- * Get instance of governance event bus.
+ * Get instance of ShardingSphere event bus.
*
- * @return instance of governance event bus
+ * @return instance of ShardingSphere event bus
*/
public static EventBus getInstance() {
- return GovernanceEventBusHolder.INSTANCE;
+ return ShardingSphereEventBusHolder.INSTANCE;
}
- private static final class GovernanceEventBusHolder {
+ private static final class ShardingSphereEventBusHolder {
private static final EventBus INSTANCE = new EventBus();
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBusTest.java
similarity index 83%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBusTest.java
index d678fb4..4320dca 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBusTest.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.event;
+package org.apache.shardingsphere.infra.eventbus;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class GovernanceEventBusTest {
+public final class ShardingSphereEventBusTest {
@Test
public void assertInstance() {
- assertThat(GovernanceEventBus.getInstance(), is(GovernanceEventBus.getInstance()));
+ assertThat(ShardingSphereEventBus.getInstance(), is(ShardingSphereEventBus.getInstance()));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/GovernanceSchemaChangedNotifier.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/GovernanceSchemaChangedNotifier.java
index 1a6f104..8487e82 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/GovernanceSchemaChangedNotifier.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/GovernanceSchemaChangedNotifier.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.governance.internal.metadata;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.event.model.schema.SchemaPersistEvent;
import org.apache.shardingsphere.infra.metadata.schema.refresher.spi.SchemaChangedNotifier;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
@@ -29,7 +29,7 @@ public final class GovernanceSchemaChangedNotifier implements SchemaChangedNotif
@Override
public void notify(final String name, final ShardingSphereSchema schema) {
- GovernanceEventBus.getInstance().post(new SchemaPersistEvent(name, schema));
+ ShardingSphereEventBus.getInstance().post(new SchemaPersistEvent(name, schema));
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
index c72b008..95aadef 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.text.admin;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
-import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
+import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourcePersistEvent;
import org.apache.shardingsphere.governance.core.event.model.rule.RuleConfigurationsPersistEvent;
import org.apache.shardingsphere.governance.core.event.model.schema.SchemaNamePersistEvent;
@@ -78,7 +78,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
throw new DBCreateExistsException(context.getSqlStatement().getDatabaseName());
}
// TODO Need to get the executed feedback from registry center for returning.
- GovernanceEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), false));
+ ShardingSphereEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), false));
UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;
@@ -89,7 +89,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
throw new DBCreateExistsException(context.getSqlStatement().getDatabaseName());
}
// TODO Need to get the executed feedback from registry center for returning.
- GovernanceEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), true));
+ ShardingSphereEventBus.getInstance().post(new SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), true));
UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("DROP");
return result;
@@ -100,7 +100,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
Map<String, DataSourceConfiguration> dataSources = DataSourceParameterConverter.getDataSourceConfigurationMap(
DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(parameters));
// TODO Need to get the executed feedback from registry center for returning.
- GovernanceEventBus.getInstance().post(new DataSourcePersistEvent(backendConnection.getSchemaName(), dataSources));
+ ShardingSphereEventBus.getInstance().post(new DataSourcePersistEvent(backendConnection.getSchemaName(), dataSources));
UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;
@@ -110,7 +110,7 @@ public final class RDLBackendHandler implements TextProtocolBackendHandler {
YamlShardingRuleConfiguration config = CreateShardingRuleStatementContextConverter.convert(context);
Collection<RuleConfiguration> rules = new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singleton(config));
// TODO Need to get the executed feedback from registry center for returning.
- GovernanceEventBus.getInstance().post(new RuleConfigurationsPersistEvent(backendConnection.getSchemaName(), rules));
+ ShardingSphereEventBus.getInstance().post(new RuleConfigurationsPersistEvent(backendConnection.getSchemaName(), rules));
UpdateResponseHeader result = new UpdateResponseHeader();
result.setType("CREATE");
return result;