未验证 提交 57692e64 编写于 作者: kimmking's avatar kimmking 提交者: GitHub

rename event type (#8020)

上级 a87ef49a
......@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.event.listener;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
/**
* Governance listener.
......@@ -27,7 +27,7 @@ public interface GovernanceListener {
/**
* Start to watch.
*
* @param watchedChangedTypes watched data change types
* @param types watched data change types
*/
void watch(ChangedType... watchedChangedTypes);
void watch(Type... types);
}
......@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.governance.core.event.model.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.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.core.event.GovernanceEventBus;
import java.util.Arrays;
......@@ -39,16 +39,16 @@ public abstract class PostGovernanceRepositoryEventListener implements Governanc
private final Collection<String> watchKeys;
@Override
public final void watch(final ChangedType... changedTypes) {
Collection<ChangedType> watchedChangedTypeList = Arrays.asList(changedTypes);
public final void watch(final Type... types) {
Collection<Type> typeList = Arrays.asList(types);
for (String watchKey : watchKeys) {
watch(watchKey, watchedChangedTypeList);
watch(watchKey, typeList);
}
}
private void watch(final String watchKey, final Collection<ChangedType> changedTypes) {
private void watch(final String watchKey, final Collection<Type> types) {
governanceRepository.watch(watchKey, dataChangedEvent -> {
if (changedTypes.contains(dataChangedEvent.getChangedType())) {
if (types.contains(dataChangedEvent.getType())) {
Optional<GovernanceEvent> event = createGovernanceEvent(dataChangedEvent);
event.ifPresent(GovernanceEventBus.getInstance()::post);
}
......
......@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.event.listener;
import org.apache.shardingsphere.governance.core.event.model.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.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -55,10 +55,10 @@ public final class PostGovernanceRepositoryEventListenerTest {
};
doAnswer(invocationOnMock -> {
DataChangedEventListener listener = (DataChangedEventListener) invocationOnMock.getArguments()[1];
listener.onChange(new DataChangedEvent("test", "value", ChangedType.UPDATED));
listener.onChange(new DataChangedEvent("test", "value", Type.UPDATED));
return mock(DataChangedEventListener.class);
}).when(governanceRepository).watch(anyString(), any(DataChangedEventListener.class));
postEventListener.watch(ChangedType.UPDATED);
postEventListener.watch(Type.UPDATED);
verify(governanceRepository).watch(eq("test"), any());
}
......@@ -73,10 +73,10 @@ public final class PostGovernanceRepositoryEventListenerTest {
};
doAnswer(invocationOnMock -> {
DataChangedEventListener listener = (DataChangedEventListener) invocationOnMock.getArguments()[1];
listener.onChange(new DataChangedEvent("test", "value", ChangedType.UPDATED));
listener.onChange(new DataChangedEvent("test", "value", Type.UPDATED));
return mock(DataChangedEventListener.class);
}).when(governanceRepository).watch(anyString(), any(DataChangedEventListener.class));
postEventListener.watch(ChangedType.UPDATED, ChangedType.DELETED);
postEventListener.watch(Type.UPDATED, Type.DELETED);
verify(governanceRepository).watch(eq("test"), any());
verify(governanceRepository).watch(eq("dev"), any());
}
......
......@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.config.listener;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
......@@ -43,8 +43,8 @@ public final class ConfigurationListenerManager {
* Initialize all configuration changed listeners.
*/
public void initListeners() {
schemaChangedListener.watch(ChangedType.UPDATED, ChangedType.DELETED, ChangedType.ADDED);
propertiesChangedListener.watch(ChangedType.UPDATED);
authenticationChangedListener.watch(ChangedType.UPDATED);
schemaChangedListener.watch(Type.UPDATED, Type.DELETED, Type.ADDED);
propertiesChangedListener.watch(Type.UPDATED);
authenticationChangedListener.watch(Type.UPDATED);
}
}
......@@ -34,7 +34,7 @@ import org.apache.shardingsphere.governance.core.yaml.swapper.DataSourceConfigur
import org.apache.shardingsphere.governance.core.yaml.swapper.LogicSchemaMetaDataYamlSwapper;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.metadata.model.schema.physical.model.schema.PhysicalSchemaMetaData;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
......@@ -75,13 +75,13 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
if (Strings.isNullOrEmpty(schemaName) || !isValidNodeChangedEvent(schemaName, event.getKey())) {
return Optional.empty();
}
if (ChangedType.ADDED == event.getChangedType()) {
if (Type.ADDED == event.getType()) {
return Optional.of(createAddedEvent(schemaName));
}
if (ChangedType.UPDATED == event.getChangedType()) {
if (Type.UPDATED == event.getType()) {
return Optional.of(createUpdatedEvent(schemaName, event));
}
if (ChangedType.DELETED == event.getChangedType()) {
if (Type.DELETED == event.getType()) {
existedSchemaNames.remove(schemaName);
return Optional.of(new SchemaDeletedEvent(schemaName));
}
......
......@@ -21,7 +21,7 @@ import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
import org.apache.shardingsphere.governance.core.event.model.auth.AuthenticationChangedEvent;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -52,7 +52,7 @@ public final class AuthenticationChangedListenerTest {
@Test
public void assertCreateGovernanceEvent() {
Optional<GovernanceEvent> actual = authenticationChangedListener.createGovernanceEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, ChangedType.UPDATED));
Optional<GovernanceEvent> actual = authenticationChangedListener.createGovernanceEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((AuthenticationChangedEvent) actual.get()).getAuthentication().getUsers().get("root1").getPassword(), is("root1"));
}
......
......@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.config.listener;
import lombok.SneakyThrows;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
......@@ -52,8 +52,8 @@ public final class ConfigurationListenerManagerTest {
setField(actual, "propertiesChangedListener", propertiesChangedListener);
setField(actual, "authenticationChangedListener", authenticationChangedListener);
actual.initListeners();
verify(propertiesChangedListener).watch(ChangedType.UPDATED);
verify(authenticationChangedListener).watch(ChangedType.UPDATED);
verify(propertiesChangedListener).watch(Type.UPDATED);
verify(authenticationChangedListener).watch(Type.UPDATED);
}
@SneakyThrows(ReflectiveOperationException.class)
......
......@@ -21,7 +21,7 @@ import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
import org.apache.shardingsphere.governance.core.event.model.props.PropertiesChangedEvent;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.junit.Before;
import org.junit.Test;
......@@ -52,7 +52,7 @@ public final class PropertiesChangedListenerTest {
@Test
public void assertCreateGovernanceEvent() {
Optional<GovernanceEvent> actual = propertiesChangedListener.createGovernanceEvent(new DataChangedEvent("test", PROPERTIES_YAML, ChangedType.UPDATED));
Optional<GovernanceEvent> actual = propertiesChangedListener.createGovernanceEvent(new DataChangedEvent("test", PROPERTIES_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((PropertiesChangedEvent) actual.get()).getProps().get(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(true));
assertThat(((PropertiesChangedEvent) actual.get()).getProps().get(ConfigurationPropertyKey.ACCEPTOR_SIZE.getKey()), is(16));
......
......@@ -27,7 +27,7 @@ import org.apache.shardingsphere.governance.core.event.model.schema.SchemaAddedE
import org.apache.shardingsphere.governance.core.event.model.schema.SchemaDeletedEvent;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.replicaquery.api.config.ReplicaQueryRuleConfiguration;
......@@ -78,14 +78,14 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateIgnoredEvent() {
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db", "test", ChangedType.UPDATED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db/rule", "test", ChangedType.IGNORED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db", "test", Type.UPDATED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db/rule", "test", Type.IGNORED)).isPresent());
}
@Test
public void assertCreateDataSourceChangedEventForExistedSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/datasource", dataSource, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(DataSourceChangedEvent.class));
......@@ -95,7 +95,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateRuleConfigurationsChangedEventForExistedSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/rule", shardingRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/rule", shardingRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((RuleConfigurationsChangedEvent) actual.get()).getSchemaName(), is("sharding_db"));
......@@ -107,7 +107,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateReplicaQueryRuleChangedEventForExistedSchema() {
String rule = readYAML(REPLICA_QUERY_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/replica_query_db/rule", rule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/replica_query_db/rule", rule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual.get();
......@@ -120,7 +120,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptRuleChangedEventForExistedSchema() {
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/encrypt_db/rule", encryptRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/encrypt_db/rule", encryptRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual.get();
......@@ -135,7 +135,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateIgnoredGovernanceEventForNewSchema() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", "rule", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", "rule", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(SchemaAddedEvent.class));
......@@ -144,7 +144,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -153,7 +153,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateReplicaQuerySchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -162,7 +162,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -171,7 +171,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaDeletedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaDeletedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -180,7 +180,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEvent() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(SchemaDeletedEvent.class));
......@@ -189,7 +189,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEventWithDataSourceNode() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/datasource", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/datasource", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(SchemaDeletedEvent.class));
......@@ -198,7 +198,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithEncryptRuleConfigurationForNewSchema() {
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", encryptRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", encryptRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -207,7 +207,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithShardingRuleConfigurationForNewSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", shardingRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", shardingRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -216,7 +216,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithReplicaQueryRuleConfigurationForNewSchema() {
String rule = readYAML(REPLICA_QUERY_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", rule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", rule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -224,7 +224,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForAdd() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db,shadow_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db,shadow_db", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("shadow_db"));
......@@ -232,7 +232,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForDelete() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaDeletedEvent) actual.get()).getSchemaName(), is("encrypt_db"));
......@@ -240,13 +240,13 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForIgnore() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db", Type.UPDATED);
assertFalse(schemaChangedListener.createGovernanceEvent(dataChangedEvent).isPresent());
}
@Test
public void assertCreateSchemaNameAddEvent() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/shadow_db", "", ChangedType.ADDED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/shadow_db", "", Type.ADDED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("shadow_db"));
......@@ -254,7 +254,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateMetaDataChangedEvent() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/table", readYAML(META_DATA_FILE), ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/table", readYAML(META_DATA_FILE), Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertTrue(((MetaDataChangedEvent) actual.get()).getMetaData().getAllTableNames().contains("t_order"));
......
......@@ -24,7 +24,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStat
import org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
import java.util.Optional;
......@@ -47,6 +47,6 @@ public final class DataSourceStateChangedListener extends PostGovernanceReposito
}
private boolean isDataSourceDisabled(final DataChangedEvent event) {
return RegistryCenterNodeStatus.DISABLED.toString().equalsIgnoreCase(event.getValue()) && (ChangedType.UPDATED == event.getChangedType() || ChangedType.ADDED == event.getChangedType());
return RegistryCenterNodeStatus.DISABLED.toString().equalsIgnoreCase(event.getValue()) && (Type.UPDATED == event.getType() || Type.ADDED == event.getType());
}
}
......@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
......@@ -40,7 +40,7 @@ public final class RegistryListenerManager {
* Initialize all state changed listeners.
*/
public void initListeners() {
instanceStateChangedListener.watch(ChangedType.UPDATED);
dataSourceStateChangedListener.watch(ChangedType.UPDATED, ChangedType.DELETED, ChangedType.ADDED);
instanceStateChangedListener.watch(Type.UPDATED);
dataSourceStateChangedListener.watch(Type.UPDATED, Type.DELETED, Type.ADDED);
}
}
......@@ -22,7 +22,7 @@ import org.apache.shardingsphere.governance.core.registry.event.DisabledStateCha
import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -52,7 +52,7 @@ public final class DataSourceStateChangedListenerTest {
@Test
public void assertCreateGovernanceEvent() {
Optional<GovernanceEvent> actual = dataSourceStateChangedListener.createGovernanceEvent(
new DataChangedEvent("/states/datanodes/replica_query_db/replica_ds_0", "disabled", ChangedType.UPDATED));
new DataChangedEvent("/states/datanodes/replica_query_db/replica_ds_0", "disabled", Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((DisabledStateChangedEvent) actual.get()).getGovernanceSchema().getSchemaName(), is(new GovernanceSchema("replica_query_db", "replica_ds_0").getSchemaName()));
}
......
......@@ -22,7 +22,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStat
import org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -49,14 +49,14 @@ public final class InstanceStateChangedListenerTest {
@Test
public void assertCreateGovernanceEventWhenEnabled() {
Optional<GovernanceEvent> actual = instanceStateChangedListener.createGovernanceEvent(new DataChangedEvent("/test_ds", "", ChangedType.UPDATED));
Optional<GovernanceEvent> actual = instanceStateChangedListener.createGovernanceEvent(new DataChangedEvent("/test_ds", "", Type.UPDATED));
assertTrue(actual.isPresent());
assertFalse(((CircuitStateChangedEvent) actual.get()).isCircuitBreak());
}
@Test
public void assertCreateGovernanceEventWhenDisabled() {
Optional<GovernanceEvent> actual = instanceStateChangedListener.createGovernanceEvent(new DataChangedEvent("/test_ds", RegistryCenterNodeStatus.DISABLED.name(), ChangedType.UPDATED));
Optional<GovernanceEvent> actual = instanceStateChangedListener.createGovernanceEvent(new DataChangedEvent("/test_ds", RegistryCenterNodeStatus.DISABLED.name(), Type.UPDATED));
assertTrue(actual.isPresent());
assertTrue(((CircuitStateChangedEvent) actual.get()).isCircuitBreak());
}
......
......@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.core.registry.util.FieldUtil;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
......@@ -47,7 +47,7 @@ public final class RegistryListenerManagerTest {
FieldUtil.setField(actual, "instanceStateChangedListener", instanceStateChangedListener);
FieldUtil.setField(actual, "dataSourceStateChangedListener", dataSourceStateChangedListener);
actual.initListeners();
verify(instanceStateChangedListener).watch(ChangedType.UPDATED);
verify(dataSourceStateChangedListener).watch(ChangedType.UPDATED, ChangedType.DELETED, ChangedType.ADDED);
verify(instanceStateChangedListener).watch(Type.UPDATED);
verify(dataSourceStateChangedListener).watch(Type.UPDATED, Type.DELETED, Type.ADDED);
}
}
......@@ -31,12 +31,12 @@ public final class DataChangedEvent {
private final String value;
private final ChangedType changedType;
private final Type type;
/**
* Data changed type.
*/
public enum ChangedType {
public enum Type {
ADDED, UPDATED, DELETED, IGNORED
}
......
......@@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.governance.repository.apollo.wrapper.ApolloConfigWrapper;
import org.apache.shardingsphere.governance.repository.apollo.wrapper.ApolloOpenApiWrapper;
......@@ -89,28 +89,28 @@ public final class ApolloRepository implements ConfigurationRepository {
ConfigChangeListener listener = changeEvent -> {
for (String changeKey : changeEvent.changedKeys()) {
ConfigChange change = changeEvent.getChange(changeKey);
ChangedType changedType = getChangedType(change.getChangeType());
if (ChangedType.IGNORED == changedType) {
Type type = getChangedType(change.getChangeType());
if (Type.IGNORED == type) {
continue;
}
if (!caches.containsKey(changeKey)) {
continue;
}
caches.get(changeKey).onChange(new DataChangedEvent(keyToPath(changeKey), change.getNewValue(), changedType));
caches.get(changeKey).onChange(new DataChangedEvent(keyToPath(changeKey), change.getNewValue(), type));
}
};
configWrapper.addChangeListener(listener, Collections.singleton(apolloKey), Collections.singleton(apolloKey));
}
private ChangedType getChangedType(final PropertyChangeType changeType) {
private Type getChangedType(final PropertyChangeType changeType) {
switch (changeType) {
case ADDED:
case MODIFIED:
return ChangedType.UPDATED;
return Type.UPDATED;
case DELETED:
return ChangedType.DELETED;
return Type.DELETED;
default:
return ChangedType.IGNORED;
return Type.IGNORED;
}
}
......
......@@ -23,7 +23,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.apollo.wrapper.ApolloConfigWrapper;
import org.apache.shardingsphere.governance.repository.apollo.wrapper.ApolloOpenApiWrapper;
import org.junit.BeforeClass;
......@@ -114,7 +114,7 @@ public final class ApolloRepositoryTest {
DataChangedEvent changeEvent = future.get(5, TimeUnit.SECONDS);
assertThat(changeEvent.getKey(), is(path));
assertThat(changeEvent.getValue(), is(newValue));
assertThat(changeEvent.getChangedType(), is(ChangedType.UPDATED));
assertThat(changeEvent.getType(), is(Type.UPDATED));
}
@Test
......@@ -129,7 +129,7 @@ public final class ApolloRepositoryTest {
DataChangedEvent changeEvent = future.get(5, TimeUnit.SECONDS);
assertThat(changeEvent.getKey(), is(path));
assertNull(changeEvent.getValue());
assertThat(changeEvent.getChangedType(), is(ChangedType.DELETED));
assertThat(changeEvent.getType(), is(Type.DELETED));
assertNull(REPOSITORY.get(path));
}
......
......@@ -35,7 +35,7 @@ import org.apache.shardingsphere.governance.repository.api.ConfigurationReposito
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import java.util.List;
......@@ -107,24 +107,24 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
Watch.Listener listener = Watch.listener(response -> {
for (WatchEvent each : response.getEvents()) {
ChangedType changedType = getEventChangedType(each);
if (ChangedType.IGNORED != changedType) {
Type type = getEventChangedType(each);
if (Type.IGNORED != type) {
dataChangedEventListener.onChange(new DataChangedEvent(each.getKeyValue().getKey().toString(StandardCharsets.UTF_8),
each.getKeyValue().getValue().toString(StandardCharsets.UTF_8), changedType));
each.getKeyValue().getValue().toString(StandardCharsets.UTF_8), type));
}
}
});
client.getWatchClient().watch(ByteSequence.from(key, StandardCharsets.UTF_8), listener);
}
private ChangedType getEventChangedType(final WatchEvent event) {
private Type getEventChangedType(final WatchEvent event) {
switch (event.getEventType()) {
case PUT:
return ChangedType.UPDATED;
return Type.UPDATED;
case DELETE:
return ChangedType.DELETED;
return Type.DELETED;
default:
return ChangedType.IGNORED;
return Type.IGNORED;
}
}
......
......@@ -28,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import java.util.List;
......@@ -134,7 +134,7 @@ public final class NacosRepository implements ConfigurationRepository {
@Override
public void receiveConfigInfo(final String configInfo) {
listener.onChange(new DataChangedEvent(key, configInfo, ChangedType.UPDATED));
listener.onChange(new DataChangedEvent(key, configInfo, Type.UPDATED));
}
});
} catch (final NacosException ex) {
......
......@@ -22,7 +22,7 @@ import com.alibaba.nacos.api.config.listener.Listener;
import com.alibaba.nacos.api.exception.NacosException;
import lombok.SneakyThrows;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.junit.Before;
......@@ -118,24 +118,24 @@ public final class NacosRepositoryTest {
public void assertWatchUpdatedChangedType() throws NacosException {
final String expectValue = "expectValue";
String[] actualValue = {null};
ChangedType[] actualType = {null};
Type[] actualType = {null};
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(expectValue))).when(configService).addListener(anyString(), anyString(), any(Listener.class));
DataChangedEventListener listener = dataChangedEvent -> {
actualValue[0] = dataChangedEvent.getValue();
actualType[0] = dataChangedEvent.getChangedType();
actualType[0] = dataChangedEvent.getType();
};
REPOSITORY.watch("/sharding/test", listener);
assertThat(actualValue[0], is(expectValue));
assertThat(actualType[0], is(ChangedType.UPDATED));
assertThat(actualType[0], is(Type.UPDATED));
}
@Test
public void assertWatchDeletedChangedType() throws NacosException {
ChangedType[] actualType = {null};
Type[] actualType = {null};
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(null))).when(configService).addListener(anyString(), anyString(), any(Listener.class));
DataChangedEventListener listener = dataChangedEvent -> actualType[0] = dataChangedEvent.getChangedType();
DataChangedEventListener listener = dataChangedEvent -> actualType[0] = dataChangedEvent.getType();
REPOSITORY.watch("/sharding/test", listener);
assertThat(actualType[0], is(ChangedType.UPDATED));
assertThat(actualType[0], is(Type.UPDATED));
}
@Test
......@@ -154,9 +154,9 @@ public final class NacosRepositoryTest {
@Test
public void assertWatchWhenThrowException() throws NacosException {
ChangedType[] actualType = {null};
Type[] actualType = {null};
doThrow(NacosException.class).when(configService).addListener(anyString(), anyString(), any(Listener.class));
DataChangedEventListener listener = dataChangedEvent -> actualType[0] = dataChangedEvent.getChangedType();
DataChangedEventListener listener = dataChangedEvent -> actualType[0] = dataChangedEvent.getType();
REPOSITORY.watch("/sharding/test", listener);
assertNull(actualType[0]);
}
......
......@@ -43,7 +43,7 @@ import org.apache.shardingsphere.governance.repository.api.ConfigurationReposito
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.governance.repository.zookeeper.handler.CuratorZookeeperExceptionHandler;
import org.apache.zookeeper.CreateMode;
......@@ -235,8 +235,8 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
cache.listenable().addListener((type, oldData, data) -> {
String eventPath = CuratorCacheListener.Type.NODE_DELETED == type ? oldData.getPath() : data.getPath();
byte[] eventDataByte = CuratorCacheListener.Type.NODE_DELETED == type ? oldData.getData() : data.getData();
DataChangedEvent.ChangedType changedType = getChangedType(type);
if (ChangedType.IGNORED != changedType) {
Type changedType = getChangedType(type);
if (Type.IGNORED != changedType) {
listener.onChange(new DataChangedEvent(eventPath, null == eventDataByte ? null : new String(eventDataByte, StandardCharsets.UTF_8), changedType));
}
});
......@@ -254,16 +254,16 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
caches.put(cachePath + PATH_SEPARATOR, cache);
}
private ChangedType getChangedType(final CuratorCacheListener.Type type) {
private Type getChangedType(final CuratorCacheListener.Type type) {
switch (type) {
case NODE_CREATED:
return ChangedType.ADDED;
return Type.ADDED;
case NODE_CHANGED:
return ChangedType.UPDATED;
return Type.UPDATED;
case NODE_DELETED:
return ChangedType.DELETED;
return Type.DELETED;
default:
return ChangedType.IGNORED;
return Type.IGNORED;
}
}
......
......@@ -21,7 +21,7 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.exception.GovernanceException;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.BeforeClass;
import org.junit.Test;
......@@ -86,7 +86,7 @@ public final class CuratorZookeeperRepositoryTest {
Thread.sleep(50L);
DataChangedEvent dataChangedEvent = dataChangedEventActual.get();
assertNotNull(dataChangedEvent);
assertThat(dataChangedEvent.getChangedType(), is(ChangedType.UPDATED));
assertThat(dataChangedEvent.getType(), is(Type.UPDATED));
assertThat(dataChangedEvent.getKey(), is("/test/children_updated/1"));
assertThat(dataChangedEvent.getValue(), is("value2"));
assertThat(REPOSITORY.get("/test/children_updated/1"), is("value2"));
......@@ -104,7 +104,7 @@ public final class CuratorZookeeperRepositoryTest {
Thread.sleep(50L);
DataChangedEvent dataChangedEvent = dataChangedEventActual.get();
assertNotNull(dataChangedEvent);
assertThat(dataChangedEvent.getChangedType(), is(ChangedType.DELETED));
assertThat(dataChangedEvent.getType(), is(Type.DELETED));
assertThat(dataChangedEvent.getKey(), is("/test/children_deleted/5"));
assertThat(dataChangedEvent.getValue(), is("value5"));
}
......@@ -117,7 +117,7 @@ public final class CuratorZookeeperRepositoryTest {
Thread.sleep(50L);
DataChangedEvent event = actualDataChangedEvent.get();
assertNotNull(event);
assertThat(event.getChangedType(), is(ChangedType.ADDED));
assertThat(event.getType(), is(Type.ADDED));
assertThat(event.getKey(), is("/test/children_added/4"));
assertThat(event.getValue(), is("value4"));
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册