Dev

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/FeignComponentProvider.java

@@ -0,0 +1,37 @@
+package io.microsphere.spring.cloud.openfeign;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.cloud.context.named.NamedContextFactory;
+import org.springframework.cloud.openfeign.FeignClientSpecification;
+
+/**
+ * @author <a href="mailto:[email protected]">韩超</a>
+ * @since 0.0.1
+ */
+public class FeignComponentProvider implements BeanFactoryAware {
+
+    private final NamedContextFactory<FeignClientSpecification> contextFactory;
+
+    private BeanFactory mainBeanFactory;
+
+    public FeignComponentProvider(NamedContextFactory<FeignClientSpecification> contextFactory) {
+        this.contextFactory = contextFactory;
+    }
+
+    public <T> T getInstance(String contextName, Class<T> type) {
+        T component = this.contextFactory.getInstance(contextName, type);
+        if (component == null && mainBeanFactory instanceof AutowireCapableBeanFactory) {
+            //create new
+            return ((AutowireCapableBeanFactory)this.mainBeanFactory).createBean(type);
+        }
+        return component;
+    }
+
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        this.mainBeanFactory = beanFactory;
+    }
+}

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

@@ -4,6 +4,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -19,6 +20,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented
+@Inherited
 @Import(EnableFeignAutoRefresh.Marker.class)
 public @interface EnableFeignAutoRefresh {
 

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

@@ -1,15 +1,19 @@
 package io.microsphere.spring.cloud.openfeign.autoconfigure;
 
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import io.microsphere.spring.cloud.openfeign.autorefresh.FeignClientConfigurationChangedListener;
 import io.microsphere.spring.cloud.openfeign.autorefresh.FeignComponentRegistry;
 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.boot.context.event.ApplicationReadyEvent;
+import org.springframework.cloud.context.named.NamedContextFactory;
 import org.springframework.cloud.openfeign.FeignBuilderCustomizer;
 import org.springframework.cloud.openfeign.FeignClientProperties;
+import org.springframework.cloud.openfeign.FeignClientSpecification;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.event.EventListener;
 
 /**
  * The Auto-Configuration class for {@link EnableFeignAutoRefresh}
@@ -20,7 +24,6 @@
  * @since 0.0.1
  */
 @ConditionalOnBean(EnableFeignAutoRefresh.Marker.class)
-@AutoConfigureAfter(ConfigurationPropertiesRebinderAutoConfiguration.class)
 public class FeignClientAutoRefreshAutoConfiguration {
 
     @Bean
@@ -30,9 +33,12 @@ public FeignBuilderCustomizer addDefaultRequestInterceptorCustomizer() {
         };
     }
 
-    @Bean
-    public FeignClientConfigurationChangedListener feignClientConfigurationChangedListener(FeignComponentRegistry registry) {
-        return new FeignClientConfigurationChangedListener(registry);
+    @EventListener(ApplicationReadyEvent.class)
+    public void onApplicationReadyEvent(ApplicationReadyEvent event) {
+        /**
+         * Make sure the FeignClientConfigurationChangedListener is registered after the ConfigurationPropertiesRebinder
+         */
+        registerFeignClientConfigurationChangedListener(event);
     }
 
     @Bean
@@ -45,4 +51,15 @@ public FeignClientSpecificationPostProcessor feignClientSpecificationPostProcess
         return new FeignClientSpecificationPostProcessor();
     }
 
+    @Bean
+    public FeignComponentProvider feignComponentProvider(NamedContextFactory<FeignClientSpecification> contextFactory) {
+        return new FeignComponentProvider(contextFactory);
+    }
+
+    private void registerFeignClientConfigurationChangedListener(ApplicationReadyEvent event) {
+        ConfigurableApplicationContext context = event.getApplicationContext();
+        FeignComponentRegistry feignComponentRegistry = context.getBean(FeignComponentRegistry.class);
+        context.addApplicationListener(new FeignClientConfigurationChangedListener(feignComponentRegistry));
+    }
+
 }

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java

