From 73495d2dcc4abc1beef33cc5106402f9d2dc54fe Mon Sep 17 00:00:00 2001 From: theonefx Date: Mon, 9 Mar 2020 11:15:45 +0800 Subject: [PATCH] remove force dependency code of spring-cloud in AliCloudContextAutoConfiguration --- .../AliCloudContextAutoConfiguration.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java b/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java index 48e03d94..6f64a533 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java +++ b/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java @@ -16,6 +16,7 @@ package com.alibaba.alicloud.context; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; @@ -27,13 +28,23 @@ import org.springframework.context.annotation.Configuration; * @author xiaolongzuo */ @Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties({ AliCloudProperties.class, InetUtilsProperties.class }) public class AliCloudContextAutoConfiguration { - @Bean - @ConditionalOnMissingBean - public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) { - return new InetUtils(inetUtilsProperties); + @EnableConfigurationProperties(AliCloudProperties.class) + static class AliCloudPropertiesInit { + + } + + @EnableConfigurationProperties(InetUtilsProperties.class) + @ConditionalOnClass(InetUtilsProperties.class) + static class InetUtilsPropertiesInit { + + @Bean + @ConditionalOnMissingBean + public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) { + return new InetUtils(inetUtilsProperties); + } + } }