chore: Add ConditionalOnMissingBean to all beans (#1185)

Follow up to #1180
springwolf · Feb 14, 2025 · 8f721b9 · 8f721b9
1 parent 4562841
commit 8f721b9
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 3 deletions.
diff --git a/...s/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java b/...s/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
@@ -4,6 +4,7 @@
 import io.github.springwolf.addons.generic_binding.annotation.processor.AsyncGenericOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,6 +16,7 @@
 public class SpringwolfGenericBindingAutoConfiguration {
 
     @Bean
+    @ConditionalOnMissingBean
     @Order(value = BindingProcessorPriority.GENERIC_BINDING)
     public AsyncGenericOperationBindingProcessor asyncGenericOperationBindingProcessor(
             StringValueResolver stringValueResolver) {

diff --git a/...re/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java b/...re/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java
@@ -176,6 +176,7 @@ public SchemaWalkerProvider schemaWalkerProvider(List<SchemaWalker> schemaWalker
     }
 
     @Bean
+    @ConditionalOnMissingBean(name = "jsonSchemaWalker")
     public SchemaWalker jsonSchemaWalker() {
         return new DefaultSchemaWalker<>(new ExampleJsonValueGenerator());
     }
@@ -187,6 +188,7 @@ public ExampleXmlValueSerializer defaultExampleXmlValueSerializer() {
     }
 
     @Bean
+    @ConditionalOnMissingBean(name = "xmlSchemaWalker")
     public SchemaWalker xmlSchemaWalker(ExampleXmlValueSerializer exampleXmlValueSerializer) {
         return new DefaultSchemaWalker<>(new ExampleXmlValueGenerator(exampleXmlValueSerializer));
     }
@@ -198,6 +200,7 @@ public ExampleYamlValueSerializer defaultExampleYamlValueSerializer() {
     }
 
     @Bean
+    @ConditionalOnMissingBean(name = "yamlSchemaWalker")
     public SchemaWalker yamlSchemaWalker(
             ExampleYamlValueSerializer exampleYamlValueSerializer,
             SpringwolfConfigProperties springwolfConfigProperties) {

diff --git a/...src/main/java/io/github/springwolf/core/configuration/SpringwolfScannerConfiguration.java b/...src/main/java/io/github/springwolf/core/configuration/SpringwolfScannerConfiguration.java
@@ -70,6 +70,7 @@ public SpringwolfClassScanner springwolfClassScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncListenerMethodLevelAnnotationChannelScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public ChannelsScanner asyncListenerMethodLevelAnnotationChannelScanner(
             AsyncAnnotationProvider<AsyncListener> asyncAnnotationProvider,
@@ -101,6 +102,7 @@ public ChannelsScanner asyncListenerMethodLevelAnnotationChannelScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncListenerClassLevelAnnotationChannelScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public ChannelsScanner asyncListenerClassLevelAnnotationChannelScanner(
             AsyncAnnotationProvider<AsyncListener> asyncAnnotationProvider,
@@ -132,6 +134,7 @@ public ChannelsScanner asyncListenerClassLevelAnnotationChannelScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncListenerMethodLevelAnnotationOperationScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public OperationsScanner asyncListenerMethodLevelAnnotationOperationScanner(
             AsyncAnnotationProvider<AsyncListener> asyncAnnotationProvider,
@@ -156,6 +159,7 @@ public OperationsScanner asyncListenerMethodLevelAnnotationOperationScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncListenerClassLevelListenerAnnotationOperationsScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public OperationsScanner asyncListenerClassLevelListenerAnnotationOperationsScanner(
             AsyncAnnotationProvider<AsyncListener> asyncAnnotationProvider,
@@ -184,6 +188,7 @@ public OperationsScanner asyncListenerClassLevelListenerAnnotationOperationsScan
             name = SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncPublisherClassLevelChannelAnnotationScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public ChannelsScanner asyncPublisherClassLevelChannelAnnotationScanner(
             AsyncAnnotationProvider<AsyncPublisher> asyncAnnotationProvider,
@@ -215,6 +220,7 @@ public ChannelsScanner asyncPublisherClassLevelChannelAnnotationScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncPublisherClassLevelAnnotationChannelScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public ChannelsScanner asyncPublisherClassLevelAnnotationChannelScanner(
             AsyncAnnotationProvider<AsyncPublisher> asyncAnnotationProvider,
@@ -246,6 +252,7 @@ public ChannelsScanner asyncPublisherClassLevelAnnotationChannelScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncPublisherClassLevelOperationAnnotationScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public OperationsScanner asyncPublisherClassLevelOperationAnnotationScanner(
             AsyncAnnotationProvider<AsyncPublisher> asyncAnnotationProvider,
@@ -271,6 +278,7 @@ public OperationsScanner asyncPublisherClassLevelOperationAnnotationScanner(
             name = SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncPublisherClassLevelListenerAnnotationOperationsScanner")
     @Order(value = ChannelPriority.ASYNC_ANNOTATION)
     public OperationsScanner asyncPublisherClassLevelListenerAnnotationOperationsScanner(
             AsyncAnnotationProvider<AsyncPublisher> asyncAnnotationProvider,
@@ -295,6 +303,7 @@ public OperationsScanner asyncPublisherClassLevelListenerAnnotationOperationsSca
     }
 
     @Bean
+    @ConditionalOnMissingBean(name = "asyncListenerAnnotationProvider")
     public AsyncAnnotationProvider<AsyncListener> asyncListenerAnnotationProvider() {
         return new AsyncAnnotationProvider<>() {
             @Override
@@ -315,6 +324,7 @@ public OperationAction getOperationType() {
     }
 
     @Bean
+    @ConditionalOnMissingBean(name = "asyncPublisherAnnotationProvider")
     public AsyncAnnotationProvider<AsyncPublisher> asyncPublisherAnnotationProvider() {
         return new AsyncAnnotationProvider<>() {
             @Override

diff --git a/...a/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java b/...a/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java
@@ -51,7 +51,7 @@ public class SpringwolfAmqpScannerConfiguration {
             name = SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
-    @ConditionalOnMissingBean(name = "amqpBindingFactory")
+    @ConditionalOnMissingBean
     public AmqpBindingFactory amqpBindingFactory(
             List<Queue> queues,
             List<Exchange> exchanges,
@@ -65,7 +65,7 @@ public AmqpBindingFactory amqpBindingFactory(
             name = SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
-    @ConditionalOnMissingBean(name = "asyncHeadersForAmqpBuilder")
+    @ConditionalOnMissingBean
     public AsyncHeadersForAmqpBuilder asyncHeadersForAmqpBuilder() {
         return new AsyncHeadersForAmqpBuilder();
     }
@@ -198,7 +198,7 @@ public OperationsScanner simpleRabbitMethodLevelListenerAnnotationOperationsScan
             havingValue = "true",
             matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
-    @ConditionalOnMissingBean(name = "rabbitQueueBeanScanner")
+    @ConditionalOnMissingBean
     public RabbitQueueBeanScanner rabbitQueueBeanScanner(List<Queue> queues, List<Binding> bindings) {
         return new RabbitQueueBeanScanner(queues, bindings);
     }

diff --git a/.../springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java b/.../springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
@@ -14,6 +14,7 @@
 import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanBuilder;
 import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.operations.CloudStreamFunctionOperationsScanner;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.stream.config.BindingServiceProperties;
 import org.springframework.context.annotation.Bean;
@@ -28,6 +29,7 @@
 public class SpringwolfCloudStreamAutoConfiguration {
 
     @Bean
+    @ConditionalOnMissingBean
     public CloudStreamFunctionChannelsScanner cloudStreamFunctionChannelsScanner(
             AsyncApiDocketService asyncApiDocketService,
             BeanMethodsScanner beanMethodsScanner,
@@ -51,6 +53,7 @@ public CloudStreamFunctionChannelsScanner cloudStreamFunctionChannelsScanner(
     }
 
     @Bean
+    @ConditionalOnMissingBean
     public CloudStreamFunctionOperationsScanner cloudStreamFunctionOperationsScanner(
             AsyncApiDocketService asyncApiDocketService,
             BeanMethodsScanner beanMethodsScanner,
@@ -70,6 +73,7 @@ public CloudStreamFunctionOperationsScanner cloudStreamFunctionOperationsScanner
     }
 
     @Bean
+    @ConditionalOnMissingBean
     public FunctionalChannelBeanBuilder functionalChannelBeanBuilder(TypeExtractor typeExtractor) {
         return new FunctionalChannelBeanBuilder(typeExtractor);
     }

diff --git a/...ava/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java b/...ava/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java
@@ -19,6 +19,7 @@
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner;
 import io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.JmsBindingFactory;
 import lombok.val;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,12 +39,14 @@ public class SpringwolfJmsScannerConfiguration {
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean
     public JmsBindingFactory jmsBindingFactory(StringValueResolver stringValueResolver) {
         return new JmsBindingFactory(stringValueResolver);
     }
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleJmsMethodLevelListenerAnnotationChannelsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public ChannelsScanner simpleJmsMethodLevelListenerAnnotationChannelsScanner(
             SpringwolfClassScanner springwolfClassScanner,
@@ -67,6 +70,7 @@ public ChannelsScanner simpleJmsMethodLevelListenerAnnotationChannelsScanner(
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleJmsMethodLevelListenerAnnotationOperationsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public OperationsScanner simpleJmsMethodLevelListenerAnnotationOperationsScanner(
             SpringwolfClassScanner springwolfClassScanner,

diff --git a/...io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java b/...io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java
@@ -23,6 +23,7 @@
 import io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.KafkaBindingFactory;
 import io.github.springwolf.plugins.kafka.asyncapi.scanners.common.header.AsyncHeadersForKafkaBuilder;
 import lombok.val;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,6 +47,7 @@ public class SpringwolfKafkaScannerConfiguration {
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "kafkaBindingFactory")
     public KafkaBindingFactory kafkaBindingFactory(StringValueResolver stringValueResolver) {
         return new KafkaBindingFactory(stringValueResolver);
     }
@@ -55,6 +57,7 @@ public KafkaBindingFactory kafkaBindingFactory(StringValueResolver stringValueRe
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "asyncHeadersForKafkaBuilder")
     public AsyncHeadersForKafkaBuilder asyncHeadersForKafkaBuilder() {
         return new AsyncHeadersForKafkaBuilder();
     }
@@ -64,6 +67,7 @@ public AsyncHeadersForKafkaBuilder asyncHeadersForKafkaBuilder() {
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleKafkaClassLevelListenerAnnotationChannelsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public ChannelsScanner simpleKafkaClassLevelListenerAnnotationChannelsScanner(
             SpringwolfClassScanner springwolfClassScanner,
@@ -94,6 +98,7 @@ public ChannelsScanner simpleKafkaClassLevelListenerAnnotationChannelsScanner(
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleKafkaClassLevelListenerAnnotationOperationScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public OperationsScanner simpleKafkaClassLevelListenerAnnotationOperationScanner(
             SpringwolfClassScanner springwolfClassScanner,
@@ -126,6 +131,7 @@ public OperationsScanner simpleKafkaClassLevelListenerAnnotationOperationScanner
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleKafkaMethodLevelListenerAnnotationChannelsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public ChannelsScanner simpleKafkaMethodLevelListenerAnnotationChannelsScanner(
             SpringwolfClassScanner springwolfClassScanner,
@@ -152,6 +158,7 @@ public ChannelsScanner simpleKafkaMethodLevelListenerAnnotationChannelsScanner(
             name = SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED,
             havingValue = "true",
             matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleKafkaMethodLevelListenerAnnotationOperationsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public OperationsScanner simpleKafkaMethodLevelListenerAnnotationOperationsScanner(
             SpringwolfClassScanner springwolfClassScanner,

diff --git a/...ava/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java b/...ava/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java
@@ -20,6 +20,7 @@
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner;
 import io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.SqsBindingFactory;
 import lombok.val;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,12 +39,14 @@ public class SpringwolfSqsScannerConfiguration {
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean
     public SqsBindingFactory sqsBindingFactory(StringValueResolver stringValueResolver) {
         return new SqsBindingFactory(stringValueResolver);
     }
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleSqsMethodLevelListenerAnnotationChannelsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public ChannelsScanner simpleSqsMethodLevelListenerAnnotationChannelsScanner(
             SpringwolfClassScanner springwolfClassScanner,
@@ -66,6 +69,7 @@ public ChannelsScanner simpleSqsMethodLevelListenerAnnotationChannelsScanner(
 
     @Bean
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
+    @ConditionalOnMissingBean(name = "simpleSqsMethodLevelListenerAnnotationOperationsScanner")
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public OperationsScanner simpleSqsMethodLevelListenerAnnotationOperationsScanner(
             SpringwolfClassScanner springwolfClassScanner,