refactor: move headers package to scanners

springwolf · Apr 26, 2024 · e63bb77 · e63bb77
1 parent 3a13c90
commit e63bb77
Show file tree

Hide file tree

Showing 30 changed files with 44 additions and 39 deletions.
diff --git a/...ore/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScanner.java b/...ore/asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScanner.java
@@ -5,9 +5,9 @@
 import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
 import io.github.springwolf.core.asyncapi.scanners.common.ClassLevelAnnotationScanner;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...re/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScanner.java b/...re/asyncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScanner.java
@@ -6,9 +6,9 @@
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
 import io.github.springwolf.core.asyncapi.scanners.common.MethodLevelAnnotationScanner;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;

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
@@ -93,10 +93,8 @@ protected Operation buildOperation(AsyncOperation asyncOperation, Method method,
     protected MessageObject buildMessage(AsyncOperation operationData, Method method) {
         NamedSchemaObject payloadSchema = payloadService.extractSchema(operationData, method);
 
-        // TODO: move block to own HeaderService
         SchemaObject headerSchema = AsyncAnnotationUtil.getAsyncHeaders(operationData, resolver);
         String headerSchemaName = this.componentsService.registerSchema(headerSchema);
-        var headers = MessageHeaders.of(MessageReference.toSchema(headerSchemaName));
 
         Map<String, MessageBinding> messageBinding =
                 AsyncAnnotationUtil.processMessageBindingFromAnnotation(method, messageBindingProcessors);
@@ -120,7 +118,7 @@ protected MessageObject buildMessage(AsyncOperation operationData, Method method
                 .title(payloadSchema.schema().getTitle())
                 .description(description)
                 .payload(messagePayload)
-                .headers(headers)
+                .headers(MessageHeaders.of(MessageReference.toSchema(headerSchemaName)))
                 .bindings(messageBinding);
 
         // Retrieve the Message information obtained from the @AsyncMessage annotation. These values have higher

diff --git a/.../java/io/github/springwolf/core/asyncapi/scanners/common/ClassLevelAnnotationScanner.java b/.../java/io/github/springwolf/core/asyncapi/scanners/common/ClassLevelAnnotationScanner.java
@@ -7,10 +7,11 @@
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
 import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;
@@ -83,7 +84,8 @@ protected Map<String, MessageReference> buildMessages(
     protected MessageObject buildMessage(ClassAnnotation classAnnotation, NamedSchemaObject payloadSchema) {
         Map<String, MessageBinding> messageBinding = bindingFactory.buildMessageBinding(classAnnotation);
 
-        String headerModelName = componentsService.registerSchema(asyncHeadersBuilder.buildHeaders(payloadSchema));
+        SchemaObject headerSchema = asyncHeadersBuilder.buildHeaders(payloadSchema);
+        String headerSchemaName = componentsService.registerSchema(headerSchema);
 
         MessagePayload payload = MessagePayload.of(MultiFormatSchema.builder()
                 .schema(SchemaReference.fromSchema(payloadSchema.name()))
@@ -95,7 +97,7 @@ protected MessageObject buildMessage(ClassAnnotation classAnnotation, NamedSchem
                 .title(payloadSchema.schema().getTitle())
                 .description(null)
                 .payload(payload)
-                .headers(MessageHeaders.of(MessageReference.toSchema(headerModelName)))
+                .headers(MessageHeaders.of(MessageReference.toSchema(headerSchemaName)))
                 .bindings(messageBinding)
                 .build();
 

diff --git a/...java/io/github/springwolf/core/asyncapi/scanners/common/MethodLevelAnnotationScanner.java b/...java/io/github/springwolf/core/asyncapi/scanners/common/MethodLevelAnnotationScanner.java
@@ -7,10 +7,11 @@
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
 import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,8 +30,8 @@ public abstract class MethodLevelAnnotationScanner<MethodAnnotation extends Anno
     protected MessageObject buildMessage(MethodAnnotation annotation, NamedSchemaObject payloadSchema) {
         Map<String, MessageBinding> messageBinding = bindingFactory.buildMessageBinding(annotation);
 
-        // TODO: move block to own HeaderService
-        String headerModelName = componentsService.registerSchema(asyncHeadersBuilder.buildHeaders(payloadSchema));
+        SchemaObject headerSchema = asyncHeadersBuilder.buildHeaders(payloadSchema);
+        String headerModelName = componentsService.registerSchema(headerSchema);
 
         MessagePayload payload = MessagePayload.of(MultiFormatSchema.builder()
                 .schema(SchemaReference.fromSchema(payloadSchema.name()))

diff --git a/...mponents/headers/AsyncHeadersBuilder.java → ...s/common/headers/AsyncHeadersBuilder.java b/...mponents/headers/AsyncHeadersBuilder.java → ...s/common/headers/AsyncHeadersBuilder.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.core.asyncapi.components.headers;
+package io.github.springwolf.core.asyncapi.scanners.common.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;

diff --git a/...ders/AsyncHeadersCloudEventConstants.java → ...ders/AsyncHeadersCloudEventConstants.java b/...ders/AsyncHeadersCloudEventConstants.java → ...ders/AsyncHeadersCloudEventConstants.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.core.asyncapi.components.headers;
+package io.github.springwolf.core.asyncapi.scanners.common.headers;
 
 public class AsyncHeadersCloudEventConstants {
     public static final String CONTENT_TYPE = "content-type";

diff --git a/...ts/headers/AsyncHeadersNotDocumented.java → ...on/headers/AsyncHeadersNotDocumented.java b/...ts/headers/AsyncHeadersNotDocumented.java → ...on/headers/AsyncHeadersNotDocumented.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.core.asyncapi.components.headers;
+package io.github.springwolf.core.asyncapi.scanners.common.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;

diff --git a/...mponents/headers/AsyncHeadersNotUsed.java → ...s/common/headers/AsyncHeadersNotUsed.java b/...mponents/headers/AsyncHeadersNotUsed.java → ...s/common/headers/AsyncHeadersNotUsed.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.core.asyncapi.components.headers;
+package io.github.springwolf.core.asyncapi.scanners.common.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;

diff --git a/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadService.java b/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadService.java
@@ -31,7 +31,7 @@ public class PayloadService {
     public NamedSchemaObject extractSchema(Method method) {
         Optional<Class<?>> payloadType = payloadClassExtractor.extractFrom(method);
 
-        return payloadType.map((type) -> buildSchema(type)).orElseGet(this::useUnusedPayload);
+        return payloadType.map(this::buildSchema).orElseGet(this::useUnusedPayload);
     }
 
     public NamedSchemaObject extractSchema(AsyncOperation operationData, Method method) {
@@ -40,6 +40,7 @@ public NamedSchemaObject extractSchema(AsyncOperation operationData, Method meth
                 : payloadClassExtractor.extractFrom(method);
 
         String contentType = operationData.message().contentType();
+
         return payloadType.map((type) -> buildSchema(contentType, type)).orElseGet(this::useUnusedPayload);
     }
 

diff --git a/...in/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AsyncAnnotationUtil.java b/...in/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AsyncAnnotationUtil.java
@@ -8,14 +8,14 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.core.asyncapi.annotations.AsyncMessage;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotUsed;
 import io.github.springwolf.core.asyncapi.scanners.bindings.channels.ChannelBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.channels.ProcessedChannelBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.OperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotUsed;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 

diff --git a/...asyncapi/scanners/operations/annotations/SpringAnnotationClassLevelOperationsScanner.java b/...asyncapi/scanners/operations/annotations/SpringAnnotationClassLevelOperationsScanner.java
@@ -7,9 +7,9 @@
 import io.github.springwolf.asyncapi.v3.model.operation.Operation;
 import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
 import io.github.springwolf.core.asyncapi.scanners.common.ClassLevelAnnotationScanner;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...syncapi/scanners/operations/annotations/SpringAnnotationMethodLevelOperationsScanner.java b/...syncapi/scanners/operations/annotations/SpringAnnotationMethodLevelOperationsScanner.java
@@ -8,9 +8,9 @@
 import io.github.springwolf.asyncapi.v3.model.operation.Operation;
 import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
 import io.github.springwolf.core.asyncapi.scanners.common.MethodLevelAnnotationScanner;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.utils.AnnotationScannerUtil;

diff --git a/...gwolf/core/asyncapi/scanners/channels/annotations/AsyncAnnotationChannelsScannerTest.java b/...gwolf/core/asyncapi/scanners/channels/annotations/AsyncAnnotationChannelsScannerTest.java
@@ -20,13 +20,13 @@
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
 import io.github.springwolf.core.asyncapi.components.DefaultComponentsService;
 import io.github.springwolf.core.asyncapi.components.SwaggerSchemaUtil;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.OperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.channels.AsyncAnnotationChannelsScanner;
 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.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.TypeToClassConverter;

diff --git a/...anners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java b/...anners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java
@@ -17,8 +17,8 @@
 import io.github.springwolf.core.asyncapi.components.examples.SchemaWalkerProvider;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.DefaultSchemaWalker;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.json.ExampleJsonValueGenerator;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.TypeToClassConverter;

diff --git a/...asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerTest.java b/...asyncapi/scanners/channels/annotations/SpringAnnotationClassLevelChannelsScannerTest.java
@@ -16,8 +16,8 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import lombok.Data;

diff --git a/...nners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java b/...nners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java
@@ -17,8 +17,8 @@
 import io.github.springwolf.core.asyncapi.components.examples.SchemaWalkerProvider;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.DefaultSchemaWalker;
 import io.github.springwolf.core.asyncapi.components.examples.walkers.json.ExampleJsonValueGenerator;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.TypeToClassConverter;

diff --git a/...syncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerTest.java b/...syncapi/scanners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerTest.java
@@ -16,8 +16,8 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import lombok.Data;

diff --git a/...f/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScannerTest.java b/...f/core/asyncapi/scanners/operations/annotations/AsyncAnnotationOperationsScannerTest.java
@@ -19,12 +19,12 @@
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
 import io.github.springwolf.core.asyncapi.components.DefaultComponentsService;
 import io.github.springwolf.core.asyncapi.components.SwaggerSchemaUtil;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.OperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
 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.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.TypeToClassConverter;

diff --git a/...capi/scanners/operations/annotations/SpringAnnotationClassLevelOperationsScannerTest.java b/...capi/scanners/operations/annotations/SpringAnnotationClassLevelOperationsScannerTest.java
@@ -18,8 +18,8 @@
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.components.ComponentsService;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersNotDocumented;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadService;
 import lombok.Data;

diff --git a/...a-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java b/...a-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
@@ -3,7 +3,7 @@
 
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersCloudEventConstants;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersCloudEventConstants;
 import io.github.springwolf.examples.kafka.configuration.KafkaConfiguration;
 import io.github.springwolf.examples.kafka.dtos.NestedPayloadDto;
 import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;

diff --git a/...s/headers/AsyncHeadersForAmqpBuilder.java → ...n/headers/AsyncHeadersForAmqpBuilder.java b/...s/headers/AsyncHeadersForAmqpBuilder.java → ...n/headers/AsyncHeadersForAmqpBuilder.java
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.asyncapi.components.headers;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.common.headers;
 
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;
+import io.github.springwolf.core.asyncapi.scanners.common.headers.AsyncHeadersBuilder;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.NamedSchemaObject;
 
 import java.util.Map;

diff --git a/...a/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java b/...a/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java
@@ -12,10 +12,10 @@
 import io.github.springwolf.core.asyncapi.scanners.operations.SpringAnnotationOperationsScanner;
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationClassLevelOperationsScanner;
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner;
-import io.github.springwolf.plugins.amqp.asyncapi.components.headers.AsyncHeadersForAmqpBuilder;
 import io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.AmqpBindingFactory;
 import io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.messages.AmqpMessageBindingProcessor;
 import io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.operations.AmqpOperationBindingProcessor;
+import io.github.springwolf.plugins.amqp.asyncapi.scanners.common.headers.AsyncHeadersForAmqpBuilder;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Exchange;
 import org.springframework.amqp.core.Queue;