createOrchestrationEvent => createShardingOrchestrationEvent

apache · Dec 3, 2018 · 0304460 · 0304460
1 parent 728b328
commit 0304460
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 28 deletions.
diff --git a/...sphere/orchestration/internal/registry/config/listener/AuthenticationChangedListener.java b/...sphere/orchestration/internal/registry/config/listener/AuthenticationChangedListener.java
@@ -39,7 +39,7 @@ public AuthenticationChangedListener(final String name, final RegistryCenter reg
     }
 
     @Override
-    protected AuthenticationChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected AuthenticationChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new AuthenticationChangedEvent(configService.loadAuthentication());
     }
 }
diff --git a/...rdingsphere/orchestration/internal/registry/config/listener/ConfigMapChangedListener.java b/...rdingsphere/orchestration/internal/registry/config/listener/ConfigMapChangedListener.java
@@ -40,7 +40,7 @@ public ConfigMapChangedListener(final String name, final RegistryCenter regCente
     }
 
     @Override
-    protected ConfigMapChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected ConfigMapChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new ConfigMapChangedEvent(configService.loadConfigMap());
     }
 }
diff --git a/...dingsphere/orchestration/internal/registry/config/listener/DataSourceChangedListener.java b/...dingsphere/orchestration/internal/registry/config/listener/DataSourceChangedListener.java
@@ -42,7 +42,7 @@ public DataSourceChangedListener(final String name, final RegistryCenter regCent
     }
 
     @Override
-    protected DataSourceChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected DataSourceChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new DataSourceChangedEvent(shardingSchemaName, dataSourceService.getAvailableDataSourceConfigurations(shardingSchemaName));
     }
 }
diff --git a/...dingsphere/orchestration/internal/registry/config/listener/PropertiesChangedListener.java b/...dingsphere/orchestration/internal/registry/config/listener/PropertiesChangedListener.java
@@ -39,7 +39,7 @@ public PropertiesChangedListener(final String name, final RegistryCenter regCent
     }
 
     @Override
-    protected PropertiesChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected PropertiesChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new PropertiesChangedEvent(configService.loadProperties());
     }
 }
diff --git a/...o/shardingsphere/orchestration/internal/registry/config/listener/RuleChangedListener.java b/...o/shardingsphere/orchestration/internal/registry/config/listener/RuleChangedListener.java
@@ -49,7 +49,7 @@ public RuleChangedListener(final String name, final RegistryCenter regCenter, fi
     }
 
     @Override
-    protected ShardingOrchestrationEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected ShardingOrchestrationEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return configService.isShardingRule(shardingSchemaName) ? getShardingConfigurationChangedEvent() : getMasterSlaveConfigurationChangedEvent();
     }
 

diff --git a/...here/orchestration/internal/registry/listener/PostShardingOrchestrationEventListener.java b/...here/orchestration/internal/registry/listener/PostShardingOrchestrationEventListener.java
@@ -50,11 +50,11 @@ public final void watch(final ChangedType... watchedChangedTypes) {
             @Override
             public void onChange(final DataChangedEvent dataChangedEvent) {
                 if (watchedChangedTypeList.contains(dataChangedEvent.getChangedType())) {
-                    eventBus.post(createOrchestrationEvent(dataChangedEvent));
+                    eventBus.post(createShardingOrchestrationEvent(dataChangedEvent));
                 }
             }
         });
     }
 
-    protected abstract ShardingOrchestrationEvent createOrchestrationEvent(DataChangedEvent event);
+    protected abstract ShardingOrchestrationEvent createShardingOrchestrationEvent(DataChangedEvent event);
 }
diff --git a/...sphere/orchestration/internal/registry/state/listener/DataSourceStateChangedListener.java b/...sphere/orchestration/internal/registry/state/listener/DataSourceStateChangedListener.java
@@ -40,7 +40,7 @@ public DataSourceStateChangedListener(final String name, final RegistryCenter re
     }
 
     @Override
-    protected DisabledStateChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected DisabledStateChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new DisabledStateChangedEvent(dataSourceService.getDisabledSlaveSchemaGroup());
     }
 }
