chore(plugins): move packages in plugins (#633)

springwolf · Mar 1, 2024 · 86e3406 · 86e3406
1 parent befe087
commit 86e3406
Show file tree

Hide file tree

Showing 91 changed files with 167 additions and 162 deletions.
diff --git a/...io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java b/...io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java
@@ -39,7 +39,7 @@ public interface ExampleValueGenerator<T, R> {
  String lookupSchemaName(Schema schema);
 
  /**
- * @return The serializable representation of the example (object for json & yaml, string for others)
+ * @return The serializable representation of the example (object for json and yaml, string for others)
  */
  R prepareForSerialization(Schema name, T exampleObject);
 

diff --git a/...p-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java b/...p-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java
@@ -4,7 +4,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;
 import io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto;
-import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
+import io.github.springwolf.plugins.amqp.asyncapi.annotations.AmqpAsyncOperationBinding;
 import lombok.RequiredArgsConstructor;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Component;

diff --git a/...ms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java b/...ms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
@@ -5,7 +5,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;
 import io.github.springwolf.examples.jms.dtos.AnotherPayloadDto;
-import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
+import io.github.springwolf.plugins.jms.asyncapi.annotations.JmsAsyncOperationBinding;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;

diff --git a/...fka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java b/...fka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java
@@ -4,7 +4,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncListener;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaListener;

diff --git a/...in/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java b/...in/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java
@@ -5,7 +5,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto;
 import io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaHandler;
 import org.springframework.kafka.annotation.KafkaListener;

diff --git a/...a-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java b/...a-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java
@@ -4,7 +4,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncApiPayload;
 import io.github.springwolf.core.asyncapi.annotations.AsyncListener;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;

diff --git a/...afka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java b/...afka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java
@@ -5,7 +5,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncMessage;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.examples.kafka.dtos.XmlPayloadDto;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaListener;

diff --git a/...fka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java b/...fka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java
@@ -5,7 +5,7 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncMessage;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.examples.kafka.dtos.YamlPayloadDto;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaListener;

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
@@ -6,9 +6,7 @@
 import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersCloudEventConstants;
 import io.github.springwolf.examples.kafka.configuration.KafkaConfiguration;
 import io.github.springwolf.examples.kafka.dtos.NestedPayloadDto;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncKey;
-import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncMessageBinding;
+import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -66,8 +64,11 @@ public class NestedProducer {
  @KafkaAsyncOperationBinding(
  clientId = "foo-clientId",
  messageBinding =
- @KafkaAsyncMessageBinding(
- key = @KafkaAsyncKey(description = "Kafka Producer Message Key", example = "example-key")))
+ @KafkaAsyncOperationBinding.KafkaAsyncMessageBinding(
+ key =
+ @KafkaAsyncOperationBinding.KafkaAsyncKey(
+ description = "Kafka Producer Message Key",
+ example = "example-key")))
  public void sendMessage(NestedPayloadDto msg) {
  kafkaTemplate.send(KafkaConfiguration.PRODUCER_TOPIC, msg);
  }

diff --git a/...f-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java b/...f-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java
@@ -9,8 +9,8 @@
 import io.github.springwolf.examples.kafka.dto.avro.ExamplePayloadAvroDto;
 import io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto;
 import io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigProperties;
 import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
-import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.KafkaAdminClient;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;

diff --git a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
@@ -1297,4 +1297,4 @@
  ]
  }
  }
-}
+}
diff --git a/...ns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java b/...ns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java
@@ -6,8 +6,8 @@
 import io.github.springwolf.examples.sns.dtos.AnotherPayloadDto;
 import io.github.springwolf.examples.sns.dtos.ExamplePayloadDto;
 import io.github.springwolf.examples.sns.producers.AnotherProducer;
-import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
+import io.github.springwolf.plugins.sns.annotations.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.annotations.SnsAsyncOperationBindingIdentifier;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

diff --git a/...ns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java b/...ns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java
@@ -5,8 +5,8 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;
 import io.github.springwolf.examples.sns.dtos.AnotherPayloadDto;
