Merge pull request #28 from mercyblitz/dev-1.x

Polish #27

.github/workflows/maven-build.yml

@@ -12,7 +12,7 @@ on:
   push:
     branches: [ 'dev-1.x' ]
   pull_request:
-    branches: [ 'release-1.x' ]
+    branches: [ 'dev-1.x' , 'release-1.x' ]
 
 jobs:
   build:

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java

@@ -9,12 +9,19 @@
 import java.lang.annotation.Target;
 
 /**
+ * Enable Feign Auto Refresh
+ *
  * @author <a href="mailto:maimengzzz@gmail.com">韩超</a>
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @see FeignClientAutoRefreshAutoConfiguration
  * @since 0.0.1
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented
-@Import(FeignClientAutoRefreshConfiguration.class)
+@Import(FeignClientAutoRefreshAutoConfiguration.class)
 public @interface EnableFeignAutoRefresh {
+
+    class Marker {
+    }
 }

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshConfiguration.java → microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshAutoConfiguration.java

@@ -5,22 +5,29 @@
 import io.microsphere.spring.cloud.openfeign.components.NoOpRequestInterceptor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignBuilderCustomizer;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 import org.springframework.context.annotation.Bean;
 
 /**
+ * The Auto-Configuration class for {@link EnableFeignAutoRefresh}
+ *
  * @author <a href="mailto:maimengzzz@gmail.com">韩超</a>
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @see EnableFeignAutoRefresh
  * @since 0.0.1
  */
+@ConditionalOnBean(EnableFeignAutoRefresh.Marker.class)
 @AutoConfigureAfter(ConfigurationPropertiesRebinderAutoConfiguration.class)
-public class FeignClientAutoRefreshConfiguration {
-
+public class FeignClientAutoRefreshAutoConfiguration {
 
     @Bean
     public FeignBuilderCustomizer addDefaultRequestInterceptorCustomizer() {
-        return builder -> {builder.requestInterceptor(NoOpRequestInterceptor.INSTANCE);};
+        return builder -> {
+            builder.requestInterceptor(NoOpRequestInterceptor.INSTANCE);
+        };
     }
 
     @Bean

microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+io.microsphere.spring.cloud.openfeign.autoconfigure.FeignClientAutoRefreshAutoConfiguration