diff --git a/...ngsphere/orchestration/internal/registry/state/listener/InstanceStateChangedListener.java b/...ngsphere/orchestration/internal/registry/state/listener/InstanceStateChangedListener.java
@@ -41,7 +41,7 @@ public InstanceStateChangedListener(final String name, final RegistryCenter regC
     }
 
     @Override
-    protected CircuitStateChangedEvent createOrchestrationEvent(final DataChangedEvent event) {
+    protected CircuitStateChangedEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
         return new CircuitStateChangedEvent(StateNodeStatus.DISABLED.toString().equalsIgnoreCase(regCenter.get(event.getKey())));
     }
 }
diff --git a/...re/orchestration/internal/registry/config/listener/AuthenticationChangedListenerTest.java b/...re/orchestration/internal/registry/config/listener/AuthenticationChangedListenerTest.java
@@ -51,9 +51,9 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEvent() {
+    public void assertCreateShardingOrchestrationEvent() {
         Authentication expected = new Authentication();
         when(configService.loadAuthentication()).thenReturn(expected);
-        assertThat(authenticationChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class)).getAuthentication(), is(expected));
+        assertThat(authenticationChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class)).getAuthentication(), is(expected));
     }
 }
diff --git a/...gsphere/orchestration/internal/registry/config/listener/ConfigMapChangedListenerTest.java b/...gsphere/orchestration/internal/registry/config/listener/ConfigMapChangedListenerTest.java
@@ -55,10 +55,10 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEvent() {
+    public void assertCreateShardingOrchestrationEvent() {
         Map<String, Object> expected = new HashMap<>(1, 1);
         expected.put("key_0", "value_0");
         when(configService.loadConfigMap()).thenReturn(expected);
-        assertThat(configMapChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class)).getConfigMap(), is(expected));
+        assertThat(configMapChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class)).getConfigMap(), is(expected));
     }
 }
diff --git a/...sphere/orchestration/internal/registry/config/listener/DataSourceChangedListenerTest.java b/...sphere/orchestration/internal/registry/config/listener/DataSourceChangedListenerTest.java
@@ -57,11 +57,11 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEvent() {
+    public void assertCreateShardingOrchestrationEvent() {
         Map<String, DataSourceConfiguration> expected = new HashMap<>(1, 1);
         expected.put("sharding_db", mock(DataSourceConfiguration.class));
         when(dataSourceService.getAvailableDataSourceConfigurations("sharding_db")).thenReturn(expected);
-        DataSourceChangedEvent actual = dataSourceChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class));
+        DataSourceChangedEvent actual = dataSourceChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class));
         assertThat(actual.getShardingSchemaName(), is("sharding_db"));
         assertThat(actual.getDataSourceConfigurations(), is(expected));
     }

diff --git a/...sphere/orchestration/internal/registry/config/listener/PropertiesChangedListenerTest.java b/...sphere/orchestration/internal/registry/config/listener/PropertiesChangedListenerTest.java
@@ -55,10 +55,10 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEvent() {
+    public void assertCreateShardingOrchestrationEvent() {
         Properties expected = new Properties();
         expected.setProperty(ShardingPropertiesConstant.SQL_SHOW.getKey(), Boolean.TRUE.toString());
         when(configService.loadProperties()).thenReturn(expected);
-        assertThat(propertiesChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class)).getProps(), is(expected));
+        assertThat(propertiesChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class)).getProps(), is(expected));
     }
 }
diff --git a/...ardingsphere/orchestration/internal/registry/config/listener/RuleChangedListenerTest.java b/...ardingsphere/orchestration/internal/registry/config/listener/RuleChangedListenerTest.java
@@ -61,20 +61,20 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEventForSharding() {
+    public void assertCreateShardingOrchestrationEventForSharding() {
         when(configService.isShardingRule("sharding_db")).thenReturn(true);
         ShardingRuleConfiguration expected = mock(ShardingRuleConfiguration.class);
         when(dataSourceService.getAvailableShardingRuleConfiguration("sharding_db")).thenReturn(expected);
-        ShardingRuleChangedEvent actual = (ShardingRuleChangedEvent) ruleChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class));
+        ShardingRuleChangedEvent actual = (ShardingRuleChangedEvent) ruleChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class));
         assertThat(actual.getShardingSchemaName(), is("sharding_db"));
         assertThat(actual.getShardingRuleConfiguration(), is(expected));
     }
 
     @Test