-import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
+import io.github.springwolf.plugins.sns.annotations.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.annotations.SnsAsyncOperationBindingIdentifier;
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Component;

diff --git a/...qs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java b/...qs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java
@@ -5,8 +5,8 @@
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;
 import io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto;
-import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
+import io.github.springwolf.plugins.sqs.annotations.SqsAsyncOperationBinding;
+import io.github.springwolf.plugins.sqs.annotations.SqsAsyncQueueBinding;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

diff --git a/...annotation/AmqpAsyncOperationBinding.java → ...nnotations/AmqpAsyncOperationBinding.java b/...annotation/AmqpAsyncOperationBinding.java → ...nnotations/AmqpAsyncOperationBinding.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.amqp.asyncapi.annotations;
 
 import io.github.springwolf.core.asyncapi.annotations.AsyncListener;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding;

diff --git a/...ge/header/AsyncHeadersForAmqpBuilder.java → ...s/headers/AsyncHeadersForAmqpBuilder.java b/...ge/header/AsyncHeadersForAmqpBuilder.java → ...s/headers/AsyncHeadersForAmqpBuilder.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.types.channel.operation.message.header;
+package io.github.springwolf.plugins.amqp.asyncapi.components.headers;
 
 import io.github.springwolf.core.asyncapi.components.headers.AsyncHeaders;
 import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder;

diff --git a/...scanners/bindings/AmqpBindingFactory.java → ...scanners/bindings/AmqpBindingFactory.java b/...scanners/bindings/AmqpBindingFactory.java → ...scanners/bindings/AmqpBindingFactory.java
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.bindings;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings;
 
 import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
 import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
 import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
-import io.github.springwolf.plugins.amqp.scanners.channels.annotation.RabbitListenerUtil;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Exchange;
 import org.springframework.amqp.core.Queue;

diff --git a/...annels/annotation/RabbitListenerUtil.java → ...scanners/bindings/RabbitListenerUtil.java b/...annels/annotation/RabbitListenerUtil.java → ...scanners/bindings/RabbitListenerUtil.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.channels.annotation;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings;
 
 import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
 import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;

diff --git a/...rocessor/AmqpMessageBindingProcessor.java → ...messages/AmqpMessageBindingProcessor.java b/...rocessor/AmqpMessageBindingProcessor.java → ...messages/AmqpMessageBindingProcessor.java
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.messages;
 
 import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.MessageBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding;
-import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
+import io.github.springwolf.plugins.amqp.asyncapi.annotations.AmqpAsyncOperationBinding;
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.util.StringValueResolver;
 

diff --git a/...cessor/AmqpOperationBindingProcessor.java → ...ations/AmqpOperationBindingProcessor.java b/...cessor/AmqpOperationBindingProcessor.java → ...ations/AmqpOperationBindingProcessor.java
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.operations;
 
 import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
-import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
+import io.github.springwolf.plugins.amqp.asyncapi.annotations.AmqpAsyncOperationBinding;
 
 import java.util.Arrays;
 

diff --git a/...java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java b/...java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java
@@ -2,7 +2,7 @@
 package io.github.springwolf.plugins.amqp.configuration;
 
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
-import io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigProperties;
+import io.github.springwolf.plugins.amqp.configuration.properties.SpringwolfAmqpConfigProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;

diff --git a/.../io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java b/.../io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java
@@ -15,8 +15,8 @@
 
 import java.util.List;
 