@@ -8,6 +8,7 @@
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import io.microsphere.spring.cloud.openfeign.components.DecoratedContract;
 import io.microsphere.spring.cloud.openfeign.components.DecoratedDecoder;
 import io.microsphere.spring.cloud.openfeign.components.DecoratedEncoder;
@@ -16,7 +17,6 @@
 import io.microsphere.spring.cloud.openfeign.components.DecoratedQueryMapEncoder;
 import io.microsphere.spring.cloud.openfeign.components.DecoratedRetryer;
 import org.springframework.beans.BeansException;
-import org.springframework.cloud.openfeign.FeignClientFactory;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -28,22 +28,22 @@
 public class AutoRefreshCapability implements Capability, ApplicationContextAware {
 
     private final FeignComponentRegistry componentRegistry;
-    private final FeignClientFactory feignClientFactory;
+    //private final FeignClientFactory feignClientFactory;
+    private final FeignComponentProvider componentProvider;
     private final FeignClientProperties clientProperties;
 
     private String contextId;
 
-    private static final String CONTEXT_ID_PROPERTY_NAME = "feign.client.name";
 
-    public AutoRefreshCapability(FeignClientProperties clientProperties, FeignClientFactory feignClientFactory, FeignComponentRegistry componentRegistry) {
+    public AutoRefreshCapability(FeignClientProperties clientProperties, FeignComponentProvider componentProvider, FeignComponentRegistry componentRegistry) {
         this.clientProperties = clientProperties;
-        this.feignClientFactory = feignClientFactory;
+        this.componentProvider = componentProvider;
         this.componentRegistry = componentRegistry;
     }
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.contextId = applicationContext.getEnvironment().getProperty(CONTEXT_ID_PROPERTY_NAME);
+        this.contextId = applicationContext.getEnvironment().getProperty("spring.cloud.openfeign.client.name");
     }
 
 
@@ -53,7 +53,7 @@ public Retryer enrich(Retryer retryer) {
             return null;
 
         DecoratedRetryer decoratedRetryer = DecoratedFeignComponent.instantiate(DecoratedRetryer.class, Retryer.class,
-                contextId, feignClientFactory, clientProperties, retryer);
+                contextId, componentProvider, clientProperties, retryer);
 
         this.componentRegistry.register(contextId, decoratedRetryer);
         return decoratedRetryer;
@@ -65,7 +65,7 @@ public Contract enrich(Contract contract) {
             return null;
 
         DecoratedContract decoratedContract = DecoratedFeignComponent.instantiate(DecoratedContract.class, Contract.class,
-                contextId, feignClientFactory, clientProperties, contract);
+                contextId, componentProvider, clientProperties, contract);
         this.componentRegistry.register(contextId, decoratedContract);
         return decoratedContract;
     }
@@ -76,7 +76,7 @@ public Decoder enrich(Decoder decoder) {
             return null;
 
         DecoratedDecoder decoratedDecoder = DecoratedFeignComponent.instantiate(DecoratedDecoder.class, Decoder.class,
-                contextId, feignClientFactory, clientProperties, decoder);
+                contextId, componentProvider, clientProperties, decoder);
         this.componentRegistry.register(contextId, decoratedDecoder);
         return decoratedDecoder;
     }
@@ -87,7 +87,7 @@ public Encoder enrich(Encoder encoder) {
             return null;
 
         DecoratedEncoder decoratedEncoder = DecoratedFeignComponent.instantiate(DecoratedEncoder.class, Encoder.class,
-                contextId, feignClientFactory, clientProperties, encoder);
+                contextId, componentProvider, clientProperties, encoder);
         this.componentRegistry.register(contextId, decoratedEncoder);
         return decoratedEncoder;
     }
