diff --git a/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java index f7fb7af48482248748eff51f2ed9851bc3aceca1..7b77fd4938ea4f65dc9c61dbcbaa855d704f3712 100644 --- a/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-brpc/src/main/java/com/dtp/starter/adapter/brpc/autoconfigure/BrpcTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.apapter.brpc.client.StarlightClientDtpAdapter; import com.dtp.apapter.brpc.server.StarlightServerDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -18,6 +19,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class BrpcTpAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java b/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java index 2c44dcbb7d0dd980a7276a3ea21c1b45ded8df68..795ef402065fbb850555ba52508dd3007ecfe5df 100644 --- a/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-common/src/main/java/com/dtp/starter/adapter/common/autoconfigure/AdapterCommonAutoConfiguration.java @@ -3,6 +3,8 @@ package com.dtp.starter.adapter.common.autoconfigure; import com.dtp.adapter.common.DtpAdapterListener; import com.dtp.common.properties.DtpProperties; import com.dtp.common.constant.DynamicTpConst; +import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -19,6 +21,7 @@ import org.springframework.context.annotation.DependsOn; @Configuration @EnableConfigurationProperties(DtpProperties.class) @ConditionalOnProperty(name = DynamicTpConst.DTP_ENABLED_PROP, matchIfMissing = true, havingValue = "true") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class AdapterCommonAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java index 3498c9dba5e095cb5d86d7f26b6e9fa9d40cc237..4d2deadeb6a7c5370c9df0948df11471610a09b4 100644 --- a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/AlibabaDubboTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.adapter.dubbo.alibaba.AlibabaDubboDtpAdapter; import com.dtp.starter.adapter.dubbo.autoconfigure.condition.ConditionOnAlibabaDubboApp; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionOnAlibabaDubboApp @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class AlibabaDubboTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java index e7266c4d5f51f36e25df3969e2dad58ede70bbf7..c43fb04a33306bc89095a304cffb3afaa6e4093b 100644 --- a/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-dubbo/src/main/java/com/dtp/starter/adapter/dubbo/autoconfigure/ApacheDubboTpAutoConfiguration.java @@ -4,6 +4,7 @@ import com.dtp.adapter.dubbo.apache.ApacheDubboDtpAdapter; import com.dtp.starter.adapter.dubbo.autoconfigure.condition.ConditionOnApacheDubboApp; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionOnApacheDubboApp @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class ApacheDubboTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java index a031ffba8db0968ce0c319941debc0dc4f7ff567..fe4669a5761c544ee838132739edb9247d0ea113 100644 --- a/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-grpc/src/main/java/com/dtp/starter/adapter/grpc/autoconfigure/GrpcTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.grpc.autoconfigure; import com.dtp.adapter.grpc.GrpcDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "grpc.server", value = {"port"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class GrpcTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java index 69706414f4aca5bd1d60bba07b82b09c8029869b..2b63785f8b950cb72807c1a1ae8060f9f913382d 100644 --- a/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-hystrix/src/main/java/com/dtp/starter/adapter/hystrix/autoconfigure/HystrixTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.hystrix.autoconfigure; import com.dtp.adapter.hystrix.HystrixDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.netflix.hystrix.Hystrix") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class HystrixTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java index 8ef5db7909b400cb175a591e40970429ad9d1df1..d9ecd188c90178487ce1cead6e437693b7bafbb2 100644 --- a/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-motan/src/main/java/com/dtp/starter/adapter/motan/autoconfigure/MotanTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.motan.autoconfigure; import com.dtp.adapter.motan.MotanDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.weibo.api.motan.config.springsupport.ServiceConfigBean") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class MotanTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java index b1b60d7ca5fe363c24dfb6cced4677a409301989..92bc06411cb65603518d1c5cdf810a81e0c231ef 100644 --- a/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-okhttp3/src/main/java/com/dtp/starter/adapter/okhttp3/autoconfigure/Okhttp3TpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.okhttp3.autoconfigure; import com.dtp.adapter.okhttp3.Okhttp3DtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "okhttp3.OkHttpClient") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class Okhttp3TpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java index 0a57ee9689ed10661d2ef290fef5e9466c153ea6..c19e751904e4790ca053fc53654e397e9d76a506 100644 --- a/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rabbitmq/src/main/java/com/dtp/starter/adapter/rabbitmq/autoconfigure/RabbitMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rabbitmq.autoconfigure; import com.dtp.adapter.rabbitmq.RabbitMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "spring.rabbitmq", value = {"host"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class RabbitMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java index 52f519371b2eebadb8fce9520449d2ef8b8f80ab..91f30be6673d922eb7ffdd681c1e8d10567eb00d 100644 --- a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/RocketMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rocketmq.autoconfigure; import com.dtp.adapter.rocketmq.RocketMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "rocketmq", value = {"name-server"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class RocketMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java index 3951d6a5a8b5438f7c02dc5141cc22bb9b756ba1..46d89532adba7bd149bba900e94c494ae844ef72 100644 --- a/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-rocketmq/src/main/java/com/dtp/starter/adapter/rocketmq/autoconfigure/StreamRocketMqTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.rocketmq.autoconfigure; import com.dtp.adapter.rocketmq.StreamRocketMqDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(prefix = "spring.cloud.stream.rocketmq.binder", value = {"name-server"}) +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @SuppressWarnings("all") public class StreamRocketMqTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java index 1357466223595671e258e05f6bf6fb02a8840a48..9a23a59bf575bbf867a25d1c5af9c8b78df5179e 100644 --- a/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-sofa/src/main/java/com/dtp/starter/adapter/sofa/autoconfigure/SofaTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.sofa.autoconfigure; import com.dtp.adapter.sofa.SofaDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnClass(name = "com.alipay.sofa.rpc.config.UserThreadPoolManager") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class SofaTpAutoConfiguration { diff --git a/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java index 6644d272219f782ee4125905e4291cb4d111d952..f9cf4a897f65df3ca961195cb3bc148f9f7cbe19 100644 --- a/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-tars/src/main/java/com/dtp/starter/adapter/tars/autoconfigure/TarsTpAutoConfiguration.java @@ -3,6 +3,7 @@ package com.dtp.starter.adapter.tars.autoconfigure; import com.dtp.adapter.tars.TarsDtpAdapter; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -17,6 +18,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) @ConditionalOnClass(name = "com.qq.tars.client.Communicator") +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) public class TarsTpAutoConfiguration { @Bean diff --git a/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java b/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java index 4b405e0b444e5cb7623957b789e818ad29df58f2..36cf6066fc49a1589409f05f8f98efff806698b6 100644 --- a/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java +++ b/starter/starter-adapter/starter-adapter-webserver/src/main/java/com/dtp/starter/adapter/webserver/autocconfigure/WebServerTpAutoConfiguration.java @@ -8,6 +8,7 @@ import com.dtp.starter.adapter.webserver.autocconfigure.condition.ConditionalOnT import com.dtp.starter.adapter.webserver.autocconfigure.condition.ConditionalOnUndertowWebServer; import com.dtp.starter.common.autoconfigure.BaseBeanAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -20,6 +21,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnWebApplication +@ConditionalOnBean({BaseBeanAutoConfiguration.class}) @AutoConfigureAfter({BaseBeanAutoConfiguration.class}) public class WebServerTpAutoConfiguration {