-import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX;
-import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.amqp.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.amqp.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED;
 
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(

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.scanners.bindings.AmqpBindingFactory;
-import io.github.springwolf.plugins.amqp.scanners.bindings.processor.AmqpMessageBindingProcessor;
-import io.github.springwolf.plugins.amqp.scanners.bindings.processor.AmqpOperationBindingProcessor;
-import io.github.springwolf.plugins.amqp.types.channel.operation.message.header.AsyncHeadersForAmqpBuilder;
+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 org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Exchange;
 import org.springframework.amqp.core.Queue;
@@ -29,7 +29,7 @@
 
 import java.util.List;
 
-import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED;
+import static io.github.springwolf.plugins.amqp.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED;
 
 /**
  * Spring configuration defining the scanner beans for this amqp plugin.

diff --git a/...erties/SpringwolfAmqpConfigConstants.java → ...erties/SpringwolfAmqpConfigConstants.java b/...erties/SpringwolfAmqpConfigConstants.java → ...erties/SpringwolfAmqpConfigConstants.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.properties;
+package io.github.springwolf.plugins.amqp.configuration.properties;
 
 import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.ENABLED;
 import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SCANNER;

diff --git a/...rties/SpringwolfAmqpConfigProperties.java → ...rties/SpringwolfAmqpConfigProperties.java b/...rties/SpringwolfAmqpConfigProperties.java → ...rties/SpringwolfAmqpConfigProperties.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.properties;
+package io.github.springwolf.plugins.amqp.configuration.properties;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ls/annotation/RabbitListenerUtilTest.java → ...ners/bindings/RabbitListenerUtilTest.java b/...ls/annotation/RabbitListenerUtilTest.java → ...ners/bindings/RabbitListenerUtilTest.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.channels.annotation;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings;
 
 import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
 import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;

diff --git a/...ssor/AmqpMessageBindingProcessorTest.java → ...ages/AmqpMessageBindingProcessorTest.java b/...ssor/AmqpMessageBindingProcessorTest.java → ...ages/AmqpMessageBindingProcessorTest.java
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.messages;
 
 import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding;
-import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
+import io.github.springwolf.plugins.amqp.asyncapi.annotations.AmqpAsyncOperationBinding;
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;

diff --git a/...or/AmqpOperationBindingProcessorTest.java → ...ns/AmqpOperationBindingProcessorTest.java b/...or/AmqpOperationBindingProcessorTest.java → ...ns/AmqpOperationBindingProcessorTest.java
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.asyncapi.scanners.bindings.operations;
 
 import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
-import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
+import io.github.springwolf.plugins.amqp.asyncapi.annotations.AmqpAsyncOperationBinding;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;

diff --git a/...s/CloudStreamFunctionChannelsScanner.java → ...s/CloudStreamFunctionChannelsScanner.java b/...s/CloudStreamFunctionChannelsScanner.java → ...s/CloudStreamFunctionChannelsScanner.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.cloudstream.scanners.channels;
+package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.channels;
 
 import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
 import io.github.springwolf.asyncapi.v3.bindings.EmptyChannelBinding;
@@ -20,6 +20,8 @@
 import io.github.springwolf.core.asyncapi.scanners.channels.ChannelMerger;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocket;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
+import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanBuilder;
+import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.stream.config.BindingServiceProperties;

diff --git a/...hannels/FunctionalChannelBeanBuilder.java → .../common/FunctionalChannelBeanBuilder.java b/...hannels/FunctionalChannelBeanBuilder.java → .../common/FunctionalChannelBeanBuilder.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.cloudstream.scanners.channels;
+package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common;
 
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor;
 import lombok.RequiredArgsConstructor;

diff --git a/...ub/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanData.java b/...ub/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanData.java
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common;
+
+public record FunctionalChannelBeanData(
+ String beanName, Class<?> payloadType, BeanType beanType, String cloudStreamBinding) {
+
+ public enum BeanType {
+ CONSUMER,
+ SUPPLIER
+ }
+}
diff --git a/...CloudStreamFunctionOperationsScanner.java → ...CloudStreamFunctionOperationsScanner.java b/...CloudStreamFunctionOperationsScanner.java → ...CloudStreamFunctionOperationsScanner.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.plugins.cloudstream.scanners.channels;
+package io.github.springwolf.plugins.cloudstream.asyncapi.scanners.operations;
 
 import io.github.springwolf.asyncapi.v3.bindings.EmptyMessageBinding;
 import io.github.springwolf.asyncapi.v3.bindings.EmptyOperationBinding;
@@ -20,6 +20,8 @@
 import io.github.springwolf.core.asyncapi.scanners.operations.OperationMerger;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocket;
 import io.github.springwolf.core.configuration.docket.AsyncApiDocketService;
+import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanBuilder;
+import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.stream.config.BindingServiceProperties;