♻️ Refactoring code. 重构feign client registrar

pigx-common/pigx-common-feign/src/main/java/com/pig4cloud/pigx/common/feign/annotation/EnablePigxFeignClients.java

@@ -19,8 +19,6 @@ package com.pig4cloud.pigx.common.feign.annotation;
 
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClientsConfiguration;
-import org.springframework.cloud.openfeign.PigxFeignClientsRegistrar;
-import org.springframework.context.annotation.Import;
 
 import java.lang.annotation.*;
 
@@ -32,7 +30,6 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @EnableFeignClients
-@Import(PigxFeignClientsRegistrar.class)
 public @interface EnablePigxFeignClients {
 
 	/**

pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.boot.context.annotation.ImportCandidates;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -36,6 +37,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -67,8 +69,11 @@ public class PigxFeignClientsRegistrar
 	}
 
 	private void registerFeignClients(BeanDefinitionRegistry registry) {
-		List<String> feignClients = SpringFactoriesLoader.loadFactoryNames(getSpringFactoriesLoaderFactoryClass(),
-				getBeanClassLoader());
+		List<String> feignClients = new ArrayList<>();
+
+		// 支持 springboot 2.7 + 最新版本的配置方式
+		ImportCandidates.load(FeignClient.class, getBeanClassLoader()).forEach(feignClients::add);
+
 		// 如果 spring.factories 里为空
 		if (feignClients.isEmpty()) {
 			return;
@@ -85,11 +90,12 @@ public class PigxFeignClientsRegistrar
 				if (registry.containsBeanDefinition(className)) {
 					continue;
 				}
-				registerClientConfiguration(registry, getClientName(attributes), attributes.get("configuration"));
+
+				registerClientConfiguration(registry, getClientName(attributes), className, attributes.get("configuration"));
 
 				validate(attributes);
 				BeanDefinitionBuilder definition = BeanDefinitionBuilder
-						.genericBeanDefinition(FeignClientFactoryBean.class);
+					.genericBeanDefinition(FeignClientFactoryBean.class);
 				definition.addPropertyValue("url", getUrl(attributes));
 				definition.addPropertyValue("path", getPath(attributes));
 				String name = getName(attributes);
@@ -107,8 +113,13 @@ public class PigxFeignClientsRegistrar
 				}
 
 				definition.addPropertyValue("type", className);
-				definition.addPropertyValue("decode404", attributes.get("decode404"));
-				definition.addPropertyValue("fallback", attributes.get("fallback"));
+				definition.addPropertyValue("dismiss404",
+						Boolean.parseBoolean(String.valueOf(attributes.get("dismiss404"))));
+				Object fallbackFactory = attributes.get("fallbackFactory");
+				if (fallbackFactory != null) {
+					definition.addPropertyValue("fallbackFactory", fallbackFactory instanceof Class ? fallbackFactory
+							: ClassUtils.resolveClassName(fallbackFactory.toString(), null));
+				}
 				definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 				definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 
@@ -243,6 +254,16 @@ public class PigxFeignClientsRegistrar
 				builder.getBeanDefinition());
 	}
 
+	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, Object className,
+	                                         Object configuration) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(FeignClientSpecification.class);
+		builder.addConstructorArgValue(name);
+		builder.addConstructorArgValue(className);
+		builder.addConstructorArgValue(configuration);
+		registry.registerBeanDefinition(name + "." + FeignClientSpecification.class.getSimpleName(),
+				builder.getBeanDefinition());
+	}
+
 	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;