From 652354faf34b3180a449d14cd6fcea7d9a724b55 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 1 Sep 2023 23:57:31 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20springboot=20?= =?UTF-8?q?2.7=20spi=20openfeign=20=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openfeign/PigxFeignClientsRegistrar.java | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java index fbc46a29c..c247dd7c3 100644 --- a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java +++ b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java @@ -90,12 +90,11 @@ public class PigxFeignClientsRegistrar if (registry.containsBeanDefinition(className)) { continue; } - - registerClientConfiguration(registry, getClientName(attributes), className, attributes.get("configuration")); + registerClientConfiguration(registry, getClientName(attributes), 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); @@ -113,13 +112,8 @@ public class PigxFeignClientsRegistrar } definition.addPropertyValue("type", className); - 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("decode404", attributes.get("decode404")); + definition.addPropertyValue("fallback", attributes.get("fallback")); definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory")); definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); @@ -254,16 +248,6 @@ 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;