feat(plugins): use introduced SpringwolfClassScanner in plugins

springwolf · Nov 29, 2023 · 5b40196 · 5b40196
1 parent 074c769
commit 5b40196
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/...ava/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpScannerConfiguration.java b/...ava/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpScannerConfiguration.java
@@ -10,7 +10,7 @@
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersForAmqpBuilder;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.springframework.amqp.core.Binding;
@@ -59,7 +59,7 @@ public AsyncHeadersForAmqpBuilder asyncHeadersForAmqpBuilder() {
             matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleRabbitClassLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             AmqpBindingBuilder amqpBindingBuilder,
             AsyncHeadersForAmqpBuilder asyncHeadersForAmqpBuilder,
             PayloadClassExtractor payloadClassExtractor,
@@ -83,7 +83,7 @@ public SimpleChannelsScanner simpleRabbitClassLevelListenerAnnotationChannelsSca
             matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleRabbitMethodLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             AmqpBindingBuilder amqpBindingBuilder,
             PayloadClassExtractor payloadClassExtractor,
             SchemasService schemasService) {

diff --git a/...avshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java b/...avshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
@@ -6,7 +6,7 @@
 import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
 import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfAmqpController;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.junit.jupiter.api.Nested;
@@ -47,7 +47,7 @@ public class SpringwolfAmqpProducerConfigurationIntegrationTest {
             value = {
                 @MockBean(AsyncApiService.class),
                 @MockBean(RabbitTemplate.class),
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(AsyncApiDocketService.class)
@@ -88,7 +88,7 @@ void springwolfAmqpProducerShouldBePresentInSpringContext() {
             value = {
                 @MockBean(AsyncApiService.class),
                 @MockBean(RabbitTemplate.class),
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
             })

diff --git a/.../java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsScannerConfiguration.java b/.../java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsScannerConfiguration.java
@@ -9,7 +9,7 @@
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -36,7 +36,7 @@ public JmsBindingBuilder jmsBindingBuilder() {
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleJmsMethodLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             JmsBindingBuilder jmsBindingBuilder,
             PayloadClassExtractor payloadClassExtractor,
             SchemasService schemasService) {

diff --git a/...tavshamir/springwolf/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java b/...tavshamir/springwolf/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
@@ -7,7 +7,7 @@
 import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfJmsController;
 import io.github.stavshamir.springwolf.asyncapi.jms.SpringwolfJmsAutoConfiguration;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.junit.jupiter.api.Nested;
@@ -46,7 +46,7 @@ public class SpringwolfJmsProducerConfigurationIntegrationTest {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(AsyncApiDocketService.class),
                 @MockBean(AsyncApiService.class),
@@ -87,7 +87,7 @@ void springwolfJmsProducerShouldBePresentInSpringContext() {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(ChannelsService.class),
                 @MockBean(PayloadClassExtractor.class),

diff --git a/...a/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaScannerConfiguration.java b/...a/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaScannerConfiguration.java
@@ -10,7 +10,7 @@
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersForKafkaBuilder;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -54,7 +54,7 @@ public AsyncHeadersForKafkaBuilder kafkaAsyncHeadersBuilder() {
             matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleKafkaClassLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             KafkaBindingBuilder kafkaBindingBuilder,
             AsyncHeadersForKafkaBuilder asyncHeadersForKafkaBuilder,
             PayloadClassExtractor payloadClassExtractor,
@@ -78,7 +78,7 @@ public SimpleChannelsScanner simpleKafkaClassLevelListenerAnnotationChannelsScan
             matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleKafkaMethodLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             KafkaBindingBuilder kafkaBindingBuilder,
             PayloadClassExtractor payloadClassExtractor,
             SchemasService schemasService) {

diff --git a/...vshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java b/...vshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
@@ -5,7 +5,7 @@
 import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaController;
 import io.github.stavshamir.springwolf.asyncapi.kafka.SpringwolfKafkaAutoConfiguration;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.junit.jupiter.api.Nested;
@@ -44,7 +44,7 @@ public class SpringwolfKafkaProducerConfigurationIntegrationTest {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(AsyncApiDocketService.class)
@@ -83,7 +83,7 @@ void springwolfKafkaTemplateShouldBePresentInSpringContext() {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class)
             })

diff --git a/...tavshamir/springwolf/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java b/...tavshamir/springwolf/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
@@ -7,7 +7,7 @@
 import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
 import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSnsController;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.asyncapi.sns.SpringwolfSnsAutoConfiguration;
 import io.github.stavshamir.springwolf.producer.SpringwolfSnsProducer;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
@@ -46,7 +46,7 @@ public class SpringwolfSnsProducerConfigurationIntegrationTest {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(AsyncApiDocketService.class),
@@ -87,7 +87,7 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(ChannelsService.class),

diff --git a/.../java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsScannerConfiguration.java b/.../java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsScannerConfiguration.java
@@ -10,7 +10,7 @@
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -36,7 +36,7 @@ public SqsBindingBuilder sqsBindingBuilder() {
     @ConditionalOnProperty(name = SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED, havingValue = "true", matchIfMissing = true)
     @Order(value = ChannelPriority.AUTO_DISCOVERED)
     public SimpleChannelsScanner simpleSqsMethodLevelListenerAnnotationChannelsScanner(
-            ComponentClassScanner classScanner,
+            SpringwolfClassScanner classScanner,
             SqsBindingBuilder sqsBindingBuilder,
             PayloadClassExtractor payloadClassExtractor,
             SchemasService schemasService) {

diff --git a/...tavshamir/springwolf/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java b/...tavshamir/springwolf/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
@@ -7,7 +7,7 @@
 import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
 import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSqsController;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
 import io.github.stavshamir.springwolf.asyncapi.sqs.SpringwolfSqsAutoConfiguration;
 import io.github.stavshamir.springwolf.producer.SpringwolfSqsProducer;
 import io.github.stavshamir.springwolf.schemas.SchemasService;
@@ -46,7 +46,7 @@ public class SpringwolfSqsProducerConfigurationIntegrationTest {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(AsyncApiDocketService.class),
@@ -87,7 +87,7 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
             })
     @MockBeans(
             value = {
-                @MockBean(ComponentClassScanner.class),
+                @MockBean(SpringwolfClassScanner.class),
                 @MockBean(SchemasService.class),
                 @MockBean(PayloadClassExtractor.class),
                 @MockBean(ChannelsService.class),