Optimized bean define.

Author: caojie09

src/main/java/com/alipay/sofa/dashboard/client/config/SofaDashboardClientAutoConfiguration.java

@@ -16,20 +16,21 @@
  */
 package com.alipay.sofa.dashboard.client.config;
 
-import com.alipay.sofa.dashboard.client.listener.ApplicationContextClosedListener;
-import com.alipay.sofa.dashboard.client.listener.ApplicationContextRefreshedListener;
+import com.alipay.sofa.dashboard.client.listener.SofaDashboardClientApplicationContextClosedListener;
+import com.alipay.sofa.dashboard.client.listener.SofaDashboardClientApplicationContextRefreshedListener;
 import com.alipay.sofa.dashboard.client.registration.SofaDashboardClientRegister;
 import com.alipay.sofa.dashboard.client.zookeeper.ZkCommandClient;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.util.StringUtils;
 
 /**
  * @author: guolei.sgl (guolei.sgl@antfin.com) 2019/2/15 2:03 PM
@@ -38,7 +39,7 @@
 @Configuration
 @EnableConfigurationProperties({ SofaDashboardProperties.class })
 @ConditionalOnWebApplication
-@Conditional(SofaDashboardClientEnabledCondition.class)
+@ConditionalOnProperty(prefix = "com.alipay.sofa.dashboard.client", value = "enable", matchIfMissing = true)
 @ConditionalOnClass(CuratorFramework.class)
 public class SofaDashboardClientAutoConfiguration {
 
@@ -47,8 +48,11 @@ public class SofaDashboardClientAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public SofaDashboardClientRegister registrator(SofaDashboardProperties sofaClientProperties,
-                                                   ZkCommandClient commandClient) {
+    public SofaDashboardClientRegister sofaDashboardClientRegister(SofaDashboardProperties sofaClientProperties,
+                                                                   ZkCommandClient commandClient) {
+        if (StringUtils.isEmpty(sofaClientProperties.getZookeeper().getAddress())) {
+            throw new RuntimeException("please config dashboard client zookeeper address.");
+        }
         return new SofaDashboardClientRegister(sofaClientProperties, commandClient, environment);
     }
 
@@ -60,13 +64,13 @@ public ZkCommandClient zkCommandClient() {
 
     @Bean
     @ConditionalOnMissingBean
-    public ApplicationContextRefreshedListener applicationContextRefreshedListener() {
-        return new ApplicationContextRefreshedListener();
+    public SofaDashboardClientApplicationContextRefreshedListener sofaDashboardClientApplicationContextRefreshedListener() {
+        return new SofaDashboardClientApplicationContextRefreshedListener();
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public ApplicationContextClosedListener applicationContextClosedListener() {
-        return new ApplicationContextClosedListener();
+    public SofaDashboardClientApplicationContextClosedListener sofaDashboardClientApplicationContextClosedListener() {
+        return new SofaDashboardClientApplicationContextClosedListener();
     }
 }

src/main/java/com/alipay/sofa/dashboard/client/config/SofaDashboardClientEnabledCondition.java

@@ -25,11 +25,9 @@
 @ConfigurationProperties(prefix = "com.alipay.sofa.dashboard")
 public class SofaDashboardProperties {
 
-    private static final String              DEFAULT_ADDRESS = "localhost:2181";
+    private SofaDashboardClientProperties    client    = new SofaDashboardClientProperties();
 
-    private SofaDashboardClientProperties    client;
-
-    private SofaDashboardZookeeperProperties zookeeper;
+    private SofaDashboardZookeeperProperties zookeeper = new SofaDashboardZookeeperProperties();
 
     public SofaDashboardClientProperties getClient() {
         return client;
@@ -51,12 +49,12 @@ public static class SofaDashboardClientProperties {
         /**
          * 是否可用
          */
-        private boolean enable;
+        private boolean enable     = true;
 
         /**
          * 实例地址
          */
-        private String  instanceIp;
+        private String  instanceIp = "";
 
         public boolean isEnable() {
             return enable;
@@ -83,7 +81,7 @@ public String toString() {
 
     public static class SofaDashboardZookeeperProperties {
 
-        private String address             = DEFAULT_ADDRESS;
+        private String address;
 
         private int    baseSleepTimeMs     = 1000;
 

src/main/java/com/alipay/sofa/dashboard/client/config/SofaDashboardProperties.java

@@ -28,7 +28,9 @@
  * @author: guolei.sgl (guolei.sgl@antfin.com) 2019/4/11 6:53 PM
  * @since:
  **/
-public class ApplicationContextClosedListener implements ApplicationListener<ContextClosedEvent> {
+public class SofaDashboardClientApplicationContextClosedListener
+                                                                implements
+                                                                ApplicationListener<ContextClosedEvent> {
 
     @Autowired
     private SofaDashboardClientRegister sofaDashboardClientRegister;

…er/ApplicationContextClosedListener.java …entApplicationContextClosedListener.javasrc/main/java/com/alipay/sofa/dashboard/client/listener/ApplicationContextClosedListener.java renamed to src/main/java/com/alipay/sofa/dashboard/client/listener/SofaDashboardClientApplicationContextClosedListener.java src/main/java/com/alipay/sofa/dashboard/client/listener/ApplicationContextClosedListener.java renamed to src/main/java/com/alipay/sofa/dashboard/client/listener/SofaDashboardClientApplicationContextClosedListener.java

@@ -33,11 +33,12 @@
  * @author: guolei.sgl (guolei.sgl@antfin.com) 2019/2/19 2:17 PM
  * @since:
  **/
-public class ApplicationContextRefreshedListener implements
-                                                ApplicationListener<ContextRefreshedEvent> {
+public class SofaDashboardClientApplicationContextRefreshedListener
+                                                                   implements
+                                                                   ApplicationListener<ContextRefreshedEvent> {
 
     private static final Logger         LOGGER = LoggerFactory
-                                                   .getLogger(ApplicationContextRefreshedListener.class);
+                                                   .getLogger(SofaDashboardClientApplicationContextRefreshedListener.class);
 
     @Autowired
     private ReadinessCheckListener      readinessCheckListener;