This is an automated email from the ASF dual-hosted git repository.
panjuan 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 f601d55 Rename ShardingSphereEventBus to GovernanceEventBus (#7556)
f601d55 is described below
commit f601d558de340b657830760c1b69c8a745595733
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 22 16:40:27 2020 +0800
Rename ShardingSphereEventBus to GovernanceEventBus (#7556)
---
.../{ShardingSphereEventBus.java => GovernanceEventBus.java} | 12 ++++++------
.../core/listener/PostGovernanceRepositoryEventListener.java | 4 ++--
...ngSphereEventBusTest.java => GovernanceEventBusTest.java} | 4 ++--
.../shardingsphere/governance/core/config/ConfigCenter.java | 4 ++--
.../governance/context/schema/GovernanceSchemaContexts.java | 8 ++++----
.../context/transaction/GovernanceTransactionContexts.java | 4 ++--
.../internal/metadata/RuleSchemaMetaDataNotifier.java | 4 ++--
.../communication/jdbc/JDBCDatabaseCommunicationEngine.java | 4 ++--
.../proxy/backend/text/admin/RDLBackendHandler.java | 10 +++++-----
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBus.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java
similarity index 80%
rename from
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBus.java
rename to
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java
index 007d86e..5c1da90 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBus.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBus.java
@@ -22,21 +22,21 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * ShardingSphere event bus.
+ * Governance event bus.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingSphereEventBus {
+public final class GovernanceEventBus {
/**
- * Get instance of ShardingSphere event bus.
+ * Get instance of governance event bus.
*
- * @return instance of ShardingSphere event bus
+ * @return instance of governance event bus
*/
public static EventBus getInstance() {
- return ShardingSphereEventBusHolder.INSTANCE;
+ return GovernanceEventBusHolder.INSTANCE;
}
- private static final class ShardingSphereEventBusHolder {
+ private static final class GovernanceEventBusHolder {
private static final EventBus INSTANCE = new EventBus();
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java
index 9a40dfb..3d9560b 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.governance.core.event.GovernanceEvent;
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.ChangedType;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import java.util.Arrays;
import java.util.Collection;
@@ -50,7 +50,7 @@ public abstract class PostGovernanceRepositoryEventListener
implements Governanc
governanceRepository.watch(watchKey, dataChangedEvent -> {
if (changedTypes.contains(dataChangedEvent.getChangedType())) {
Optional<GovernanceEvent> event =
createGovernanceEvent(dataChangedEvent);
- event.ifPresent(ShardingSphereEventBus.getInstance()::post);
+ event.ifPresent(GovernanceEventBus.getInstance()::post);
}
});
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBusTest.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java
similarity index 87%
rename from
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBusTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java
index dbe7b4b..d678fb4 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/ShardingSphereEventBusTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/event/GovernanceEventBusTest.java
@@ -22,10 +22,10 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class ShardingSphereEventBusTest {
+public final class GovernanceEventBusTest {
@Test
public void assertInstance() {
- assertThat(ShardingSphereEventBus.getInstance(),
is(ShardingSphereEventBus.getInstance()));
+ assertThat(GovernanceEventBus.getInstance(),
is(GovernanceEventBus.getInstance()));
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
index 6e524ea..ef58075 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.governance.core.event.persist.DataSourcePersist
import
org.apache.shardingsphere.governance.core.event.persist.MetaDataPersistEvent;
import
org.apache.shardingsphere.governance.core.event.persist.RulePersistEvent;
import
org.apache.shardingsphere.governance.core.event.persist.SchemaNamePersistEvent;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import
org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration;
import
org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfigurationWrap;
import
org.apache.shardingsphere.governance.core.yaml.config.metadata.YamlRuleSchemaMetaData;
@@ -74,7 +74,7 @@ public final class ConfigCenter {
public ConfigCenter(final ConfigurationRepository repository) {
node = new ConfigCenterNode();
this.repository = repository;
- ShardingSphereEventBus.getInstance().register(this);
+ GovernanceEventBus.getInstance().register(this);
}
/**
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
index 9fd8feb..c53507b 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEv
import
org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.governance.core.event.schema.SchemaAddedEvent;
import
org.apache.shardingsphere.governance.core.event.schema.SchemaDeletedEvent;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import org.apache.shardingsphere.governance.core.facade.GovernanceFacade;
import
org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent;
@@ -78,7 +78,7 @@ public final class GovernanceSchemaContexts implements
SchemaContexts {
public GovernanceSchemaContexts(final SchemaContexts schemaContexts, final
GovernanceFacade governanceFacade) {
this.governanceFacade = governanceFacade;
this.schemaContexts = schemaContexts;
- ShardingSphereEventBus.getInstance().register(this);
+ GovernanceEventBus.getInstance().register(this);
disableDataSources();
persistMetaData();
}
@@ -161,7 +161,7 @@ public final class GovernanceSchemaContexts implements
SchemaContexts {
schemaContexts = new StandardSchemaContexts(schemas,
schemaContexts.getAuthentication(), schemaContexts.getProps(),
schemaContexts.getDatabaseType());
governanceFacade.getConfigCenter().persistMetaData(event.getSchemaName(),
schemaContexts.getSchemaContextMap().get(event.getSchemaName()).getSchema().getMetaData().getRuleSchemaMetaData());
- ShardingSphereEventBus.getInstance().post(
+ GovernanceEventBus.getInstance().post(
new DataSourceChangeCompletedEvent(event.getSchemaName(),
schemaContexts.getDatabaseType(),
schemas.get(event.getSchemaName()).getSchema().getDataSources()));
}
@@ -246,7 +246,7 @@ public final class GovernanceSchemaContexts implements
SchemaContexts {
newSchemaContexts.remove(schemaName);
newSchemaContexts.put(schemaName,
getChangedSchemaContext(schemaContexts.getSchemaContextMap().get(schemaName),
event.getDataSourceConfigurations()));
schemaContexts = new StandardSchemaContexts(newSchemaContexts,
schemaContexts.getAuthentication(), schemaContexts.getProps(),
schemaContexts.getDatabaseType());
- ShardingSphereEventBus.getInstance().post(
+ GovernanceEventBus.getInstance().post(
new DataSourceChangeCompletedEvent(event.getSchemaName(),
schemaContexts.getDatabaseType(),
newSchemaContexts.get(event.getSchemaName()).getSchema().getDataSources()));
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
index 9a3d9c5..5cdca32 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-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.datasource.DataSourceChangeCompletedEvent;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
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;
- ShardingSphereEventBus.getInstance().register(this);
+ GovernanceEventBus.getInstance().register(this);
}
@Override
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/RuleSchemaMetaDataNotifier.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/RuleSchemaMetaDataNotifier.java
index c988835..3ec279b 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/RuleSchemaMetaDataNotifier.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/metadata/RuleSchemaMetaDataNotifier.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.governance.internal.metadata;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import
org.apache.shardingsphere.governance.core.event.persist.MetaDataPersistEvent;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import
org.apache.shardingsphere.infra.metadata.schema.spi.RuleMetaDataNotifier;
@@ -29,7 +29,7 @@ public final class RuleSchemaMetaDataNotifier implements
RuleMetaDataNotifier {
@Override
public void notify(final String schemaName, final RuleSchemaMetaData
metaData) {
- ShardingSphereEventBus.getInstance().post(new
MetaDataPersistEvent(schemaName, metaData));
+ GovernanceEventBus.getInstance().post(new
MetaDataPersistEvent(schemaName, metaData));
}
@Override
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
index 2ee0a5c..f7bd4e0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.communication.jdbc;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.governance.core.event.persist.MetaDataPersistEvent;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.executor.sql.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
@@ -94,7 +94,7 @@ public final class JDBCDatabaseCommunicationEngine implements
DatabaseCommunicat
if (refreshStrategy.isPresent()) {
refreshStrategy.get().refreshMetaData(logicSQLContext.getSchemaContext().getSchema().getMetaData(),
ProxyContext.getInstance().getSchemaContexts().getDatabaseType(),
logicSQLContext.getSchemaContext().getSchema().getDataSources(),
sqlStatementContext, this::loadTableMetaData);
- ShardingSphereEventBus.getInstance().post(
+ GovernanceEventBus.getInstance().post(
new
MetaDataPersistEvent(logicSQLContext.getSchemaContext().getName(),
logicSQLContext.getSchemaContext().getSchema().getMetaData().getRuleSchemaMetaData()));
}
}
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 18a8c9f..0eeab08 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
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.governance.core.event.persist.DataSourcePersistEvent;
import
org.apache.shardingsphere.governance.core.event.persist.RulePersistEvent;
import
org.apache.shardingsphere.governance.core.event.persist.SchemaNamePersistEvent;
-import org.apache.shardingsphere.governance.core.event.ShardingSphereEventBus;
+import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import
org.apache.shardingsphere.infra.context.schema.impl.StandardSchemaContexts;
@@ -79,7 +79,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.
- ShardingSphereEventBus.getInstance().post(new
SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), false));
+ GovernanceEventBus.getInstance().post(new
SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), false));
UpdateResponse result = new UpdateResponse();
result.setType("CREATE");
return result;
@@ -90,7 +90,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.
- ShardingSphereEventBus.getInstance().post(new
SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), true));
+ GovernanceEventBus.getInstance().post(new
SchemaNamePersistEvent(context.getSqlStatement().getDatabaseName(), true));
UpdateResponse result = new UpdateResponse();
result.setType("DROP");
return result;
@@ -101,7 +101,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.
- ShardingSphereEventBus.getInstance().post(new
DataSourcePersistEvent(backendConnection.getSchemaName(), dataSources));
+ GovernanceEventBus.getInstance().post(new
DataSourcePersistEvent(backendConnection.getSchemaName(), dataSources));
UpdateResponse result = new UpdateResponse();
result.setType("CREATE");
return result;
@@ -111,7 +111,7 @@ public final class RDLBackendHandler implements
TextProtocolBackendHandler {
YamlShardingRuleConfiguration configs = new
CreateShardingRuleStatementContextConverter().convert(context);
Collection<RuleConfiguration> rules = new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singleton(configs));
// TODO Need to get the executed feedback from registry center for
returning.
- ShardingSphereEventBus.getInstance().post(new
RulePersistEvent(backendConnection.getSchemaName(), rules));
+ GovernanceEventBus.getInstance().post(new
RulePersistEvent(backendConnection.getSchemaName(), rules));
UpdateResponse result = new UpdateResponse();
result.setType("CREATE");
return result;