@@ -97,7 +97,7 @@ public ErrorDecoder enrich(ErrorDecoder decoder) {
             return null;
 
         DecoratedErrorDecoder decoratedErrorDecoder = DecoratedFeignComponent.instantiate(DecoratedErrorDecoder.class, ErrorDecoder.class,
-                contextId, feignClientFactory, clientProperties, decoder);
+                contextId, componentProvider, clientProperties, decoder);
         this.componentRegistry.register(contextId, decoratedErrorDecoder);
         return decoratedErrorDecoder;
     }
@@ -113,7 +113,7 @@ public QueryMapEncoder enrich(QueryMapEncoder queryMapEncoder) {
             return null;
 
         DecoratedQueryMapEncoder decoratedQueryMapEncoder = DecoratedFeignComponent.instantiate(DecoratedQueryMapEncoder.class, QueryMapEncoder.class,
-                contextId, feignClientFactory, clientProperties, queryMapEncoder);
+                contextId, componentProvider, clientProperties, queryMapEncoder);
 
         this.componentRegistry.register(contextId, decoratedQueryMapEncoder);
         return decoratedQueryMapEncoder;

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java

@@ -19,13 +19,14 @@ public FeignClientConfigurationChangedListener(FeignComponentRegistry registry)
         this.registry = registry;
     }
 