-    public void assertCreateOrchestrationEventForMasterSlave() {
+    public void assertCreateShardingOrchestrationEventForMasterSlave() {
         MasterSlaveRuleConfiguration expected = mock(MasterSlaveRuleConfiguration.class);
         when(dataSourceService.getAvailableMasterSlaveRuleConfiguration("sharding_db")).thenReturn(expected);
-        MasterSlaveRuleChangedEvent actual = (MasterSlaveRuleChangedEvent) ruleChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class));
+        MasterSlaveRuleChangedEvent actual = (MasterSlaveRuleChangedEvent) ruleChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class));
         assertThat(actual.getShardingSchemaName(), is("sharding_db"));
         assertThat(actual.getMasterSlaveRuleConfiguration(), is(expected));
     }

diff --git a/.../orchestration/internal/registry/listener/PostShardingOrchestrationEventListenerTest.java b/.../orchestration/internal/registry/listener/PostShardingOrchestrationEventListenerTest.java
@@ -41,7 +41,7 @@ public void assertWatch() {
         PostShardingOrchestrationEventListener postShardingOrchestrationEventListener = new PostShardingOrchestrationEventListener(regCenter, "test") {
 
             @Override
-            protected ShardingOrchestrationEvent createOrchestrationEvent(final DataChangedEvent event) {
+            protected ShardingOrchestrationEvent createShardingOrchestrationEvent(final DataChangedEvent event) {
                 return mock(ShardingOrchestrationEvent.class);
             }
         };

diff --git a/...re/orchestration/internal/registry/state/listener/DataSourceStateChangedListenerTest.java b/...re/orchestration/internal/registry/state/listener/DataSourceStateChangedListenerTest.java
@@ -51,9 +51,9 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEvent() {
+    public void assertCreateShardingOrchestrationEvent() {
         OrchestrationShardingSchemaGroup expected = mock(OrchestrationShardingSchemaGroup.class);
         when(dataSourceService.getDisabledSlaveSchemaGroup()).thenReturn(expected);
-        assertThat(dataSourceStateChangedListener.createOrchestrationEvent(mock(DataChangedEvent.class)).getDisabledGroup(), is(expected));
+        assertThat(dataSourceStateChangedListener.createShardingOrchestrationEvent(mock(DataChangedEvent.class)).getDisabledGroup(), is(expected));
     }
 }
diff --git a/...here/orchestration/internal/registry/state/listener/InstanceStateChangedListenerTest.java b/...here/orchestration/internal/registry/state/listener/InstanceStateChangedListenerTest.java
@@ -45,16 +45,16 @@ public void setUp() {
     }
 
     @Test
-    public void assertCreateOrchestrationEventWhenEnabled() {
+    public void assertCreateShardingOrchestrationEventWhenEnabled() {
         DataChangedEvent dataChangedEvent = new DataChangedEvent("test/test_ds", "", ChangedType.UPDATED);
         when(regCenter.get("test/test_ds")).thenReturn("");
-        assertFalse(instanceStateChangedListener.createOrchestrationEvent(dataChangedEvent).isCircuitBreak());
+        assertFalse(instanceStateChangedListener.createShardingOrchestrationEvent(dataChangedEvent).isCircuitBreak());
     }
 
     @Test
-    public void assertCreateOrchestrationEventWhenDisabled() {
+    public void assertCreateShardingOrchestrationEventWhenDisabled() {
         DataChangedEvent dataChangedEvent = new DataChangedEvent("test/test_ds", StateNodeStatus.DISABLED.name(), ChangedType.UPDATED);
         when(regCenter.get("test/test_ds")).thenReturn(StateNodeStatus.DISABLED.name());
-        assertTrue(instanceStateChangedListener.createOrchestrationEvent(dataChangedEvent).isCircuitBreak());
+        assertTrue(instanceStateChangedListener.createShardingOrchestrationEvent(dataChangedEvent).isCircuitBreak());
     }
 }