Merge pull request #44 from sharding-sphere/dev

update from origin

Author: beckhampu

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationListenerManager.java

@@ -19,7 +19,9 @@
 
 import io.shardingsphere.core.config.DataSourceConfiguration;
 import io.shardingsphere.core.event.ShardingEventBusInstance;
+import io.shardingsphere.core.rule.Authentication;
 import io.shardingsphere.core.rule.ShardingRule;
+import io.shardingsphere.orchestration.internal.event.config.ConfigurationChangedEvent;
 import io.shardingsphere.orchestration.internal.event.config.MasterSlaveConfigurationChangedEvent;
 import io.shardingsphere.orchestration.internal.event.config.ShardingConfigurationChangedEvent;
 import io.shardingsphere.orchestration.internal.listener.ListenerManager;
@@ -29,6 +31,7 @@
 import io.shardingsphere.orchestration.reg.listener.EventListener;
 
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Configuration listener manager.
@@ -116,22 +119,23 @@ private void watchProxy(final String path) {
             @Override
             public void onChange(final DataChangedEvent event) {
                 if (DataChangedEvent.Type.UPDATED == event.getEventType()) {
-                    if (configService.isShardingRule(shardingSchemaName)) {
-                        Map<String, DataSourceConfiguration> dataSourceParameterMap = dataSourceService.getAvailableDataSourceConfigurations(shardingSchemaName);
-                        ShardingConfigurationChangedEvent shardingEvent = new ShardingConfigurationChangedEvent(
-                                shardingSchemaName, dataSourceParameterMap,
-                                new ShardingRule(dataSourceService.getAvailableShardingRuleConfiguration(shardingSchemaName), dataSourceParameterMap.keySet()), 
-                                configService.loadAuthentication(), configService.loadProperties());
-                        ShardingEventBusInstance.getInstance().post(shardingEvent);
-                    } else {
-                        MasterSlaveConfigurationChangedEvent masterSlaveEvent = new MasterSlaveConfigurationChangedEvent(
-                                shardingSchemaName, dataSourceService.getAvailableDataSourceConfigurations(shardingSchemaName),
-                                dataSourceService.getAvailableMasterSlaveRuleConfiguration(shardingSchemaName),
-                                configService.loadAuthentication(), configService.loadProperties());
-                        ShardingEventBusInstance.getInstance().post(masterSlaveEvent);
-                    }
+                    Map<String, DataSourceConfiguration> dataSourceConfigurations = dataSourceService.getAvailableDataSourceConfigurations(shardingSchemaName);
+                    Authentication authentication = configService.loadAuthentication();
+                    Properties props = configService.loadProperties();
+                    ShardingEventBusInstance.getInstance().post(configService.isShardingRule(shardingSchemaName)
+                            ? getShardingEvent(dataSourceConfigurations, authentication, props) : getMasterSlaveEvent(dataSourceConfigurations, authentication, props));
                 }
             }
+            
+            private ConfigurationChangedEvent getShardingEvent(final Map<String, DataSourceConfiguration> dataSourceConfigurations, final Authentication authentication, final Properties props) {
+                return new ShardingConfigurationChangedEvent(shardingSchemaName, dataSourceConfigurations,
+                        new ShardingRule(dataSourceService.getAvailableShardingRuleConfiguration(shardingSchemaName), dataSourceConfigurations.keySet()), authentication, props);
+            }
+            
+            private ConfigurationChangedEvent getMasterSlaveEvent(final Map<String, DataSourceConfiguration> dataSourceConfigurations, final Authentication authentication, final Properties props) {
+                return new MasterSlaveConfigurationChangedEvent(shardingSchemaName, dataSourceConfigurations,
+                        dataSourceService.getAvailableMasterSlaveRuleConfiguration(shardingSchemaName), authentication, props);
+            }
         });
     }
 }

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ConfigurationChangedEvent.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016-2018 shardingsphere.io.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package io.shardingsphere.orchestration.internal.event.config;
+
+import io.shardingsphere.core.config.DataSourceConfiguration;
+import io.shardingsphere.core.rule.Authentication;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Configuration changed event.
+ *
+ * @author zhangliang
+ */
+@RequiredArgsConstructor
+@Getter
+public abstract class ConfigurationChangedEvent {
+    
+    private final String schemaName;
+    
+    private final Map<String, DataSourceConfiguration> dataSourceConfigurations;
+    
+    private final Authentication authentication;
+    
+    private final Properties props;
+}

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/MasterSlaveConfigurationChangedEvent.java

@@ -21,7 +21,6 @@
 import io.shardingsphere.core.config.DataSourceConfiguration;
 import io.shardingsphere.core.rule.Authentication;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 import java.util.Map;
 import java.util.Properties;
@@ -31,17 +30,14 @@
  *
  * @author zhangliang
  */
-@RequiredArgsConstructor
 @Getter
-public final class MasterSlaveConfigurationChangedEvent {
-    
-    private final String schemaName;
-    
-    private final Map<String, DataSourceConfiguration> dataSourceConfigurations;
+public final class MasterSlaveConfigurationChangedEvent extends ConfigurationChangedEvent {
 
     private final MasterSlaveRuleConfiguration masterSlaveRuleConfig;
 
-    private final Authentication authentication;
-    
-    private final Properties props;
+    public MasterSlaveConfigurationChangedEvent(final String schemaName, final Map<String, DataSourceConfiguration> dataSourceConfigurations, 
+                                                final MasterSlaveRuleConfiguration masterSlaveRuleConfig, final Authentication authentication, final Properties props) {
+        super(schemaName, dataSourceConfigurations, authentication, props);
+        this.masterSlaveRuleConfig = masterSlaveRuleConfig;
+    }
 }

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/event/config/ShardingConfigurationChangedEvent.java

@@ -21,7 +21,6 @@
 import io.shardingsphere.core.rule.Authentication;
 import io.shardingsphere.core.rule.ShardingRule;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 import java.util.Map;
 import java.util.Properties;
@@ -31,17 +30,14 @@
  *
  * @author zhangliang
  */
-@RequiredArgsConstructor
 @Getter
-public final class ShardingConfigurationChangedEvent {
-    
-    private final String schemaName;
-    
-    private final Map<String, DataSourceConfiguration> dataSourceConfigurations;
+public final class ShardingConfigurationChangedEvent extends ConfigurationChangedEvent {
 
     private final ShardingRule shardingRule;
 
-    private final Authentication authentication;
-    
-    private final Properties props;
+    public ShardingConfigurationChangedEvent(final String schemaName, final Map<String, DataSourceConfiguration> dataSourceConfigurations, 
+                                             final ShardingRule shardingRule, final Authentication authentication, final Properties props) {
+        super(schemaName, dataSourceConfigurations, authentication, props);
+        this.shardingRule = shardingRule;
+    }
 }