chore: remove deprecated asyncapidocket bean (#524)

* chore: remove deprecated asyncapidocket bean * chore(cloud-stream): update test dependencies * feat(core): implement review comment
springwolf · Jan 7, 2024 · c4ea459 · c4ea459
1 parent 56675ae
commit c4ea459
Show file tree

Hide file tree

Showing 23 changed files with 152 additions and 1,337 deletions.
diff --git a/...gwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java b/...gwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java
@@ -9,7 +9,6 @@
 import io.github.stavshamir.springwolf.asyncapi.SpringwolfInitApplicationListener;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
 import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
 import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService;
 import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
@@ -26,7 +25,6 @@
 import org.springframework.context.annotation.Import;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Spring Boot auto-configuration which loads all spring-beans for springwolf core module.
@@ -77,9 +75,8 @@ public SchemasService schemasService(
 
     @Bean
     @ConditionalOnMissingBean
-    public AsyncApiDocketService asyncApiDocketService(
-            Optional<AsyncApiDocket> optionalAsyncApiDocket, SpringwolfConfigProperties springwolfConfigProperties) {
-        return new DefaultAsyncApiDocketService(optionalAsyncApiDocket, springwolfConfigProperties);
+    public AsyncApiDocketService asyncApiDocketService(SpringwolfConfigProperties springwolfConfigProperties) {
+        return new DefaultAsyncApiDocketService(springwolfConfigProperties);
     }
 
     @Bean

diff --git a/...lf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfScannerConfiguration.java b/...lf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfScannerConfiguration.java
@@ -7,8 +7,6 @@
 import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ConsumerOperationDataScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ProducerOperationDataScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
@@ -30,8 +28,6 @@
 
 import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED;
 import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_CONSUMER_DATA_ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_PRODUCER_DATA_ENABLED;
 
 /**
  * Spring configuration defining the core scanner beans.
@@ -65,22 +61,6 @@ public SpringwolfClassScanner springwolfClassScanner(
         return new SpringwolfClassScanner(componentClassScanner, beanMethodsScanner);
     }
 
-    @Bean
-    @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_CONSUMER_DATA_ENABLED, havingValue = "true", matchIfMissing = true)
-    @Order(value = ChannelPriority.MANUAL_DEFINED)
-    public ConsumerOperationDataScanner consumerOperationDataScanner(
-            AsyncApiDocketService asyncApiDocketService, SchemasService schemasService) {
-        return new ConsumerOperationDataScanner(asyncApiDocketService, schemasService);
-    }
-
-    @Bean
-    @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_PRODUCER_DATA_ENABLED, havingValue = "true", matchIfMissing = true)
-    @Order(value = ChannelPriority.MANUAL_DEFINED)
-    public ProducerOperationDataScanner producerOperationDataScanner(
-            AsyncApiDocketService asyncApiDocketService, SchemasService schemasService) {
-        return new ProducerOperationDataScanner(asyncApiDocketService, schemasService);
-    }
-
     @Bean
     @ConditionalOnProperty(
             name = SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED,

diff --git a/...mir/springwolf/asyncapi/scanners/channels/operationdata/AbstractOperationDataScanner.java b/...mir/springwolf/asyncapi/scanners/channels/operationdata/AbstractOperationDataScanner.java
diff --git a/...mir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java b/...mir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java
diff --git a/...mir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java b/...mir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java