-    private final String PREFIX = "feign.client.config.";
+    private final String PREFIX = "spring.cloud.openfeign.client.config.";
 
     @Override
     public void onApplicationEvent(EnvironmentChangeEvent event) {
         Map<String, Set<String>> effectiveClients = resolveChangedClient(event);
-        effectiveClients.forEach(registry::refresh);
-
+        if (!effectiveClients.isEmpty()) {
+            effectiveClients.forEach(registry::refresh);
+        }
     }
 
     protected Map<String, Set<String>> resolveChangedClient(EnvironmentChangeEvent event) {

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/components/DecoratedContract.java

@@ -2,7 +2,7 @@
 
 import feign.Contract;
 import feign.MethodMetadata;
-import org.springframework.cloud.openfeign.FeignClientFactory;
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 
 import java.util.List;
@@ -13,8 +13,8 @@
  */
 public class DecoratedContract extends DecoratedFeignComponent<Contract> implements Contract {
 
-    public DecoratedContract(String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, Contract delegate) {
-        super(contextId, feignClientFactory, clientProperties, delegate);
+    public DecoratedContract(String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, Contract delegate) {
+        super(contextId, feignComponentProvider, clientProperties, delegate);
     }
 
     @Override

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/components/DecoratedDecoder.java

@@ -4,7 +4,7 @@
 import feign.Response;
 import feign.codec.DecodeException;
 import feign.codec.Decoder;
-import org.springframework.cloud.openfeign.FeignClientFactory;
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 
 import java.io.IOException;
@@ -16,8 +16,8 @@
  */
 public class DecoratedDecoder extends DecoratedFeignComponent<Decoder> implements Decoder {
 
-    public DecoratedDecoder(String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, Decoder delegate) {
-        super(contextId, feignClientFactory, clientProperties, delegate);
+    public DecoratedDecoder(String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, Decoder delegate) {
+        super(contextId, feignComponentProvider, clientProperties, delegate);
     }
 
     @Override

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/components/DecoratedEncoder.java

@@ -3,7 +3,7 @@
 import feign.RequestTemplate;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
-import org.springframework.cloud.openfeign.FeignClientFactory;
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 
 import java.lang.reflect.Type;
@@ -14,8 +14,8 @@
  */
 public class DecoratedEncoder extends DecoratedFeignComponent<Encoder> implements Encoder {
 
-    public DecoratedEncoder(String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, Encoder delegate) {
-        super(contextId, feignClientFactory, clientProperties, delegate);
+    public DecoratedEncoder(String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, Encoder delegate) {
+        super(contextId, feignComponentProvider, clientProperties, delegate);
     }
 
     @Override

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/components/DecoratedErrorDecoder.java

@@ -2,7 +2,7 @@
 
 import feign.Response;
 import feign.codec.ErrorDecoder;
-import org.springframework.cloud.openfeign.FeignClientFactory;
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 
 /**
@@ -11,8 +11,8 @@
  */
 public class DecoratedErrorDecoder extends DecoratedFeignComponent<ErrorDecoder> implements ErrorDecoder {
 
-    public DecoratedErrorDecoder(String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, ErrorDecoder delegate) {
-        super(contextId, feignClientFactory, clientProperties, delegate);
+    public DecoratedErrorDecoder(String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, ErrorDecoder delegate) {
+        super(contextId, feignComponentProvider, clientProperties, delegate);
     }
 
     @Override

microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/components/DecoratedFeignComponent.java

@@ -1,10 +1,10 @@
 package io.microsphere.spring.cloud.openfeign.components;
 
+import io.microsphere.spring.cloud.openfeign.FeignComponentProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
-import org.springframework.cloud.openfeign.FeignClientFactory;
 import org.springframework.cloud.openfeign.FeignClientProperties;
 import org.springframework.lang.NonNull;
 
@@ -19,7 +19,8 @@ public abstract class DecoratedFeignComponent<T> implements Refreshable {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final FeignClientFactory feignClientFactory;
+    //private final FeignClientFactory feignClientFactory;
+    private final FeignComponentProvider componentProvider;
     private final String contextId;
 
     private final FeignClientProperties clientProperties;
@@ -32,9 +33,9 @@ public abstract class DecoratedFeignComponent<T> implements Refreshable {
     private final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
     private final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
 
-    public DecoratedFeignComponent(String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, T delegate) {
+    public DecoratedFeignComponent(String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, T delegate) {
         this.contextId = contextId;
-        this.feignClientFactory = feignClientFactory;
+        this.componentProvider = feignComponentProvider;
         this.clientProperties = clientProperties;
         this.delegate = delegate;
     }
@@ -52,9 +53,9 @@ public T delegate() {
     }
 
     @NonNull
-    public FeignClientFactory getFeignClientFactory() {
-        return this.feignClientFactory;
-    }
+    public FeignComponentProvider getFeignComponentProvider() {
+        return this.componentProvider;
+    };
 
     @NonNull
     public String contextId() {
@@ -83,7 +84,7 @@ protected T loadInstance() {
         String contextId = contextId();
         writeLock.lock();
         try {
-            T component = getFeignClientFactory().getInstance(contextId, componentType);
+            T component = getFeignComponentProvider().getInstance(contextId, componentType);
             if (component == null)
                 component = BeanUtils.instantiateClass(componentType);
             this.delegate = component;
@@ -112,10 +113,10 @@ public String toString() {
     }
 
     public static <W extends DecoratedFeignComponent<T>, T> W instantiate(Class<W> decoratedClass, Class<T> componentClass,
-                                                                          String contextId, FeignClientFactory feignClientFactory, FeignClientProperties clientProperties, T delegate) {
+                                                                          String contextId, FeignComponentProvider feignComponentProvider, FeignClientProperties clientProperties, T delegate) {
         try {
-            Constructor<W> constructor = decoratedClass.getConstructor(String.class, FeignClientFactory.class, FeignClientProperties.class, componentClass);
-            return BeanUtils.instantiateClass(constructor, contextId, feignClientFactory, clientProperties, delegate);
+            Constructor<W> constructor = decoratedClass.getConstructor(String.class, FeignComponentProvider.class, FeignClientProperties.class, componentClass);
+            return BeanUtils.instantiateClass(constructor, contextId, feignComponentProvider, clientProperties, delegate);
         } catch (NoSuchMethodException noSuchMethodException) {
             throw new BeanInstantiationException(decoratedClass, noSuchMethodException.getLocalizedMessage());
         }