chore(core): review comments

springwolf · Jun 21, 2024 · 88406f5 · 88406f5
1 parent 2131798
commit 88406f5
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 21 deletions.
diff --git a/.../io/github/springwolf/core/asyncapi/scanners/channels/AsyncAnnotationChannelsScanner.java b/.../io/github/springwolf/core/asyncapi/scanners/channels/AsyncAnnotationChannelsScanner.java
@@ -15,7 +15,6 @@
 import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.AsyncAnnotationScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AsyncAnnotationUtil;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
 import lombok.extern.slf4j.Slf4j;
@@ -36,13 +35,11 @@ public AsyncAnnotationChannelsScanner(
             ClassScanner classScanner,
             ComponentsService componentsService,
             AsyncApiDocketService asyncApiDocketService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadAsyncOperationService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
         super(
                 asyncAnnotationProvider,
-                payloadClassExtractor,
                 payloadAsyncOperationService,
                 componentsService,
                 operationBindingProcessors,

diff --git a/...ore/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScanner.java b/...ore/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScanner.java
@@ -31,15 +31,15 @@ public SpringAnnotationClassLevelChannelsScanner(
             Class<MethodAnnotation> methodAnnotationClass,
             BindingFactory<ClassAnnotation> bindingFactory,
             AsyncHeadersBuilder asyncHeadersBuilder,
-            PayloadMethodService payloadService,
+            PayloadMethodService payloadMethodService,
             HeaderClassExtractor headerClassExtractor,
             ComponentsService componentsService) {
         super(
                 classAnnotationClass,
                 methodAnnotationClass,
                 bindingFactory,
                 asyncHeadersBuilder,
-                payloadService,
+                payloadMethodService,
                 headerClassExtractor,
                 componentsService);
     }

diff --git a/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/AsyncAnnotationScanner.java b/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/AsyncAnnotationScanner.java
@@ -19,7 +19,6 @@
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.OperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AsyncAnnotationUtil;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.TextUtils;
@@ -43,7 +42,6 @@
 public abstract class AsyncAnnotationScanner<A extends Annotation> implements EmbeddedValueResolverAware {
 
     protected final AsyncAnnotationProvider<A> asyncAnnotationProvider;
-    protected final PayloadClassExtractor payloadClassExtractor;
     protected final PayloadAsyncOperationService payloadAsyncOperationService;
     protected final ComponentsService componentsService;
     protected final List<OperationBindingProcessor> operationBindingProcessors;

diff --git a/...gwolf/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScanner.java b/...gwolf/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScanner.java
@@ -10,7 +10,6 @@
 import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.AsyncAnnotationScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.operations.OperationMerger;
 import lombok.extern.slf4j.Slf4j;
 
@@ -28,13 +27,11 @@ public AsyncAnnotationOperationsScanner(
             AsyncAnnotationProvider<A> asyncAnnotationProvider,
             ClassScanner classScanner,
             ComponentsService componentsService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadAsyncOperationService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
         super(
                 asyncAnnotationProvider,
-                payloadClassExtractor,
                 payloadAsyncOperationService,
                 componentsService,
                 operationBindingProcessors,

diff --git a/...src/main/java/io/github/springwolf/core/configuration/SpringwolfScannerConfiguration.java b/...src/main/java/io/github/springwolf/core/configuration/SpringwolfScannerConfiguration.java
@@ -17,7 +17,6 @@
 import io.github.springwolf.core.asyncapi.scanners.classes.spring.ConfigurationClassScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.AsyncAnnotationScanner;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
-import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.AsyncAnnotationOperationsScanner;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -74,7 +73,6 @@ public AsyncAnnotationChannelsScanner<AsyncListener> asyncListenerAnnotationChan
             SpringwolfClassScanner springwolfClassScanner,
             ComponentsService componentsService,
             AsyncApiDocketService asyncApiDocketService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
@@ -83,7 +81,6 @@ public AsyncAnnotationChannelsScanner<AsyncListener> asyncListenerAnnotationChan
                 springwolfClassScanner,
                 componentsService,
                 asyncApiDocketService,
-                payloadClassExtractor,
                 payloadService,
                 operationBindingProcessors,
                 messageBindingProcessors);
@@ -98,15 +95,13 @@ public AsyncAnnotationChannelsScanner<AsyncListener> asyncListenerAnnotationChan
     public AsyncAnnotationOperationsScanner<AsyncListener> asyncListenerAnnotationOperationScanner(
             SpringwolfClassScanner springwolfClassScanner,
             ComponentsService componentsService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
         return new AsyncAnnotationOperationsScanner<>(
                 buildAsyncListenerAnnotationProvider(),
                 springwolfClassScanner,
                 componentsService,
-                payloadClassExtractor,
                 payloadService,
                 operationBindingProcessors,
                 messageBindingProcessors);
@@ -122,7 +117,6 @@ public AsyncAnnotationChannelsScanner<AsyncPublisher> asyncPublisherChannelAnnot
             SpringwolfClassScanner springwolfClassScanner,
             ComponentsService componentsService,
             AsyncApiDocketService asyncApiDocketService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
@@ -131,7 +125,6 @@ public AsyncAnnotationChannelsScanner<AsyncPublisher> asyncPublisherChannelAnnot
                 springwolfClassScanner,
                 componentsService,
                 asyncApiDocketService,
-                payloadClassExtractor,
                 payloadService,
                 operationBindingProcessors,
                 messageBindingProcessors);
@@ -146,15 +139,13 @@ public AsyncAnnotationChannelsScanner<AsyncPublisher> asyncPublisherChannelAnnot
     public AsyncAnnotationOperationsScanner<AsyncPublisher> asyncPublisherOperationAnnotationScanner(
             SpringwolfClassScanner springwolfClassScanner,
             ComponentsService componentsService,
-            PayloadClassExtractor payloadClassExtractor,
             PayloadAsyncOperationService payloadService,
             List<OperationBindingProcessor> operationBindingProcessors,
             List<MessageBindingProcessor> messageBindingProcessors) {
         return new AsyncAnnotationOperationsScanner<>(
                 buildAsyncPublisherAnnotationProvider(),
                 springwolfClassScanner,
                 componentsService,
-                payloadClassExtractor,
                 payloadService,
                 operationBindingProcessors,
                 messageBindingProcessors);

diff --git a/...gwolf/core/asyncapi/scanners/channels/annotations/AsyncAnnotationChannelsScannerTest.java b/...gwolf/core/asyncapi/scanners/channels/annotations/AsyncAnnotationChannelsScannerTest.java
@@ -106,7 +106,6 @@ public OperationAction getOperationType() {
             classScanner,
             componentsService,
             asyncApiDocketService,
-            payloadClassExtractor,
             payloadAsyncOperationService,
             operationBindingProcessors,
             messageBindingProcessors);

diff --git a/...f/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScannerTest.java b/...f/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScannerTest.java
@@ -103,7 +103,6 @@ public OperationAction getOperationType() {
                     asyncAnnotationProvider,
                     classScanner,
                     componentsService,
-                    payloadClassExtractor,
                     payloadAsyncOperationService,
                     operationBindingProcessors,
                     messageBindingProcessors);