Polish

commons/common-util/src/main/java/com/schbrain/common/util/EnvUtils.java

@@ -58,6 +58,11 @@ public class EnvUtils {
         return profiles[0];
     }
 
+    public static boolean runningOnCloudPlatform() {
+        Environment environment = SpringUtil.getBean(Environment.class);
+        return runningOnCloudPlatform(environment);
+    }
+
     public static boolean runningOnCloudPlatform(Environment environment) {
         CloudPlatform cloudPlatform = CloudPlatform.getActive(environment);
         return cloudPlatform != null && cloudPlatform != CloudPlatform.NONE;

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java

@@ -137,11 +137,7 @@ public class ApolloConfigurationInitializerEnvironmentPostProcessor extends Logg
      * @see #getApolloMetaServerUrl(org.springframework.core.env.ConfigurableEnvironment, String)
      */
     private String getEnv(ConfigurableEnvironment environment) {
-        String profile = EnvUtils.getProfile(environment);
-        if (profile == null) {
-            profile = EnvUtils.DEVELOPMENT;
-        }
-        return profile;
+        return EnvUtils.getProfile(environment);
     }
 
     /**
@@ -151,13 +147,11 @@ public class ApolloConfigurationInitializerEnvironmentPostProcessor extends Logg
      */
     @SuppressWarnings("JavadocReference")
     private String getAppId(ConfigurableEnvironment environment) {
-        String appId;
         if (environment.containsProperty(APP_ID)) {
-            appId = environment.getRequiredProperty(APP_ID);
+            return environment.getRequiredProperty(APP_ID);
         } else {
-            appId = ApplicationName.get(environment);
+            return ApplicationName.get(environment);
         }
-        return appId;
     }
 
 }
\ No newline at end of file

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java

@@ -2,7 +2,7 @@ package com.schbrain.framework.autoconfigure.apollo;
 
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.ConfigService;
-import com.schbrain.common.util.properties.OrderedMapPropertySource;
+import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource;
 import com.schbrain.common.util.support.ConfigurableProperties;
 import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent;
 import com.schbrain.framework.autoconfigure.apollo.event.listener.ConfigLoadedEventListener;

commons/common-util/src/main/java/com/schbrain/common/util/properties/OrderedMapPropertySource.java → starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/config/OrderedMapPropertySource.java

-package com.schbrain.common.util.properties;
+package com.schbrain.framework.autoconfigure.apollo.config;
 
 import org.springframework.core.env.MapPropertySource;
 

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java

 package com.schbrain.framework.autoconfigure.apollo.event;
 
-import com.schbrain.common.util.properties.OrderedMapPropertySource;
 import com.schbrain.common.util.support.ConfigurableProperties;
+import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource;
 import lombok.Getter;
 import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.SpringApplication;
@@ -38,8 +38,9 @@ public class ConfigLoadedEvent extends ApplicationEvent {
         this.bootstrapContext = bootstrapContext;
     }
 
-    public ConfigurableProperties getConfigurableProperties() {
-        return (ConfigurableProperties) getSource();
+    @Override
+    public ConfigurableProperties getSource() {
+        return (ConfigurableProperties) super.getSource();
     }
 
 }
\ No newline at end of file

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java

@@ -23,9 +23,9 @@ public abstract class GenericConfigLoadedEventListener<T extends ConfigurablePro
     @Override
     public void onApplicationEvent(ConfigLoadedEvent event) {
         event.getSpringApplication().addInitializers(this);
-        if (propertiesType.isInstance(event.getConfigurableProperties())) {
+        if (propertiesType.isInstance(event.getSource())) {
             this.log = event.getDeferredLogFactory().getLog(getClass());
-            this.onConfigLoaded(event, (T) event.getConfigurableProperties());
+            this.onConfigLoaded(event, (T) event.getSource());
         }
     }
 

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/util/ConfigUtils.java

@@ -2,7 +2,7 @@ package com.schbrain.framework.autoconfigure.apollo.util;
 
 import com.ctrip.framework.apollo.Config;
 import com.google.common.collect.Maps;
-import com.schbrain.common.util.properties.OrderedMapPropertySource;
+import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.env.ConfigurableEnvironment;
 

starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/initializer/DubboValidationInitializer.java

 package com.schbrain.framework.autoconfigure.dubbo.initializer;
 
-import com.schbrain.common.util.properties.OrderedMapPropertySource;
+import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource;
 import org.springframework.util.ClassUtils;
 
 /**

starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigLoadedEventListener.java

 package com.schbrain.framework.autoconfigure.dubbo.listener;
 
-import com.schbrain.common.util.properties.OrderedMapPropertySource;
+import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource;
 import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent;
 import com.schbrain.framework.autoconfigure.apollo.event.listener.GenericConfigLoadedEventListener;
 import com.schbrain.framework.autoconfigure.dubbo.initializer.DubboValidationInitializer;

starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/LoggerConfigurationInitializer.java

@@ -40,11 +40,8 @@ import java.util.List;
 public class LoggerConfigurationInitializer {
 
     private final ConfigurableEnvironment environment;
-
     private final LoggerProperties properties;
-
     private final HostInfo hostInfo;
-
     private final String applicationName;
 
     private volatile boolean initialized;

starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java

@@ -33,21 +33,20 @@ import static org.springframework.boot.context.logging.LoggingApplicationListene
  */
 public class LoggerConfigLoadedEventListener extends GenericConfigLoadedEventListener<LoggerProperties> {
 
-    private LoggerConfigurationInitializer initializer;
+    private LoggerConfigurationInitializer loggerInitializer;
 
     @Override
     public void initialize(ConfigurableApplicationContext applicationContext) {
-        initializer.init();
+        loggerInitializer.init();
     }
 
     @Override
     protected void onConfigLoaded(ConfigLoadedEvent event, LoggerProperties properties) {
-        ConfigurableEnvironment environment = event.getEnvironment();
         HostInfo hostInfo = InetUtils.findFirstNonLoopBackHostInfo();
         Map<String, String> hostInfoProperties = buildHostInfoProperties(hostInfo);
         event.getPropertySource().addProperties(hostInfoProperties);
-        configLoggingFileLocation(environment, properties.getLogConfigNamespace());
-        this.initializer = new LoggerConfigurationInitializer(environment, properties, hostInfo);
+        configLoggingFileLocation(event.getEnvironment(), properties.getLogConfigNamespace());
+        this.loggerInitializer = new LoggerConfigurationInitializer(event.getEnvironment(), properties, hostInfo);
     }
 
     /**