From 86e3406ab9167ea208e6f799019db31c61efc550 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Fri, 1 Mar 2024 18:25:52 +0100 Subject: [PATCH] chore(plugins): move packages in plugins (#633) --- .../examples/walkers/ExampleValueGenerator.java | 2 +- .../examples/amqp/producers/AnotherProducer.java | 2 +- .../examples/jms/producers/AnotherProducer.java | 2 +- .../examples/kafka/consumers/AvroConsumer.java | 2 +- .../consumers/ExampleClassLevelKafkaListener.java | 2 +- .../examples/kafka/consumers/StringConsumer.java | 2 +- .../examples/kafka/consumers/XmlConsumer.java | 2 +- .../examples/kafka/consumers/YamlConsumer.java | 2 +- .../examples/kafka/producers/NestedProducer.java | 11 ++++++----- .../springwolf/examples/kafka/ProducerSystemTest.java | 2 +- .../src/test/resources/asyncapi.json | 2 +- .../examples/sns/consumers/ExampleConsumer.java | 4 ++-- .../examples/sns/producers/AnotherProducer.java | 4 ++-- .../examples/sqs/producers/AnotherProducer.java | 4 ++-- .../annotations}/AmqpAsyncOperationBinding.java | 2 +- .../headers}/AsyncHeadersForAmqpBuilder.java | 2 +- .../scanners/bindings/AmqpBindingFactory.java | 3 +-- .../scanners/bindings}/RabbitListenerUtil.java | 2 +- .../messages}/AmqpMessageBindingProcessor.java | 4 ++-- .../operations}/AmqpOperationBindingProcessor.java | 4 ++-- .../SpringwolfAmqpAutoConfiguration.java | 2 +- .../SpringwolfAmqpProducerConfiguration.java | 4 ++-- .../SpringwolfAmqpScannerConfiguration.java | 10 +++++----- .../properties/SpringwolfAmqpConfigConstants.java | 2 +- .../properties/SpringwolfAmqpConfigProperties.java | 2 +- .../scanners/bindings}/RabbitListenerUtilTest.java | 2 +- .../messages}/AmqpMessageBindingProcessorTest.java | 4 ++-- .../AmqpOperationBindingProcessorTest.java | 4 ++-- .../channels/CloudStreamFunctionChannelsScanner.java | 4 +++- .../common}/FunctionalChannelBeanBuilder.java | 2 +- .../scanners/common/FunctionalChannelBeanData.java | 11 +++++++++++ .../CloudStreamFunctionOperationsScanner.java | 4 +++- .../SpringwolfCloudStreamAutoConfiguration.java | 6 +++--- .../scanners/channels/FunctionalChannelBeanData.java | 10 ---------- ...dStreamFunctionChannelsScannerIntegrationTest.java | 6 ++++-- .../common}/FunctionalChannelBeanBuilderTest.java | 6 +++--- .../annotations}/JmsAsyncOperationBinding.java | 2 +- .../scanners/bindings/JmsBindingFactory.java | 3 +-- .../scanners/bindings}/JmsListenerUtil.java | 2 +- .../messages}/JmsMessageBindingProcessor.java | 4 ++-- .../operations}/JmsOperationBindingProcessor.java | 4 ++-- .../configuration/SpringwolfJmsAutoConfiguration.java | 2 +- .../SpringwolfJmsProducerConfiguration.java | 4 ++-- .../SpringwolfJmsScannerConfiguration.java | 8 ++++---- .../properties/SpringwolfJmsConfigConstants.java | 2 +- .../properties/SpringwolfJmsConfigProperties.java | 2 +- .../scanners/bindings}/JmsListenerUtilTest.java | 2 +- .../messages}/JmsMessageBindingProcessorTest.java | 4 ++-- .../operations}/JmsOperationBindingProcessorTest.java | 4 ++-- .../annotations}/KafkaAsyncOperationBinding.java | 2 +- .../header/AsyncHeadersForKafkaBuilder.java | 2 +- .../header/AsyncHeadersForSpringKafkaBuilder.java | 2 +- .../scanners/bindings/KafkaBindingFactory.java | 4 ++-- .../messages}/KafkaMessageBindingProcessor.java | 4 ++-- .../operations}/KafkaOperationBindingProcessor.java | 6 +++--- .../scanners/common}/KafkaListenerUtil.java | 2 +- .../SpringwolfKafkaAutoConfiguration.java | 2 +- .../SpringwolfKafkaProducerConfiguration.java | 6 +++--- .../SpringwolfKafkaScannerConfiguration.java | 10 +++++----- .../properties/SpringwolfKafkaConfigConstants.java | 2 +- .../properties/SpringwolfKafkaConfigProperties.java | 2 +- .../SpringwolfKafkaTemplateFromProperties.java | 2 +- .../messages}/KafkaMessageBindingProcessorTest.java | 4 ++-- .../KafkaOperationBindingProcessorTest.java | 4 ++-- .../scanners/common}/KafkaListenerUtilTest.java | 2 +- .../SpringwolfKafkaTemplateFromPropertiesTest.java | 2 +- .../SnsAsyncOperationBinding.java | 2 +- .../SnsAsyncOperationBindingIdentifier.java | 2 +- .../messages}/SnsMessageBindingProcessor.java | 4 ++-- .../operations}/SnsOperationBindingProcessor.java | 6 +++--- .../configuration/SpringwolfSnsAutoConfiguration.java | 2 +- .../SpringwolfSnsProducerConfiguration.java | 4 ++-- .../SpringwolfSnsScannerConfiguration.java | 4 ++-- .../properties/SpringwolfSnsConfigConstants.java | 2 +- .../properties/SpringwolfSnsConfigProperties.java | 2 +- .../messages}/SnsMessageBindingProcessorTest.java | 6 +++--- .../operations}/SnsOperationBindingProcessorTest.java | 6 +++--- .../SqsAsyncOperationBinding.java | 2 +- .../SqsAsyncQueueBinding.java | 2 +- .../scanners/bindings/SqsBindingFactory.java | 3 +-- .../scanners/bindings}/SqsListenerUtil.java | 2 +- .../messages}/SqsMessageBindingProcessor.java | 4 ++-- .../operations}/SqsOperationBindingProcessor.java | 6 +++--- .../configuration/SpringwolfSqsAutoConfiguration.java | 2 +- .../SpringwolfSqsProducerConfiguration.java | 4 ++-- .../SpringwolfSqsScannerConfiguration.java | 8 ++++---- .../properties/SpringwolfSqsConfigConstants.java | 2 +- .../properties/SpringwolfSqsConfigProperties.java | 2 +- .../scanners/bindings}/SqsListenerUtilTest.java | 2 +- .../messages}/SqsMessageBindingProcessorTest.java | 4 ++-- .../operations}/SqsOperationBindingProcessorTest.java | 6 +++--- 91 files changed, 167 insertions(+), 162 deletions(-) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{scanners/channels/operationdata/annotation => asyncapi/annotations}/AmqpAsyncOperationBinding.java (92%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{types/channel/operation/message/header => asyncapi/components/headers}/AsyncHeadersForAmqpBuilder.java (85%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{ => asyncapi}/scanners/bindings/AmqpBindingFactory.java (93%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{scanners/channels/annotation => asyncapi/scanners/bindings}/RabbitListenerUtil.java (99%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/AmqpMessageBindingProcessor.java (88%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/AmqpOperationBindingProcessor.java (87%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{ => configuration}/properties/SpringwolfAmqpConfigConstants.java (91%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/{ => configuration}/properties/SpringwolfAmqpConfigProperties.java (94%) rename springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/{scanners/channels/annotation => asyncapi/scanners/bindings}/RabbitListenerUtilTest.java (99%) rename springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/AmqpMessageBindingProcessorTest.java (87%) rename springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/AmqpOperationBindingProcessorTest.java (88%) rename springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/{ => asyncapi}/scanners/channels/CloudStreamFunctionChannelsScanner.java (94%) rename springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/{scanners/channels => asyncapi/scanners/common}/FunctionalChannelBeanBuilder.java (96%) create mode 100644 springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanData.java rename springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/{scanners/channels => asyncapi/scanners/operations}/CloudStreamFunctionOperationsScanner.java (95%) delete mode 100644 springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java rename springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/{ => asyncapi}/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java (98%) rename springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/{scanners/channels => asyncapi/scanners/common}/FunctionalChannelBeanBuilderTest.java (93%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{scanners/channels/operationdata/annotation => asyncapi/annotations}/JmsAsyncOperationBinding.java (90%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{ => asyncapi}/scanners/bindings/JmsBindingFactory.java (91%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{scanners/channels/annotation => asyncapi/scanners/bindings}/JmsListenerUtil.java (95%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/JmsMessageBindingProcessor.java (88%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/JmsOperationBindingProcessor.java (78%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{ => configuration}/properties/SpringwolfJmsConfigConstants.java (91%) rename springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/{ => configuration}/properties/SpringwolfJmsConfigProperties.java (94%) rename springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/{scanners/channels/annotation => asyncapi/scanners/bindings}/JmsListenerUtilTest.java (98%) rename springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/JmsMessageBindingProcessorTest.java (87%) rename springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/JmsOperationBindingProcessorTest.java (85%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{scanners/channels/operationdata/annotation => asyncapi/annotations}/KafkaAsyncOperationBinding.java (95%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{types/channel/operation/message => asyncapi/components}/header/AsyncHeadersForKafkaBuilder.java (86%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{types/channel/operation/message => asyncapi/components}/header/AsyncHeadersForSpringKafkaBuilder.java (95%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{ => asyncapi}/scanners/bindings/KafkaBindingFactory.java (90%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/KafkaMessageBindingProcessor.java (93%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/KafkaOperationBindingProcessor.java (84%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{scanners/channels/annotation => asyncapi/scanners/common}/KafkaListenerUtil.java (97%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{ => configuration}/properties/SpringwolfKafkaConfigConstants.java (91%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/{ => configuration}/properties/SpringwolfKafkaConfigProperties.java (95%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/KafkaMessageBindingProcessorTest.java (87%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/KafkaOperationBindingProcessorTest.java (85%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/{scanners/channels/annotation => asyncapi/scanners/common}/KafkaListenerUtilTest.java (97%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata/annotation => annotations}/SnsAsyncOperationBinding.java (92%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata/annotation => annotations}/SnsAsyncOperationBindingIdentifier.java (94%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata => asyncapi/scanners/bindings/messages}/SnsMessageBindingProcessor.java (87%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata => asyncapi/scanners/bindings/operations}/SnsOperationBindingProcessor.java (88%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{ => configuration}/properties/SpringwolfSnsConfigConstants.java (86%) rename springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/{ => configuration}/properties/SpringwolfSnsConfigProperties.java (94%) rename springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata => asyncapi/scanners/bindings/messages}/SnsMessageBindingProcessorTest.java (81%) rename springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/{scanners/channels/operationdata => asyncapi/scanners/bindings/operations}/SnsOperationBindingProcessorTest.java (84%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{scanners/channels/operationdata/annotation => annotations}/SqsAsyncOperationBinding.java (91%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{scanners/channels/operationdata/annotation => annotations}/SqsAsyncQueueBinding.java (84%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{ => asyncapi}/scanners/bindings/SqsBindingFactory.java (91%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{scanners/channels/annotation => asyncapi/scanners/bindings}/SqsListenerUtil.java (97%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/SqsMessageBindingProcessor.java (88%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/SqsOperationBindingProcessor.java (80%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{ => configuration}/properties/SpringwolfSqsConfigConstants.java (91%) rename springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/{ => configuration}/properties/SpringwolfSqsConfigProperties.java (94%) rename springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/{scanners/channels/annotation => asyncapi/scanners/bindings}/SqsListenerUtilTest.java (98%) rename springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/{scanners/bindings/processor => asyncapi/scanners/bindings/messages}/SqsMessageBindingProcessorTest.java (87%) rename springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/{scanners/bindings/processor => asyncapi/scanners/bindings/operations}/SqsOperationBindingProcessorTest.java (83%) diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java index a8d6e5496..d7cc363c4 100644 --- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java +++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java @@ -39,7 +39,7 @@ public interface ExampleValueGenerator { 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/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java index 25d268a4b..845c67c40 100644 --- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java +++ b/springwolf-examples/springwolf-amqp-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/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java index f23fd294e..04e577a33 100644 --- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java +++ b/springwolf-examples/springwolf-jms-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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java index 70ccc390a..2f0132e0f 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java +++ b/springwolf-examples/springwolf-kafka-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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java index 44f34704e..2ee51715d 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java +++ b/springwolf-examples/springwolf-kafka-example/src/main/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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java index d4e3e9fb8..cf08faaee 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java +++ b/springwolf-examples/springwolf-kafka-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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java index b9627e84e..b3a3d6ad2 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java +++ b/springwolf-examples/springwolf-kafka-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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java index 1966de3b7..dcfe24728 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java +++ b/springwolf-examples/springwolf-kafka-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/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java index 7917b2029..ad81f82e5 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java +++ b/springwolf-examples/springwolf-kafka-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/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java index 62b71bc6a..4fca18c5e 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java +++ b/springwolf-examples/springwolf-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 index 3fe6d6702..6022c2145 100644 --- 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 @@ ] } } -} +} \ No newline at end of file diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java index 183499a85..3590c8f74 100644 --- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java +++ b/springwolf-examples/springwolf-sns-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/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java index e10d1fef9..573fb95c9 100644 --- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java +++ b/springwolf-examples/springwolf-sns-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/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java index e541cc596..d07e77934 100644 --- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java +++ b/springwolf-examples/springwolf-sqs-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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/annotations/AmqpAsyncOperationBinding.java similarity index 92% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/annotations/AmqpAsyncOperationBinding.java index f7de15be0..47bf00692 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/annotations/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/components/headers/AsyncHeadersForAmqpBuilder.java similarity index 85% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/components/headers/AsyncHeadersForAmqpBuilder.java index 3e86f5d75..211ce4a01 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/components/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/AmqpBindingFactory.java similarity index 93% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/AmqpBindingFactory.java index 87e92dfca..39ae03f9a 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/RabbitListenerUtil.java similarity index 99% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/RabbitListenerUtil.java index 5d049a138..09a6200a3 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/messages/AmqpMessageBindingProcessor.java similarity index 88% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/messages/AmqpMessageBindingProcessor.java index 1bf585990..9b8a42c55 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/AmqpOperationBindingProcessor.java similarity index 87% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/AmqpOperationBindingProcessor.java index c1e902fbd..21d46b01b 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java index 7c70274b6..20357d40a 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java index 8718cae7d..10ab62118 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java index 0ad595180..d4926c764 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigConstants.java similarity index 91% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigConstants.java index 3fe560001..2956cbe1c 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/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/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java similarity index 94% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java index b1bd05230..bbacd602d 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/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/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/RabbitListenerUtilTest.java similarity index 99% rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/RabbitListenerUtilTest.java index d0810c496..a8bd9717d 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/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/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/messages/AmqpMessageBindingProcessorTest.java similarity index 87% rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/messages/AmqpMessageBindingProcessorTest.java index f1ce05326..b8f9fcda7 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/messages/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/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/AmqpOperationBindingProcessorTest.java similarity index 88% rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/AmqpOperationBindingProcessorTest.java index a28b1eb5c..5ee4c6253 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/operations/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/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScanner.java similarity index 94% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScanner.java index 35ee99773..441f22bae 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/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/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java similarity index 96% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilder.java index 50d5dbf83..0ff74871a 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/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/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanData.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanData.java new file mode 100644 index 000000000..578a3881f --- /dev/null +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/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/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/operations/CloudStreamFunctionOperationsScanner.java similarity index 95% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/operations/CloudStreamFunctionOperationsScanner.java index 1c922b175..a73d89672 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/operations/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; diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java index a07d7d3d2..77ed475b8 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java @@ -6,9 +6,9 @@ import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor; import io.github.springwolf.core.configuration.docket.AsyncApiDocketService; import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants; -import io.github.springwolf.plugins.cloudstream.scanners.channels.CloudStreamFunctionChannelsScanner; -import io.github.springwolf.plugins.cloudstream.scanners.channels.CloudStreamFunctionOperationsScanner; -import io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanBuilder; +import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.channels.CloudStreamFunctionChannelsScanner; +import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanBuilder; +import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.operations.CloudStreamFunctionOperationsScanner; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.stream.config.BindingServiceProperties; diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java deleted file mode 100644 index ac1db3093..000000000 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.cloudstream.scanners.channels; - -record FunctionalChannelBeanData(String beanName, Class payloadType, BeanType beanType, String cloudStreamBinding) { - - enum BeanType { - CONSUMER, - SUPPLIER - } -} diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java similarity index 98% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java index 5ffba80e7..e679a8275 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.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; @@ -29,6 +29,8 @@ import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor; import io.github.springwolf.core.configuration.docket.DefaultAsyncApiDocketService; import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties; +import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanBuilder; +import io.github.springwolf.plugins.cloudstream.asyncapi.scanners.operations.CloudStreamFunctionOperationsScanner; import org.apache.kafka.streams.kstream.KStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -77,7 +79,7 @@ "springwolf.enabled=true", "springwolf.docket.info.title=Test", "springwolf.docket.info.version=1.0.0", - "springwolf.docket.base-package=io.github.springwolf.plugins.cloudstream.scanners.channels", + "springwolf.docket.base-package=io.github.springwolf.plugins.cloudstream.asyncapi.scanners.channels", "springwolf.docket.servers.kafka.protocol=kafka", "springwolf.docket.servers.kafka.host=kafka:9092", }) diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java similarity index 93% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.java index 973455174..69eadfc97 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/asyncapi/scanners/common/FunctionalChannelBeanBuilderTest.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 io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties; @@ -16,8 +16,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import static io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanData.BeanType.CONSUMER; -import static io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanData.BeanType.SUPPLIER; +import static io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanData.BeanType.CONSUMER; +import static io.github.springwolf.plugins.cloudstream.asyncapi.scanners.common.FunctionalChannelBeanData.BeanType.SUPPLIER; class FunctionalChannelBeanBuilderTest { private final SpringwolfConfigProperties properties = new SpringwolfConfigProperties(); diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/annotations/JmsAsyncOperationBinding.java similarity index 90% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/annotations/JmsAsyncOperationBinding.java index c16a6aa39..1204a1e01 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/annotations/JmsAsyncOperationBinding.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.jms.asyncapi.annotations; import io.github.springwolf.core.asyncapi.annotations.AsyncListener; import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsBindingFactory.java similarity index 91% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsBindingFactory.java index 0e7521586..21623d769 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsBindingFactory.java @@ -1,11 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.bindings; +package io.github.springwolf.plugins.jms.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.jms.scanners.channels.annotation.JmsListenerUtil; import lombok.NoArgsConstructor; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.jms.annotation.JmsListener; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtil.java similarity index 95% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtil.java index bbc01405d..8ffdf69f4 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtil.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.channels.annotation; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; import io.github.springwolf.asyncapi.v3.bindings.MessageBinding; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessor.java similarity index 88% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessor.java index dc426d3a4..463580e0e 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessor.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.bindings.processor; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding; 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.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding; +import io.github.springwolf.plugins.jms.asyncapi.annotations.JmsAsyncOperationBinding; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.util.StringValueResolver; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessor.java similarity index 78% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessor.java index f46b56bfa..396324793 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessor.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.bindings.processor; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding; 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.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding; +import io.github.springwolf.plugins.jms.asyncapi.annotations.JmsAsyncOperationBinding; public class JmsOperationBindingProcessor extends AbstractOperationBindingProcessor { diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java index df95b35a0..a09dc2054 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java @@ -2,7 +2,7 @@ package io.github.springwolf.plugins.jms.configuration; import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants; -import io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigProperties; +import io.github.springwolf.plugins.jms.configuration.properties.SpringwolfJmsConfigProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java index 380a6f919..2a7e17bf5 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java @@ -12,8 +12,8 @@ import java.util.List; -import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_CONFIG_PREFIX; -import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_PLUGIN_PUBLISHING_ENABLED; +import static io.github.springwolf.plugins.jms.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_CONFIG_PREFIX; +import static io.github.springwolf.plugins.jms.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_PLUGIN_PUBLISHING_ENABLED; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty( diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java index b801d3ab3..d5e33abc9 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java @@ -10,9 +10,9 @@ import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor; import io.github.springwolf.core.asyncapi.scanners.operations.SpringAnnotationOperationsScanner; import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner; -import io.github.springwolf.plugins.jms.scanners.bindings.JmsBindingFactory; -import io.github.springwolf.plugins.jms.scanners.bindings.processor.JmsMessageBindingProcessor; -import io.github.springwolf.plugins.jms.scanners.bindings.processor.JmsOperationBindingProcessor; +import io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.JmsBindingFactory; +import io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.messages.JmsMessageBindingProcessor; +import io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.operations.JmsOperationBindingProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -20,7 +20,7 @@ import org.springframework.core.annotation.Order; import org.springframework.jms.annotation.JmsListener; -import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED; +import static io.github.springwolf.plugins.jms.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED; /** * spring configuration defining the scanner beans for the jms plugin diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigConstants.java similarity index 91% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigConstants.java index f30b554f5..69b2d8452 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigConstants.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.properties; +package io.github.springwolf.plugins.jms.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/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java similarity index 94% rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java index 77e8b936d..5bcd0e5a3 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.properties; +package io.github.springwolf.plugins.jms.configuration.properties; import lombok.Getter; import lombok.Setter; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtilTest.java similarity index 98% rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtilTest.java index 9b2d3bdfa..ebd850ddd 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/JmsListenerUtilTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.channels.annotation; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; import io.github.springwolf.asyncapi.v3.bindings.MessageBinding; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessorTest.java similarity index 87% rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessorTest.java index a7deb61e3..8e305213a 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/messages/JmsMessageBindingProcessorTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.bindings.processor; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding; -import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding; +import io.github.springwolf.plugins.jms.asyncapi.annotations.JmsAsyncOperationBinding; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessorTest.java similarity index 85% rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessorTest.java index 16c687954..78842ded2 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/asyncapi/scanners/bindings/operations/JmsOperationBindingProcessorTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.jms.scanners.bindings.processor; +package io.github.springwolf.plugins.jms.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding; -import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding; +import io.github.springwolf.plugins.jms.asyncapi.annotations.JmsAsyncOperationBinding; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/annotations/KafkaAsyncOperationBinding.java similarity index 95% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/annotations/KafkaAsyncOperationBinding.java index 625eee147..24bcff221 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/annotations/KafkaAsyncOperationBinding.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.kafka.asyncapi.annotations; import io.github.springwolf.core.asyncapi.annotations.AsyncListener; import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForKafkaBuilder.java similarity index 86% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForKafkaBuilder.java index 3c42f0e2e..e79295737 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForKafkaBuilder.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.types.channel.operation.message.header; +package io.github.springwolf.plugins.kafka.asyncapi.components.header; import io.github.springwolf.core.asyncapi.components.headers.AsyncHeaders; import io.github.springwolf.core.asyncapi.components.headers.AsyncHeadersBuilder; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForSpringKafkaBuilder.java similarity index 95% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForSpringKafkaBuilder.java index c85312164..12f196b00 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/components/header/AsyncHeadersForSpringKafkaBuilder.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.types.channel.operation.message.header; +package io.github.springwolf.plugins.kafka.asyncapi.components.header; import io.github.springwolf.core.asyncapi.components.headers.AsyncHeaderSchema; import io.github.springwolf.core.asyncapi.components.headers.AsyncHeaders; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/KafkaBindingFactory.java similarity index 90% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/KafkaBindingFactory.java index 68abbf322..9262b9eb0 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/KafkaBindingFactory.java @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.bindings; +package io.github.springwolf.plugins.kafka.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.kafka.scanners.channels.annotation.KafkaListenerUtil; +import io.github.springwolf.plugins.kafka.asyncapi.scanners.common.KafkaListenerUtil; import lombok.NoArgsConstructor; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.kafka.annotation.KafkaListener; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessor.java similarity index 93% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessor.java index 8ce032406..968d7d88b 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessor.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.bindings.processor; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding; import io.github.springwolf.asyncapi.v3.model.schema.Schema; import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject; 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.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding; +import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.util.StringUtils; import org.springframework.util.StringValueResolver; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessor.java similarity index 84% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessor.java index fc6e4888d..37660a6b8 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessor.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.bindings.processor; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding; import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject; 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.kafka.scanners.channels.annotation.KafkaListenerUtil; -import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding; +import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding; +import io.github.springwolf.plugins.kafka.asyncapi.scanners.common.KafkaListenerUtil; import org.springframework.util.StringUtils; public class KafkaOperationBindingProcessor extends AbstractOperationBindingProcessor { diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java similarity index 97% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java index a635d18f0..b0f6b2f16 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.channels.annotation; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.common; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; import io.github.springwolf.asyncapi.v3.bindings.MessageBinding; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java index d0533a0a2..58331a6d0 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java @@ -2,7 +2,7 @@ package io.github.springwolf.plugins.kafka.configuration; import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants; -import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties; +import io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java index 0404f1ef4..d4f0ca7f5 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java @@ -2,18 +2,18 @@ package io.github.springwolf.plugins.kafka.configuration; import io.github.springwolf.core.controller.PublishingPayloadCreator; +import io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigProperties; import io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaController; import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer; import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateFromProperties; import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateProvider; -import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; -import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; +import static io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; +import static io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty( diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java index 42932bc70..d9c2d5511 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.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.kafka.scanners.bindings.KafkaBindingFactory; -import io.github.springwolf.plugins.kafka.scanners.bindings.processor.KafkaMessageBindingProcessor; -import io.github.springwolf.plugins.kafka.scanners.bindings.processor.KafkaOperationBindingProcessor; -import io.github.springwolf.plugins.kafka.types.channel.operation.message.header.AsyncHeadersForKafkaBuilder; +import io.github.springwolf.plugins.kafka.asyncapi.components.header.AsyncHeadersForKafkaBuilder; +import io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.KafkaBindingFactory; +import io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.messages.KafkaMessageBindingProcessor; +import io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.operations.KafkaOperationBindingProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -24,7 +24,7 @@ import org.springframework.kafka.annotation.KafkaHandler; import org.springframework.kafka.annotation.KafkaListener; -import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; +import static io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; /** * spring configuration defining the scanner beans for the kafka plugin diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigConstants.java similarity index 91% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigConstants.java index fae388d07..e54383bd5 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigConstants.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.properties; +package io.github.springwolf.plugins.kafka.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/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java similarity index 95% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java index 5b899ebd1..ad8562902 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.properties; +package io.github.springwolf.plugins.kafka.configuration.properties; import lombok.Getter; import lombok.Setter; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java index 85909e012..fc10ff759 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java @@ -2,7 +2,7 @@ package io.github.springwolf.plugins.kafka.producer; import io.github.springwolf.plugins.kafka.configuration.SpringwolfKafkaProducerConfiguration; -import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties; +import io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigProperties; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.ssl.DefaultSslBundleRegistry; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessorTest.java similarity index 87% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessorTest.java index a4381156a..99058b09c 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/messages/KafkaMessageBindingProcessorTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.bindings.processor; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding; -import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding; +import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessorTest.java similarity index 85% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessorTest.java index 262c0a6fe..dc2f9c43a 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/bindings/operations/KafkaOperationBindingProcessorTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.bindings.processor; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding; -import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding; +import io.github.springwolf.plugins.kafka.asyncapi.annotations.KafkaAsyncOperationBinding; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtilTest.java similarity index 97% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtilTest.java index 45406fc58..ffc68128f 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtilTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.kafka.scanners.channels.annotation; +package io.github.springwolf.plugins.kafka.asyncapi.scanners.common; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; import io.github.springwolf.asyncapi.v3.bindings.MessageBinding; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java index c69164231..4b3ec69f9 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.kafka.producer; -import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties; +import io.github.springwolf.plugins.kafka.configuration.properties.SpringwolfKafkaConfigProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; import org.springframework.boot.ssl.DefaultSslBundleRegistry; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBinding.java similarity index 92% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBinding.java index 5681013dc..24127afa4 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBinding.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.sns.annotations; import io.github.springwolf.core.asyncapi.annotations.AsyncListener; import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBindingIdentifier.java similarity index 94% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBindingIdentifier.java index 4f3224582..03c01e94c 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/annotations/SnsAsyncOperationBindingIdentifier.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.sns.annotations; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessor.java similarity index 87% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessor.java index 1dce913a2..6969ff430 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessor.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata; +package io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding; 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.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding; +import io.github.springwolf.plugins.sns.annotations.SnsAsyncOperationBinding; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.util.StringValueResolver; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessor.java similarity index 88% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessor.java index ecac3fc22..01a46bb49 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessor.java @@ -1,13 +1,13 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata; +package io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier; 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.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 java.util.List; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java index fce173610..8f645709c 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java @@ -2,7 +2,7 @@ package io.github.springwolf.plugins.sns.configuration; import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants; -import io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigProperties; +import io.github.springwolf.plugins.sns.configuration.properties.SpringwolfSnsConfigProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java index 65a351139..3bec7446b 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java @@ -12,8 +12,8 @@ import java.util.List; -import static io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_CONFIG_PREFIX; -import static io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_PLUGIN_PUBLISHING_ENABLED; +import static io.github.springwolf.plugins.sns.configuration.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_CONFIG_PREFIX; +import static io.github.springwolf.plugins.sns.configuration.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_PLUGIN_PUBLISHING_ENABLED; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty( diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java index fc3481036..b5c2c65cd 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java @@ -2,8 +2,8 @@ package io.github.springwolf.plugins.sns.configuration; import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority; -import io.github.springwolf.plugins.sns.scanners.channels.operationdata.SnsMessageBindingProcessor; -import io.github.springwolf.plugins.sns.scanners.channels.operationdata.SnsOperationBindingProcessor; +import io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.messages.SnsMessageBindingProcessor; +import io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.operations.SnsOperationBindingProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigConstants.java similarity index 86% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigConstants.java index 4e913be4d..5f710e292 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigConstants.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.properties; +package io.github.springwolf.plugins.sns.configuration.properties; import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java similarity index 94% rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java index 4d6de2a82..ea3abcdb4 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.properties; +package io.github.springwolf.plugins.sns.configuration.properties; import lombok.Getter; import lombok.Setter; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessorTest.java similarity index 81% rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessorTest.java index 12003bf22..1a3cd78f7 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/messages/SnsMessageBindingProcessorTest.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata; +package io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding; -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 org.junit.jupiter.api.Test; import java.lang.reflect.Method; diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessorTest.java similarity index 84% rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessorTest.java index 416fd8380..bb8651956 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/asyncapi/scanners/bindings/operations/SnsOperationBindingProcessorTest.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sns.scanners.channels.operationdata; +package io.github.springwolf.plugins.sns.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer; import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding; -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 org.junit.jupiter.api.Test; import java.util.List; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncOperationBinding.java similarity index 91% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncOperationBinding.java index 805a72d9d..565e3fd95 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncOperationBinding.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.sqs.annotations; import io.github.springwolf.core.asyncapi.annotations.AsyncListener; import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncQueueBinding.java similarity index 84% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncQueueBinding.java index 1d50008ab..78dfb5454 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/annotations/SqsAsyncQueueBinding.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation; +package io.github.springwolf.plugins.sqs.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsBindingFactory.java similarity index 91% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsBindingFactory.java index 080000a20..c752e8496 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsBindingFactory.java @@ -1,12 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.bindings; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings; import io.awspring.cloud.sqs.annotation.SqsListener; 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.sqs.scanners.channels.annotation.SqsListenerUtil; import lombok.NoArgsConstructor; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.util.StringValueResolver; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtil.java similarity index 97% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtil.java index 0aee49ea5..5fc0d758b 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtil.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.channels.annotation; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings; import io.awspring.cloud.sqs.annotation.SqsListener; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessor.java similarity index 88% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessor.java index bfae29ca3..3abd2f71e 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessor.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.bindings.processor; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding; 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.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding; +import io.github.springwolf.plugins.sqs.annotations.SqsAsyncOperationBinding; import org.springframework.context.EmbeddedValueResolverAware; import org.springframework.util.StringValueResolver; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessor.java similarity index 80% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessor.java index 1bec9d401..eb6af0133 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessor.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.bindings.processor; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding; 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.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 java.util.ArrayList; import java.util.List; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java index 7ad8945db..090928d1e 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java @@ -2,7 +2,7 @@ package io.github.springwolf.plugins.sqs.configuration; import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants; -import io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigProperties; +import io.github.springwolf.plugins.sqs.configuration.properties.SpringwolfSqsConfigProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java index 2c34fe1f8..dba1f59cd 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java @@ -12,8 +12,8 @@ import java.util.List; -import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_CONFIG_PREFIX; -import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_PLUGIN_PUBLISHING_ENABLED; +import static io.github.springwolf.plugins.sqs.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_CONFIG_PREFIX; +import static io.github.springwolf.plugins.sqs.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_PLUGIN_PUBLISHING_ENABLED; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty( diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java index 7264b181d..6ed501bfa 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java @@ -11,16 +11,16 @@ import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadClassExtractor; import io.github.springwolf.core.asyncapi.scanners.operations.SpringAnnotationOperationsScanner; import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner; -import io.github.springwolf.plugins.sqs.scanners.bindings.SqsBindingFactory; -import io.github.springwolf.plugins.sqs.scanners.bindings.processor.SqsMessageBindingProcessor; -import io.github.springwolf.plugins.sqs.scanners.bindings.processor.SqsOperationBindingProcessor; +import io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.SqsBindingFactory; +import io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.messages.SqsMessageBindingProcessor; +import io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.operations.SqsOperationBindingProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; -import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED; +import static io.github.springwolf.plugins.sqs.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED; /** * spring configuration defining the scanner beans for the kafka plugin diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigConstants.java similarity index 91% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigConstants.java index f73bdbb7a..72d4955c4 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigConstants.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.properties; +package io.github.springwolf.plugins.sqs.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/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java similarity index 94% rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java index ae2a7c824..b696bbbc3 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.properties; +package io.github.springwolf.plugins.sqs.configuration.properties; import lombok.Getter; import lombok.Setter; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtilTest.java similarity index 98% rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtilTest.java index 46610aae5..b738b9ee4 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/SqsListenerUtilTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.channels.annotation; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings; import io.awspring.cloud.sqs.annotation.SqsListener; import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessorTest.java similarity index 87% rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessorTest.java index b82614c07..388eb899e 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/messages/SqsMessageBindingProcessorTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.bindings.processor; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.messages; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.messages.ProcessedMessageBinding; -import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding; +import io.github.springwolf.plugins.sqs.annotations.SqsAsyncOperationBinding; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessorTest.java similarity index 83% rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessorTest.java index b5680b566..6e6de868f 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/asyncapi/scanners/bindings/operations/SqsOperationBindingProcessorTest.java @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 -package io.github.springwolf.plugins.sqs.scanners.bindings.processor; +package io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.operations; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue; import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding; -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 org.junit.jupiter.api.Test; import java.util.List;