From 6af4338b318aa21f2f3ba2cd9d0cc73238ccaaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCller?= Date: Fri, 28 Jul 2023 14:12:36 +0200 Subject: [PATCH 1/6] test: Rename all integration test with IntegrationTest postfix Co-authored-by: Timon Back --- ...java => SpringContextIntegrationTest.java} | 2 +- ...cApiSerializerServiceIntegrationTest.java} | 4 +- ...DefaultAsyncApiServiceIntegrationTest.java | 156 +++++++++++++ .../asyncapi/DefaultAsyncApiServiceTest.java | 220 ++++++++---------- .../DefaultAsyncApiServiceUnitTest.java | 124 ---------- ...efaultChannelsServiceIntegrationTest.java} | 10 +- ...ultBeanMethodsScannerIntegrationTest.java} | 2 +- .../TestMethodLevelListenerScanner.java | 14 +- ...dLevelListenerScannerIntegrationTest.java} | 2 +- ...rOperationDataScannerIntegrationTest.java} | 2 +- ...rOperationDataScannerIntegrationTest.java} | 2 +- ...enerAnnotationScannerIntegrationTest.java} | 2 +- ...sherAnnotationScannerIntegrationTest.java} | 2 +- ...ComponentClassScannerIntegrationTest.java} | 2 +- ...igurationClassScannerIntegrationTest.java} | 2 +- ... => AutoConfigurationIntegrationTest.java} | 2 +- ...Test.java => InitModeIntegrationTest.java} | 2 +- ...SchemasServiceContextIntegrationTest.java} | 2 +- ...IntegrationWithDockerIntegrationTest.java} | 2 +- ...java => SpringContextIntegrationTest.java} | 2 +- ...mqpExampleApplicationIntegrationTest.java} | 2 +- ...IntegrationWithDockerIntegrationTest.java} | 2 +- ...java => SpringContextIntegrationTest.java} | 2 +- ...eamExampleApplicationIntegrationTest.java} | 2 +- ...IntegrationWithDockerIntegrationTest.java} | 2 +- ...IntegrationWithDockerIntegrationTest.java} | 2 +- ...java => SpringContextIntegrationTest.java} | 2 +- ...fkaExampleApplicationIntegrationTest.java} | 2 +- ...RabbitListenerScannerIntegrationTest.java} | 2 +- ...RabbitListenerScannerIntegrationTest.java} | 4 +- ...nctionChannelsScannerIntegrationTest.java} | 4 +- ...ngwolfKafkaControllerIntegrationTest.java} | 2 +- ...lKafkaListenerScannerIntegrationTest.java} | 2 +- ...lKafkaListenerScannerIntegrationTest.java} | 2 +- 34 files changed, 294 insertions(+), 294 deletions(-) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/{SpringContextTest.java => SpringContextIntegrationTest.java} (99%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/{DefaultAsyncApiSerializerServiceTest.java => DefaultAsyncApiSerializerServiceIntegrationTest.java} (97%) create mode 100644 springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java delete mode 100644 springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceUnitTest.java rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/{DefaultChannelsServiceTest.java => DefaultChannelsServiceIntegrationTest.java} (89%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/{DefaultBeanMethodsScannerTest.java => DefaultBeanMethodsScannerIntegrationTest.java} (97%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/{TestMethodLevelListenerScannerTest.java => TestMethodLevelListenerScannerIntegrationTest.java} (98%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/{ConsumerOperationDataScannerTest.java => ConsumerOperationDataScannerIntegrationTest.java} (99%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/{ProducerOperationDataScannerTest.java => ProducerOperationDataScannerIntegrationTest.java} (99%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/{AsyncListenerAnnotationScannerTest.java => AsyncListenerAnnotationScannerIntegrationTest.java} (99%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/{AsyncPublisherAnnotationScannerTest.java => AsyncPublisherAnnotationScannerIntegrationTest.java} (99%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/{ComponentClassScannerTest.java => ComponentClassScannerIntegrationTest.java} (97%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/{ConfigurationClassScannerTest.java => ConfigurationClassScannerIntegrationTest.java} (97%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/{SpringWolfAutoConfigurationTest.java => AutoConfigurationIntegrationTest.java} (96%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/{InitModeTest.java => InitModeIntegrationTest.java} (98%) rename springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/{DefaultSchemasServiceContextTest.java => DefaultSchemasServiceContextIntegrationTest.java} (97%) rename springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/{ApiIntegrationWithDockerTest.java => ApiIntegrationWithDockerIntegrationTest.java} (97%) rename springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/{SpringContextTest.java => SpringContextIntegrationTest.java} (98%) rename springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/{SpringwolfAmqpExampleApplicationTest.java => SpringwolfAmqpExampleApplicationIntegrationTest.java} (89%) rename springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/{ApiIntegrationWithDockerTest.java => ApiIntegrationWithDockerIntegrationTest.java} (97%) rename springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/{SpringContextTest.java => SpringContextIntegrationTest.java} (98%) rename springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/{SpringwolfCloudstreamExampleApplicationTest.java => SpringwolfCloudstreamExampleApplicationIntegrationTest.java} (93%) rename springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/{ApiIntegrationWithDockerTest.java => ApiIntegrationWithDockerIntegrationTest.java} (97%) rename springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/{ProducerIntegrationWithDockerTest.java => ProducerIntegrationWithDockerIntegrationTest.java} (98%) rename springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/{SpringContextTest.java => SpringContextIntegrationTest.java} (98%) rename springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/{SpringwolfKafkaExampleApplicationTest.java => SpringwolfKafkaExampleApplicationIntegrationTest.java} (93%) rename springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/{ClassLevelRabbitListenerScannerTest.java => ClassLevelRabbitListenerScannerIntegrationTest.java} (99%) rename springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/{MethodLevelRabbitListenerScannerTest.java => MethodLevelRabbitListenerScannerIntegrationTest.java} (98%) rename springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/{CloudStreamFunctionChannelsScannerTest.java => CloudStreamFunctionChannelsScannerIntegrationTest.java} (99%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/{SpringwolfKafkaControllerTest.java => SpringwolfKafkaControllerIntegrationTest.java} (99%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/{ClassLevelKafkaListenerScannerTest.java => ClassLevelKafkaListenerScannerIntegrationTest.java} (99%) rename springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/{MethodLevelKafkaListenerScannerTest.java => MethodLevelKafkaListenerScannerIntegrationTest.java} (99%) diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java similarity index 99% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java index e4603d34f..1ebc5a7bf 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class SpringContextTest { +public class SpringContextIntegrationTest { @ExtendWith(SpringExtension.class) @Nested diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java similarity index 97% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java index c7964e449..85465c70c 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java @@ -35,7 +35,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {DefaultAsyncApiSerializerService.class}) -class DefaultAsyncApiSerializerServiceTest { +class DefaultAsyncApiSerializerServiceIntegrationTest { @Autowired private DefaultAsyncApiSerializerService serializer; @@ -90,7 +90,7 @@ private AsyncAPI getAsyncAPITestObject() { .build(); Map schemas = - ModelConverters.getInstance().read(DefaultAsyncApiSerializerServiceTest.ExamplePayload.class); + ModelConverters.getInstance().read(DefaultAsyncApiSerializerServiceIntegrationTest.ExamplePayload.class); AsyncAPI asyncapi = AsyncAPI.builder() .info(info) diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java new file mode 100644 index 000000000..58068c8f8 --- /dev/null +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java @@ -0,0 +1,156 @@ +package io.github.stavshamir.springwolf.asyncapi; + +import com.asyncapi.v2._6_0.model.channel.ChannelItem; +import com.asyncapi.v2._6_0.model.info.Info; +import com.asyncapi.v2._6_0.model.server.Server; +import com.asyncapi.v2.binding.message.kafka.KafkaMessageBinding; +import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding; +import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ConsumerOperationDataScanner; +import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ProducerOperationDataScanner; +import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; +import io.github.stavshamir.springwolf.asyncapi.types.ConsumerData; +import io.github.stavshamir.springwolf.asyncapi.types.ProducerData; +import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.Message; +import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; +import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService; +import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.schemas.DefaultSchemasService; +import io.github.stavshamir.springwolf.schemas.example.ExampleJsonGenerator; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.core.annotation.Order; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( + classes = { + SpringWolfConfigProperties.class, + DefaultAsyncApiDocketService.class, + DefaultAsyncApiService.class, + DefaultChannelsService.class, + DefaultSchemasService.class, + ExampleJsonGenerator.class, + ProducerOperationDataScanner.class, + ConsumerOperationDataScanner.class, + }) +@Import({ + DefaultAsyncApiServiceIntegrationTest.DefaultAsyncApiServiceTestConfiguration.class, + DefaultAsyncApiServiceIntegrationTest.TestDescriptionCustomizer.class, + DefaultAsyncApiServiceIntegrationTest.TestDescriptionCustomizer2.class +}) +class DefaultAsyncApiServiceIntegrationTest { + + @TestConfiguration + public static class DefaultAsyncApiServiceTestConfiguration { + + @Bean + public AsyncApiDocket docket() { + Info info = Info.builder().title("Test").version("1.0.0").build(); + + ProducerData kafkaProducerData = ProducerData.builder() + .channelName("producer-topic") + .description("producer-topic-description") + .payloadType(String.class) + .operationBinding(Map.of("kafka", new KafkaOperationBinding())) + .messageBinding(Map.of("kafka", new KafkaMessageBinding())) + .build(); + + ConsumerData kafkaConsumerData = ConsumerData.builder() + .channelName("consumer-topic") + .description("consumer-topic-description") + .payloadType(String.class) + .operationBinding(Map.of("kafka", new KafkaOperationBinding())) + .messageBinding(Map.of("kafka", new KafkaMessageBinding())) + .build(); + + return AsyncApiDocket.builder() + .info(info) + .basePackage("package") + .server( + "kafka", + Server.builder().protocol("kafka").url("kafka:9092").build()) + .producer(kafkaProducerData) + .consumer(kafkaConsumerData) + .build(); + } + } + + @Autowired + private AsyncApiDocket docket; + + @Autowired + private DefaultAsyncApiService asyncApiService; + + @Test + void getAsyncAPI_info_should_be_correct() { + Info actualInfo = asyncApiService.getAsyncAPI().getInfo(); + + assertThat(actualInfo).isEqualTo(docket.getInfo()); + assertThat(actualInfo.getDescription()).isEqualTo("AsyncApiInfoDescriptionCustomizer2"); + } + + @Test + void getAsyncAPI_servers_should_be_correct() { + Map actualServers = asyncApiService.getAsyncAPI().getServers(); + + assertThat(actualServers).isEqualTo(docket.getServers()); + } + + @Test + void getAsyncAPI_producers_should_be_correct() { + Map actualChannels = asyncApiService.getAsyncAPI().getChannels(); + + assertThat(actualChannels).isNotEmpty().containsKey("producer-topic"); + + final ChannelItem channel = actualChannels.get("producer-topic"); + assertThat(channel.getSubscribe()).isNotNull(); + final Message message = (Message) channel.getSubscribe().getMessage(); + assertThat(message.getDescription()).isNull(); + assertThat(message.getBindings()).isEqualTo(Map.of("kafka", new KafkaMessageBinding())); + } + + @Test + void getAsyncAPI_consumers_should_be_correct() { + Map actualChannels = asyncApiService.getAsyncAPI().getChannels(); + + assertThat(actualChannels).isNotEmpty().containsKey("consumer-topic"); + + final ChannelItem channel = actualChannels.get("consumer-topic"); + assertThat(channel.getPublish()).isNotNull(); + final Message message = (Message) channel.getPublish().getMessage(); + assertThat(message.getDescription()).isNull(); + assertThat(message.getBindings()).isEqualTo(Map.of("kafka", new KafkaMessageBinding())); + } + + @Order(TestDescriptionCustomizer.CUSTOMIZER_ORDER) + public static class TestDescriptionCustomizer implements AsyncApiCustomizer { + public static final int CUSTOMIZER_ORDER = 0; + + @Override + public void customize(AsyncAPI asyncAPI) { + asyncAPI.getInfo().setDescription("AsyncApiInfoDescriptionCustomizer"); + } + } + + /** + * Using a high @Order value, this customizer overwrites the previous customizers value + */ + @Order(TestDescriptionCustomizer2.CUSTOMIZER_ORDER) + public static class TestDescriptionCustomizer2 implements AsyncApiCustomizer { + public static final int CUSTOMIZER_ORDER = TestDescriptionCustomizer.CUSTOMIZER_ORDER + 1; + + @Override + public void customize(AsyncAPI asyncAPI) { + asyncAPI.getInfo().setDescription("AsyncApiInfoDescriptionCustomizer2"); + } + } +} diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java index c29e3deeb..1e2c5cfa5 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java @@ -1,156 +1,124 @@ package io.github.stavshamir.springwolf.asyncapi; -import com.asyncapi.v2._6_0.model.channel.ChannelItem; import com.asyncapi.v2._6_0.model.info.Info; import com.asyncapi.v2._6_0.model.server.Server; -import com.asyncapi.v2.binding.message.kafka.KafkaMessageBinding; -import com.asyncapi.v2.binding.operation.kafka.KafkaOperationBinding; -import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ConsumerOperationDataScanner; -import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.ProducerOperationDataScanner; import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; -import io.github.stavshamir.springwolf.asyncapi.types.ConsumerData; -import io.github.stavshamir.springwolf.asyncapi.types.ProducerData; -import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.Message; import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; -import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; -import io.github.stavshamir.springwolf.schemas.DefaultSchemasService; -import io.github.stavshamir.springwolf.schemas.example.ExampleJsonGenerator; +import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService; +import io.github.stavshamir.springwolf.schemas.SchemasService; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.core.annotation.Order; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration( - classes = { - SpringWolfConfigProperties.class, - DefaultAsyncApiDocketService.class, - DefaultAsyncApiService.class, - DefaultChannelsService.class, - DefaultSchemasService.class, - ExampleJsonGenerator.class, - ProducerOperationDataScanner.class, - ConsumerOperationDataScanner.class, - }) -@Import({ - DefaultAsyncApiServiceTest.DefaultAsyncApiServiceTestConfiguration.class, - DefaultAsyncApiServiceTest.TestDescriptionCustomizer.class, - DefaultAsyncApiServiceTest.TestDescriptionCustomizer2.class -}) -class DefaultAsyncApiServiceTest { - - @TestConfiguration - public static class DefaultAsyncApiServiceTestConfiguration { - - @Bean - public AsyncApiDocket docket() { - Info info = Info.builder().title("Test").version("1.0.0").build(); - - ProducerData kafkaProducerData = ProducerData.builder() - .channelName("producer-topic") - .description("producer-topic-description") - .payloadType(String.class) - .operationBinding(Map.of("kafka", new KafkaOperationBinding())) - .messageBinding(Map.of("kafka", new KafkaMessageBinding())) - .build(); - - ConsumerData kafkaConsumerData = ConsumerData.builder() - .channelName("consumer-topic") - .description("consumer-topic-description") - .payloadType(String.class) - .operationBinding(Map.of("kafka", new KafkaOperationBinding())) - .messageBinding(Map.of("kafka", new KafkaMessageBinding())) - .build(); - - return AsyncApiDocket.builder() - .info(info) - .basePackage("package") - .server( - "kafka", - Server.builder().protocol("kafka").url("kafka:9092").build()) - .producer(kafkaProducerData) - .consumer(kafkaConsumerData) - .build(); - } +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * Pure unit tests of {@link DefaultAsyncApiService}. Faking spring context support + */ +public class DefaultAsyncApiServiceTest { + + private DefaultAsyncApiService defaultAsyncApiService; + private AsyncApiDocketService asyncApiDocketService; + private ChannelsService channelsService; + private SchemasService schemasService; + private List customizers = new ArrayList<>(); + + @BeforeEach + public void setup() { + asyncApiDocketService = mock(AsyncApiDocketService.class); + channelsService = mock(ChannelsService.class); + schemasService = mock(SchemasService.class); + + when(channelsService.findChannels()).thenReturn(Map.of()); + when(schemasService.getDefinitions()).thenReturn(Map.of()); + + defaultAsyncApiService = + new DefaultAsyncApiService(asyncApiDocketService, channelsService, schemasService, customizers); } - @Autowired - private AsyncApiDocket docket; - - @Autowired - private DefaultAsyncApiService asyncApiService; - @Test - void getAsyncAPI_info_should_be_correct() { - Info actualInfo = asyncApiService.getAsyncAPI().getInfo(); - - assertThat(actualInfo).isEqualTo(docket.getInfo()); - assertThat(actualInfo.getDescription()).isEqualTo("AsyncApiInfoDescriptionCustomizer2"); - } + void shouldThrowExceptionOnSubsequentGetAsyncApi() { + // Given an AsyncApiDocketService which throws an exception on 'getAsyncApiDocket()' + prepareExceptionDocket(); + + // When getAsyncAPI is invoked the first time + Throwable cause = null; + try { + defaultAsyncApiService.getAsyncAPI(); + fail("RuntimeException expected"); + } catch (RuntimeException exc) { + // Then a RuntimeException is thrown. + assertThat(exc.getMessage()).isEqualTo("Error occured during creation of AsyncAPI"); + cause = exc.getCause(); + assertThat(cause.getMessage()).isEqualTo("test exception"); + } - @Test - void getAsyncAPI_servers_should_be_correct() { - Map actualServers = asyncApiService.getAsyncAPI().getServers(); + // When further invocations of getAsyncAPI + try { + defaultAsyncApiService.getAsyncAPI(); + fail("RuntimeException expected"); + } catch (RuntimeException exc) { + // Then the same RuntimeException as on first invocatin should be thrown. - assertThat(actualServers).isEqualTo(docket.getServers()); + assertThat(exc.getMessage()).isEqualTo("Error occured during creation of AsyncAPI"); + assertThat(exc.getCause()).isSameAs(cause); + } } @Test - void getAsyncAPI_producers_should_be_correct() { - Map actualChannels = asyncApiService.getAsyncAPI().getChannels(); + void shouldLazyInitializeOnLoadingModeLazy() { + // Given a valid Docket-Specification + prepareValidDocket(); - assertThat(actualChannels).isNotEmpty().containsKey("producer-topic"); + // When getAsyncAPI() isn't called yet + // Then isNotInitilized() returns 'true'. + assertThat(defaultAsyncApiService.isNotInitialized()).isTrue(); - final ChannelItem channel = actualChannels.get("producer-topic"); - assertThat(channel.getSubscribe()).isNotNull(); - final Message message = (Message) channel.getSubscribe().getMessage(); - assertThat(message.getDescription()).isNull(); - assertThat(message.getBindings()).isEqualTo(Map.of("kafka", new KafkaMessageBinding())); - } + // When getAsyncAPI() is invoked + AsyncAPI asyncAPI = defaultAsyncApiService.getAsyncAPI(); - @Test - void getAsyncAPI_consumers_should_be_correct() { - Map actualChannels = asyncApiService.getAsyncAPI().getChannels(); - - assertThat(actualChannels).isNotEmpty().containsKey("consumer-topic"); - - final ChannelItem channel = actualChannels.get("consumer-topic"); - assertThat(channel.getPublish()).isNotNull(); - final Message message = (Message) channel.getPublish().getMessage(); - assertThat(message.getDescription()).isNull(); - assertThat(message.getBindings()).isEqualTo(Map.of("kafka", new KafkaMessageBinding())); + // Then the result is a non-null AsyncAPI instance and + // isNotInitialized() return 'false'. + assertThat(asyncAPI).isNotNull(); + assertThat(defaultAsyncApiService.isNotInitialized()).isFalse(); } - @Order(TestDescriptionCustomizer.CUSTOMIZER_ORDER) - public static class TestDescriptionCustomizer implements AsyncApiCustomizer { - public static final int CUSTOMIZER_ORDER = 0; - - @Override - public void customize(AsyncAPI asyncAPI) { - asyncAPI.getInfo().setDescription("AsyncApiInfoDescriptionCustomizer"); - } + /** + * prepares prepares {@link AsyncApiDocketService} mock to throw Exception on getAsyncApiDocket(). + */ + private void prepareExceptionDocket() { + when(asyncApiDocketService.getAsyncApiDocket()).thenThrow(new RuntimeException("test exception")); } /** - * Using a high @Order value, this customizer overwrites the previous customizers value + * prepares {@link AsyncApiDocketService} mock to return a valid AsyncApiDocket. */ - @Order(TestDescriptionCustomizer2.CUSTOMIZER_ORDER) - public static class TestDescriptionCustomizer2 implements AsyncApiCustomizer { - public static final int CUSTOMIZER_ORDER = TestDescriptionCustomizer.CUSTOMIZER_ORDER + 1; - - @Override - public void customize(AsyncAPI asyncAPI) { - asyncAPI.getInfo().setDescription("AsyncApiInfoDescriptionCustomizer2"); - } + private void prepareValidDocket() { + Info info = Info.builder() + .description("Info") + .version("1.0") + .title("Test AsyncApi") + .build(); + + Server server1 = Server.builder() + .description("Server 1") + .url("mq:/localhost:1234") + .protocol("kafka") + .build(); + + AsyncApiDocket docket = AsyncApiDocket.builder() + .id("id") + .defaultContentType("application/json") + .servers(Map.of("server", server1)) + .info(info) + .build(); + + when(asyncApiDocketService.getAsyncApiDocket()).thenReturn(docket); } } diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceUnitTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceUnitTest.java deleted file mode 100644 index 1ac11782d..000000000 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceUnitTest.java +++ /dev/null @@ -1,124 +0,0 @@ -package io.github.stavshamir.springwolf.asyncapi; - -import com.asyncapi.v2._6_0.model.info.Info; -import com.asyncapi.v2._6_0.model.server.Server; -import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; -import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; -import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService; -import io.github.stavshamir.springwolf.schemas.SchemasService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -/** - * Pure unit tests of {@link DefaultAsyncApiService}. Faking spring context support - */ -public class DefaultAsyncApiServiceUnitTest { - - private DefaultAsyncApiService defaultAsyncApiService; - private AsyncApiDocketService asyncApiDocketService; - private ChannelsService channelsService; - private SchemasService schemasService; - private List customizers = new ArrayList<>(); - - @BeforeEach - public void setup() { - asyncApiDocketService = mock(AsyncApiDocketService.class); - channelsService = mock(ChannelsService.class); - schemasService = mock(SchemasService.class); - - when(channelsService.findChannels()).thenReturn(Map.of()); - when(schemasService.getDefinitions()).thenReturn(Map.of()); - - defaultAsyncApiService = - new DefaultAsyncApiService(asyncApiDocketService, channelsService, schemasService, customizers); - } - - @Test - void shouldThrowExceptionOnSubsequentGetAsyncApi() { - // Given an AsyncApiDocketService which throws an exception on 'getAsyncApiDocket()' - prepareExceptionDocket(); - - // When getAsyncAPI is invoked the first time - Throwable cause = null; - try { - defaultAsyncApiService.getAsyncAPI(); - fail("RuntimeException expected"); - } catch (RuntimeException exc) { - // Then a RuntimeException is thrown. - assertThat(exc.getMessage()).isEqualTo("Error occured during creation of AsyncAPI"); - cause = exc.getCause(); - assertThat(cause.getMessage()).isEqualTo("test exception"); - } - - // When further invocations of getAsyncAPI - try { - defaultAsyncApiService.getAsyncAPI(); - fail("RuntimeException expected"); - } catch (RuntimeException exc) { - // Then the same RuntimeException as on first invocatin should be thrown. - - assertThat(exc.getMessage()).isEqualTo("Error occured during creation of AsyncAPI"); - assertThat(exc.getCause()).isSameAs(cause); - } - } - - @Test - void shouldLazyInitializeOnLoadingModeLazy() { - // Given a valid Docket-Specification - prepareValidDocket(); - - // When getAsyncAPI() isn't called yet - // Then isNotInitilized() returns 'true'. - assertThat(defaultAsyncApiService.isNotInitialized()).isTrue(); - - // When getAsyncAPI() is invoked - AsyncAPI asyncAPI = defaultAsyncApiService.getAsyncAPI(); - - // Then the result is a non-null AsyncAPI instance and - // isNotInitialized() return 'false'. - assertThat(asyncAPI).isNotNull(); - assertThat(defaultAsyncApiService.isNotInitialized()).isFalse(); - } - - /** - * prepares prepares {@link AsyncApiDocketService} mock to throw Exception on getAsyncApiDocket(). - */ - private void prepareExceptionDocket() { - when(asyncApiDocketService.getAsyncApiDocket()).thenThrow(new RuntimeException("test exception")); - } - - /** - * prepares {@link AsyncApiDocketService} mock to return a valid AsyncApiDocket. - */ - private void prepareValidDocket() { - Info info = Info.builder() - .description("Info") - .version("1.0") - .title("Test AsyncApi") - .build(); - - Server server1 = Server.builder() - .description("Server 1") - .url("mq:/localhost:1234") - .protocol("kafka") - .build(); - - AsyncApiDocket docket = AsyncApiDocket.builder() - .id("id") - .defaultContentType("application/json") - .servers(Map.of("server", server1)) - .info(info) - .build(); - - when(asyncApiDocketService.getAsyncApiDocket()).thenReturn(docket); - } -} diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java similarity index 89% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java index 647f82ae3..a8e91dc6d 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java @@ -18,12 +18,12 @@ @ContextConfiguration( classes = { DefaultChannelsService.class, - DefaultChannelsServiceTest.FooChannelScanner.class, - DefaultChannelsServiceTest.BarChannelScanner.class, - DefaultChannelsServiceTest.SameTopic.SubscribeChannelScanner.class, - DefaultChannelsServiceTest.SameTopic.ProduceChannelScanner.class + DefaultChannelsServiceIntegrationTest.FooChannelScanner.class, + DefaultChannelsServiceIntegrationTest.BarChannelScanner.class, + DefaultChannelsServiceIntegrationTest.SameTopic.SubscribeChannelScanner.class, + DefaultChannelsServiceIntegrationTest.SameTopic.ProduceChannelScanner.class }) -class DefaultChannelsServiceTest { +class DefaultChannelsServiceIntegrationTest { @Autowired private DefaultChannelsService defaultChannelsService; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java similarity index 97% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java index 3a3b8b67b..05c5f0660 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java @@ -19,7 +19,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {DefaultBeanMethodsScanner.class}) -class DefaultBeanMethodsScannerTest { +class DefaultBeanMethodsScannerIntegrationTest { @Autowired private DefaultBeanMethodsScanner beanMethodsScanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScanner.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScanner.java index 6f49ae59a..930c916fe 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScanner.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScanner.java @@ -9,33 +9,33 @@ import java.util.Map; public class TestMethodLevelListenerScanner - extends AbstractMethodLevelListenerScanner { + extends AbstractMethodLevelListenerScanner { @Override - protected Class getListenerAnnotationClass() { - return TestMethodLevelListenerScannerTest.TestChannelListener.class; + protected Class getListenerAnnotationClass() { + return TestMethodLevelListenerScannerIntegrationTest.TestChannelListener.class; } @Override - protected String getChannelName(TestMethodLevelListenerScannerTest.TestChannelListener annotation) { + protected String getChannelName(TestMethodLevelListenerScannerIntegrationTest.TestChannelListener annotation) { return "test-channel"; } @Override protected Map buildChannelBinding( - TestMethodLevelListenerScannerTest.TestChannelListener annotation) { + TestMethodLevelListenerScannerIntegrationTest.TestChannelListener annotation) { return Map.of("test-channel-binding", new TestChannelBinding()); } @Override protected Map buildOperationBinding( - TestMethodLevelListenerScannerTest.TestChannelListener annotation) { + TestMethodLevelListenerScannerIntegrationTest.TestChannelListener annotation) { return Map.of("test-operation-binding", new TestOperationBinding()); } @Override protected Map buildMessageBinding( - TestMethodLevelListenerScannerTest.TestChannelListener annotation) { + TestMethodLevelListenerScannerIntegrationTest.TestChannelListener annotation) { return Map.of("test-message-binding", new TestMessageBinding()); } diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerIntegrationTest.java similarity index 98% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerIntegrationTest.java index fc1e2c1ce..e94579770 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/TestMethodLevelListenerScannerIntegrationTest.java @@ -33,7 +33,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration( classes = {TestMethodLevelListenerScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) -class TestMethodLevelListenerScannerTest { +class TestMethodLevelListenerScannerIntegrationTest { @Autowired private TestMethodLevelListenerScanner channelScanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerIntegrationTest.java similarity index 99% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerIntegrationTest.java index fad599e5b..42b38ce3a 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScannerIntegrationTest.java @@ -35,7 +35,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration( classes = {ConsumerOperationDataScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) -class ConsumerOperationDataScannerTest { +class ConsumerOperationDataScannerIntegrationTest { @Autowired private ConsumerOperationDataScanner scanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerIntegrationTest.java similarity index 99% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerIntegrationTest.java index a32298a60..d061054c8 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScannerIntegrationTest.java @@ -35,7 +35,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration( classes = {ProducerOperationDataScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) -class ProducerOperationDataScannerTest { +class ProducerOperationDataScannerIntegrationTest { @Autowired private ProducerOperationDataScanner scanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerIntegrationTest.java similarity index 99% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerIntegrationTest.java index 601390bbc..9adaae794 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScannerIntegrationTest.java @@ -37,7 +37,7 @@ TestOperationBindingProcessor.class }) @TestPropertySource(properties = {"test.property.test-channel=test-channel", "test.property.description=description"}) -class AsyncListenerAnnotationScannerTest { +class AsyncListenerAnnotationScannerIntegrationTest { @Autowired private AsyncListenerAnnotationScanner channelScanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerIntegrationTest.java similarity index 99% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerIntegrationTest.java index b8fb97002..35ecc8cdf 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScannerIntegrationTest.java @@ -36,7 +36,7 @@ TestOperationBindingProcessor.class }) @TestPropertySource(properties = {"test.property.test-channel=test-channel", "test.property.description=description"}) -class AsyncPublisherAnnotationScannerTest { +class AsyncPublisherAnnotationScannerIntegrationTest { @Autowired private AsyncPublisherAnnotationScanner channelScanner; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java similarity index 97% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java index c97c94f56..c88128099 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java @@ -17,7 +17,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {ComponentClassScanner.class}) -class ComponentClassScannerTest { +class ComponentClassScannerIntegrationTest { @MockBean private AsyncApiDocketService asyncApiDocketService; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java similarity index 97% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java index 537dabebd..f1a80996f 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java @@ -17,7 +17,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {ConfigurationClassScanner.class}) -class ConfigurationClassScannerTest { +class ConfigurationClassScannerIntegrationTest { @MockBean private AsyncApiDocketService asyncApiDocketService; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/SpringWolfAutoConfigurationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java similarity index 96% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/SpringWolfAutoConfigurationTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java index a5cc52109..c530d6d18 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/SpringWolfAutoConfigurationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java @@ -13,7 +13,7 @@ /** * Tests loading or ignoring the SpringWolfAutoConfiguration */ -public class SpringWolfAutoConfigurationTest { +public class AutoConfigurationIntegrationTest { @Nested @SpringBootTest(classes = TestApplication.class) diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java similarity index 98% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java index f8d2961b9..c8c5a531e 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java @@ -20,7 +20,7 @@ /** * Tests the possible init modes (failfast, background) */ -public class InitModeTest { +public class InitModeIntegrationTest { @Nested @SpringBootTest(classes = TestApplication.class) diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java similarity index 97% rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextTest.java rename to springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java index 82f6a842e..efbc3a457 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -public class DefaultSchemasServiceContextTest { +public class DefaultSchemasServiceContextIntegrationTest { @ExtendWith(SpringExtension.class) @Nested diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerIntegrationTest.java similarity index 97% rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerTest.java rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerIntegrationTest.java index 28869b8f1..7cd5d446a 100644 --- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerTest.java +++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationWithDockerIntegrationTest.java @@ -24,7 +24,7 @@ */ @Testcontainers // @Ignore("Uncomment this line if you have issues running this test on your local machine.") -public class ApiIntegrationWithDockerTest { +public class ApiIntegrationWithDockerIntegrationTest { private static final RestTemplate restTemplate = new RestTemplate(); private static final String APP_NAME = "app_1"; diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java similarity index 98% rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextTest.java rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java index 4059cd988..1a71f8fca 100644 --- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextTest.java +++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class SpringContextTest { +public class SpringContextIntegrationTest { @Nested @SpringBootTest(classes = SpringwolfAmqpExampleApplication.class) diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java similarity index 89% rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationTest.java rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java index 8d5b65603..bc1d192d1 100644 --- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationTest.java +++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringBootTest -class SpringwolfAmqpExampleApplicationTest { +class SpringwolfAmqpExampleApplicationIntegrationTest { @Autowired private ApplicationContext context; diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerIntegrationTest.java similarity index 97% rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerTest.java rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerIntegrationTest.java index 7d8d56032..d3e1040ce 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerTest.java +++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationWithDockerIntegrationTest.java @@ -24,7 +24,7 @@ */ @Testcontainers // @Ignore("Uncomment this line if you have issues running this test on your local machine.") -public class ApiIntegrationWithDockerTest { +public class ApiIntegrationWithDockerIntegrationTest { private static final RestTemplate restTemplate = new RestTemplate(); private static final String APP_NAME = "app_1"; diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java similarity index 98% rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextTest.java rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java index 180bd0dae..52cf0cefe 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextTest.java +++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class SpringContextTest { +public class SpringContextIntegrationTest { @SpringBootTest(classes = SpringwolfCloudstreamExampleApplication.class) @EmbeddedKafka( diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java similarity index 93% rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationTest.java rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java index 21d208a5c..852cb741d 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationTest.java +++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java @@ -16,7 +16,7 @@ partitions = 1, brokerProperties = {"listeners=PLAINTEXT://localhost:29092", "port=29092"}) @DirtiesContext -class SpringwolfCloudstreamExampleApplicationTest { +class SpringwolfCloudstreamExampleApplicationIntegrationTest { @Autowired private ApplicationContext context; diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerIntegrationTest.java similarity index 97% rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerTest.java rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerIntegrationTest.java index 462e0943c..b9c739ba1 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerTest.java +++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithDockerIntegrationTest.java @@ -24,7 +24,7 @@ */ @Testcontainers // @Ignore("Uncomment this line if you have issues running this test on your local machine.") -public class ApiIntegrationWithDockerTest { +public class ApiIntegrationWithDockerIntegrationTest { private static final RestTemplate restTemplate = new RestTemplate(); private static final String APP_NAME = "app_1"; diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java similarity index 98% rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerTest.java rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java index dbdd21827..d7e97ce30 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerTest.java +++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java @@ -40,7 +40,7 @@ @DirtiesContext @TestMethodOrder(OrderAnnotation.class) // @Ignore("Uncomment this line if you have issues running this test on your local machine.") -public class ProducerIntegrationWithDockerTest { +public class ProducerIntegrationWithDockerIntegrationTest { @Autowired SpringwolfKafkaProducer springwolfKafkaProducer; diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java similarity index 98% rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextTest.java rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java index a803e3924..12ca3e5f2 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextTest.java +++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class SpringContextTest { +public class SpringContextIntegrationTest { @SpringBootTest(classes = SpringwolfKafkaExampleApplication.class) @EmbeddedKafka( diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java similarity index 93% rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationTest.java rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java index 453a456c1..02b48a846 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationTest.java +++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java @@ -16,7 +16,7 @@ partitions = 1, brokerProperties = {"listeners=PLAINTEXT://localhost:9092", "port=9092"}) @DirtiesContext -class SpringwolfKafkaExampleApplicationTest { +class SpringwolfKafkaExampleApplicationIntegrationTest { @Autowired private ApplicationContext context; diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerIntegrationTest.java similarity index 99% rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerTest.java rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerIntegrationTest.java index 97de05257..e5be03e78 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScannerIntegrationTest.java @@ -36,7 +36,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration( classes = {ClassLevelRabbitListenerScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) -class ClassLevelRabbitListenerScannerTest { +class ClassLevelRabbitListenerScannerIntegrationTest { @Autowired private ClassLevelRabbitListenerScanner classLevelRabbitListenerScanner; diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerIntegrationTest.java similarity index 98% rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerTest.java rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerIntegrationTest.java index c02aee858..94032f591 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScannerIntegrationTest.java @@ -49,10 +49,10 @@ MethodLevelRabbitListenerScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class, - MethodLevelRabbitListenerScannerTest.ClassWithRabbitListenerAnnotationsBindingBean.class + MethodLevelRabbitListenerScannerIntegrationTest.ClassWithRabbitListenerAnnotationsBindingBean.class }) @TestPropertySource(properties = "amqp.queues.test=test-queue") -class MethodLevelRabbitListenerScannerTest { +class MethodLevelRabbitListenerScannerIntegrationTest { @Autowired private MethodLevelRabbitListenerScanner rabbitListenerScanner; diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java similarity index 99% rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerTest.java rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java index 1da6f17b8..19c98f209 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerTest.java +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java @@ -49,8 +49,8 @@ DefaultAsyncApiDocketService.class, CloudStreamFunctionChannelsScanner.class }) -@Import(CloudStreamFunctionChannelsScannerTest.Configuration.class) -class CloudStreamFunctionChannelsScannerTest { +@Import(CloudStreamFunctionChannelsScannerIntegrationTest.Configuration.class) +class CloudStreamFunctionChannelsScannerIntegrationTest { @MockBean private BindingServiceProperties bindingServiceProperties; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerIntegrationTest.java similarity index 99% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerIntegrationTest.java index d702b197c..d4c4eb421 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaControllerIntegrationTest.java @@ -27,7 +27,7 @@ @WebMvcTest(SpringwolfKafkaController.class) @ContextConfiguration(classes = {SpringwolfKafkaController.class, SpringwolfKafkaProducer.class}) @TestPropertySource(properties = {"springwolf.plugin.kafka.publishing.enabled=true"}) -class SpringwolfKafkaControllerTest { +class SpringwolfKafkaControllerIntegrationTest { @Autowired private MockMvc mvc; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerIntegrationTest.java similarity index 99% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerIntegrationTest.java index f8b303af0..769e0d174 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScannerIntegrationTest.java @@ -38,7 +38,7 @@ @ContextConfiguration( classes = {ClassLevelKafkaListenerScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) @TestPropertySource(properties = "kafka.topics.test=test-topic") -class ClassLevelKafkaListenerScannerTest { +class ClassLevelKafkaListenerScannerIntegrationTest { @Autowired private ClassLevelKafkaListenerScanner classLevelKafkaListenerScanner; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerIntegrationTest.java similarity index 99% rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerTest.java rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerIntegrationTest.java index aea747866..0b8ea1d69 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScannerIntegrationTest.java @@ -39,7 +39,7 @@ @ContextConfiguration( classes = {MethodLevelKafkaListenerScanner.class, DefaultSchemasService.class, ExampleJsonGenerator.class}) @TestPropertySource(properties = "kafka.topics.test=test-topic") -class MethodLevelKafkaListenerScannerTest { +class MethodLevelKafkaListenerScannerIntegrationTest { @Autowired private MethodLevelKafkaListenerScanner methodLevelKafkaListenerScanner; From 3fc81ec93f04e52f3c6fd996d69bf77966f1354c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCller?= Date: Fri, 28 Jul 2023 14:21:02 +0200 Subject: [PATCH 2/6] chore: Ensure spelling of Springwolf Co-authored-by: Timon Back --- ...ion.java => SpringwolfAutoConfiguration.java} | 6 +++--- ...va => SpringwolfInitApplicationListener.java} | 8 ++++---- .../ConsumerOperationDataScanner.java | 2 +- .../ProducerOperationDataScanner.java | 2 +- .../AsyncListenerAnnotationScanner.java | 2 +- .../AsyncPublisherAnnotationScanner.java | 2 +- .../DefaultAsyncApiDocketService.java | 16 ++++++++-------- ...tants.java => SpringwolfConfigConstants.java} | 2 +- ...ties.java => SpringwolfConfigProperties.java} | 14 +++++++------- .../schemas/example/ExampleJsonGenerator.java | 2 +- .../example/SwaggerInflectorJsonGenerator.java | 2 +- ....boot.autoconfigure.AutoConfiguration.imports | 2 +- .../springwolf/SpringContextIntegrationTest.java | 6 +++--- .../DefaultAsyncApiServiceIntegrationTest.java | 4 ++-- ...aultAsyncApiDocketServiceIntegrationTest.java | 6 +++--- .../DefaultAsyncApiDocketServiceTest.java | 8 ++++---- .../AutoConfigurationIntegrationTest.java | 6 +++--- .../InitModeIntegrationTest.java | 2 +- ...aultSchemasServiceContextIntegrationTest.java | 4 ++-- ...ucerIntegrationWithDockerIntegrationTest.java | 4 ++-- .../asyncapi/SpringwolfAmqpController.java | 4 ++-- .../ClassLevelRabbitListenerScanner.java | 2 +- .../MethodLevelRabbitListenerScanner.java | 2 +- ...s.java => SpringwolfAmqpConfigConstants.java} | 8 ++++---- ....java => SpringwolfAmqpConfigProperties.java} | 8 ++++---- .../producer/SpringwolfAmqpProducer.java | 4 ++-- ...AmqpProducerConfigurationIntegrationTest.java | 8 ++++---- .../asyncapi/SpringwolfKafkaController.java | 4 ++-- .../ClassLevelKafkaListenerScanner.java | 2 +- .../MethodLevelKafkaListenerScanner.java | 2 +- .../SpringwolfKafkaProducerConfiguration.java | 4 ++-- .../SpringwolfKafkaTemplateFactory.java | 4 ++-- ....java => SpringwolfKafkaConfigConstants.java} | 8 ++++---- ...java => SpringwolfKafkaConfigProperties.java} | 8 ++++---- ...afkaProducerConfigurationIntegrationTest.java | 8 ++++---- .../SpringwolfKafkaTemplateFactoryTest.java | 12 ++++++------ 36 files changed, 94 insertions(+), 94 deletions(-) rename springwolf-core/src/main/java/io/github/stavshamir/springwolf/{SpringWolfAutoConfiguration.java => SpringwolfAutoConfiguration.java} (91%) rename springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/{SpringWolfInitApplicationListener.java => SpringwolfInitApplicationListener.java} (88%) rename springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfConfigConstants.java => SpringwolfConfigConstants.java} (96%) rename springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfConfigProperties.java => SpringwolfConfigProperties.java} (93%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfAmqpConfigConstants.java => SpringwolfAmqpConfigConstants.java} (76%) rename springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfAmqpConfigProperties.java => SpringwolfAmqpConfigProperties.java} (84%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfKafkaConfigConstants.java => SpringwolfKafkaConfigConstants.java} (76%) rename springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/{SpringWolfKafkaConfigProperties.java => SpringwolfKafkaConfigProperties.java} (87%) diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringWolfAutoConfiguration.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java similarity index 91% rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringWolfAutoConfiguration.java rename to springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java index 8208dca6b..4fc232d11 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringWolfAutoConfiguration.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurationExcludeFilter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -24,5 +24,5 @@ @ComponentScan.Filter(type = FilterType.CUSTOM, classes = TypeExcludeFilter.class), @ComponentScan.Filter(type = FilterType.CUSTOM, classes = AutoConfigurationExcludeFilter.class) }) -@ConditionalOnProperty(name = SpringWolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) -public class SpringWolfAutoConfiguration {} +@ConditionalOnProperty(name = SpringwolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) +public class SpringwolfAutoConfiguration {} diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringWolfInitApplicationListener.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java similarity index 88% rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringWolfInitApplicationListener.java rename to springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java index 9843425f6..7618c4b46 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringWolfInitApplicationListener.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java @@ -1,7 +1,7 @@ package io.github.stavshamir.springwolf.asyncapi; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties.InitMode; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.InitMode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; @@ -18,11 +18,11 @@ @Slf4j @RequiredArgsConstructor @Service -public class SpringWolfInitApplicationListener implements ApplicationListener, InitializingBean { +public class SpringwolfInitApplicationListener implements ApplicationListener, InitializingBean { private final TaskExecutor taskExecutor; private final AsyncApiService asyncApiService; - private final SpringWolfConfigProperties configProperties; + private final SpringwolfConfigProperties configProperties; @Override public void onApplicationEvent(ApplicationReadyEvent event) { diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java index 3fc2a7509..31c3404c3 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.*; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.*; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java index 6c46c70d2..5de139eed 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.*; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.*; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScanner.java index 85d37d2e3..690567280 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScanner.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScanner.java index 9fa0350f2..611f6e84a 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScanner.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.stream.Stream; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java index c57833948..66fc080e2 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java @@ -1,8 +1,8 @@ package io.github.stavshamir.springwolf.configuration; import com.asyncapi.v2._6_0.model.info.Info; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.lang.Nullable; @@ -24,7 +24,7 @@ public class DefaultAsyncApiDocketService implements AsyncApiDocketService { /** * Docket definition in application.properties */ - private final Optional configProperties; + private final Optional configProperties; @Override public AsyncApiDocket getAsyncApiDocket() { @@ -37,15 +37,15 @@ public AsyncApiDocket getAsyncApiDocket() { } throw new IllegalArgumentException("No springwolf configuration found. " + "Either define the properties in the application.properties under the " - + SpringWolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + " prefix " + + SpringwolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + " prefix " + "or add a @Bean AsyncApiDocket to the spring context"); } - private AsyncApiDocket parseApplicationConfigProperties(SpringWolfConfigProperties configProperties) { + private AsyncApiDocket parseApplicationConfigProperties(SpringwolfConfigProperties configProperties) { if (configProperties.getDocket() == null || configProperties.getDocket().getBasePackage() == null) { throw new IllegalArgumentException( "One or more required fields (docket, basePackage) " + "in application.properties with path prefix " - + SpringWolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + " is not set."); + + SpringwolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + " is not set."); } Info info = buildInfo(configProperties.getDocket().getInfo()); @@ -63,10 +63,10 @@ private AsyncApiDocket parseApplicationConfigProperties(SpringWolfConfigProperti return builder.build(); } - private static Info buildInfo(@Nullable SpringWolfConfigProperties.ConfigDocket.Info info) { + private static Info buildInfo(@Nullable SpringwolfConfigProperties.ConfigDocket.Info info) { if (info == null || !StringUtils.hasText(info.getVersion()) || !StringUtils.hasText(info.getTitle())) { throw new IllegalArgumentException("One or more required fields of the info object (title, version) " - + "in application.properties with path prefix " + SpringWolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + + "in application.properties with path prefix " + SpringwolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX + " is not set."); } diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigConstants.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java similarity index 96% rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigConstants.java rename to springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java index 861c33633..5cd329ee7 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigConstants.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf.configuration.properties; -public class SpringWolfConfigConstants { +public class SpringwolfConfigConstants { public static final String ENABLED = ".enabled"; public static final String SCANNER = ".scanner"; diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigProperties.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java similarity index 93% rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigProperties.java rename to springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java index f2a126c5a..34e0a83b7 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfConfigProperties.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java @@ -15,11 +15,11 @@ import java.util.Map; @Configuration -@ConfigurationProperties(prefix = SpringWolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX) -@ConditionalOnProperty(name = SpringWolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) +@ConfigurationProperties(prefix = SpringwolfConfigConstants.SPRINGWOLF_CONFIG_PREFIX) +@ConditionalOnProperty(name = SpringwolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) @Getter @Setter -public class SpringWolfConfigProperties { +public class SpringwolfConfigProperties { public enum InitMode { /** @@ -158,7 +158,7 @@ public static class Scanner { public static class AsyncListener { /** - * This mirrors the ConfigConstant {@see SpringWolfConfigConstants#SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfConfigConstants#SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED} */ private boolean enabled = true; } @@ -168,7 +168,7 @@ public static class AsyncListener { public static class AsyncPublisher { /** - * This mirrors the ConfigConstant {@see SpringWolfConfigConstants#SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfConfigConstants#SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED} */ private boolean enabled = true; } @@ -178,7 +178,7 @@ public static class AsyncPublisher { public static class ConsumerData { /** - * This mirrors the ConfigConstant {@see SpringWolfConfigConstants#SPRINGWOLF_SCANNER_PRODUCER_DATA_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfConfigConstants#SPRINGWOLF_SCANNER_PRODUCER_DATA_ENABLED} */ private boolean enabled = true; } @@ -188,7 +188,7 @@ public static class ConsumerData { public static class ProducerData { /** - * This mirrors the ConfigConstant {@see SpringWolfConfigConstants#SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfConfigConstants#SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED} */ private boolean enabled = true; } diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonGenerator.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonGenerator.java index 86af7bdd2..0be9360c3 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonGenerator.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonGenerator.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_SCHEMA_EXAMPLE_GENERATOR; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCHEMA_EXAMPLE_GENERATOR; @Component @Slf4j diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SwaggerInflectorJsonGenerator.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SwaggerInflectorJsonGenerator.java index 1b8e8c870..d3ee160f6 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SwaggerInflectorJsonGenerator.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SwaggerInflectorJsonGenerator.java @@ -15,7 +15,7 @@ import java.util.Map; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_SCHEMA_EXAMPLE_GENERATOR; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCHEMA_EXAMPLE_GENERATOR; /** * This only exists as a fallback when {@see ExampleJsonGenerator} does not work. Please open issue when you feel the need to use this class. diff --git a/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 70499aad7..45a04cce0 100644 --- a/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -io.github.stavshamir.springwolf.SpringWolfAutoConfiguration +io.github.stavshamir.springwolf.SpringwolfAutoConfiguration diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java index 1ebc5a7bf..1653af954 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java @@ -5,7 +5,7 @@ import io.github.stavshamir.springwolf.asyncapi.DefaultAsyncApiService; import io.github.stavshamir.springwolf.asyncapi.DefaultChannelsService; import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import io.github.stavshamir.springwolf.schemas.DefaultSchemasService; import io.github.stavshamir.springwolf.schemas.example.ExampleJsonGenerator; import org.junit.jupiter.api.Nested; @@ -27,7 +27,7 @@ public class SpringContextIntegrationTest { @Nested @ContextConfiguration( classes = { - SpringWolfConfigProperties.class, + SpringwolfConfigProperties.class, CustomBeanAsyncApiDocketConfiguration.class, // user has defined an own AsyncApiDocket bean DefaultAsyncApiDocketService.class, DefaultAsyncApiService.class, @@ -69,7 +69,7 @@ void testContextWithAsyncApiDocketBean() { }) @EnableConfigurationProperties( value = { - SpringWolfConfigProperties.class, + SpringwolfConfigProperties.class, }) @TestPropertySource( properties = { diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java index 58068c8f8..cef97ca8c 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java @@ -13,7 +13,7 @@ import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.Message; import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import io.github.stavshamir.springwolf.schemas.DefaultSchemasService; import io.github.stavshamir.springwolf.schemas.example.ExampleJsonGenerator; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration( classes = { - SpringWolfConfigProperties.class, + SpringwolfConfigProperties.class, DefaultAsyncApiDocketService.class, DefaultAsyncApiService.class, DefaultChannelsService.class, diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java index ded6fb19e..df8a39857 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java @@ -2,7 +2,7 @@ import com.asyncapi.v2._6_0.model.info.Info; import com.asyncapi.v2._6_0.model.server.Server; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,7 +25,7 @@ public class DefaultAsyncApiDocketServiceIntegrationTest { classes = { DefaultAsyncApiDocketService.class, }) - @EnableConfigurationProperties(SpringWolfConfigProperties.class) + @EnableConfigurationProperties(SpringwolfConfigProperties.class) @TestPropertySource( properties = { "springwolf.enabled=true", @@ -53,7 +53,7 @@ void testDocketContentShouldBeLoadedFromProperties() { classes = { DefaultAsyncApiDocketService.class, }) - @EnableConfigurationProperties(SpringWolfConfigProperties.class) + @EnableConfigurationProperties(SpringwolfConfigProperties.class) @TestPropertySource( properties = { "springwolf.enabled=true", diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java index ba1550731..85b8e0d6b 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java @@ -3,9 +3,9 @@ import com.asyncapi.v2._6_0.model.info.Contact; import com.asyncapi.v2._6_0.model.info.License; import com.asyncapi.v2._6_0.model.server.Server; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties.ConfigDocket; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties.ConfigDocket.Info; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.ConfigDocket; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.ConfigDocket.Info; import org.junit.jupiter.api.Test; import java.util.Optional; @@ -36,7 +36,7 @@ void testConfigurationShouldMapAllPropertiesToTheDocket() { info.setContact(new Contact("contact-name", "contact-url", "contact-email")); configDocket.setInfo(info); - SpringWolfConfigProperties properties = new SpringWolfConfigProperties(); + SpringwolfConfigProperties properties = new SpringwolfConfigProperties(); properties.setDocket(configDocket); // when diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java index c530d6d18..591a47913 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java @@ -11,13 +11,13 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * Tests loading or ignoring the SpringWolfAutoConfiguration + * Tests loading or ignoring the SpringwolfAutoConfiguration */ public class AutoConfigurationIntegrationTest { @Nested @SpringBootTest(classes = TestApplication.class) - class TestSpringWolfEnabled { + class TestSpringwolfEnabled { @Autowired private AsyncApiController asyncApiController; @@ -30,7 +30,7 @@ void autoconfigurationShouldBeLoaded() { @Nested @SpringBootTest(classes = TestApplication.class) @TestPropertySource(properties = {"springwolf.enabled=false"}) - class TestSpringWolfDisabled { + class TestSpringwolfDisabled { @Autowired private ObjectProvider asyncApiControllerObjectProvider; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java index c8c5a531e..0c09637c4 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java @@ -76,7 +76,7 @@ void applicationShouldNotStart() { @Nested @SpringBootTest(classes = TestApplication.class) @TestPropertySource(properties = {"springwolf.enabled=false"}) - class TestSpringWolfDisabled { + class TestSpringwolfDisabled { @Autowired(required = false) private AsyncApiController asyncApiController; diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java index efbc3a457..26e4e9d31 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultSchemasServiceContextIntegrationTest.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf.schemas; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import io.github.stavshamir.springwolf.schemas.example.ExampleGenerator; import io.github.stavshamir.springwolf.schemas.example.ExampleJsonGenerator; import io.github.stavshamir.springwolf.schemas.example.SwaggerInflectorJsonGenerator; @@ -46,7 +46,7 @@ void testContextContainsDefaultExampleGenerator() { }) @EnableConfigurationProperties( value = { - SpringWolfConfigProperties.class, + SpringwolfConfigProperties.class, }) @TestPropertySource( properties = { diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java index d7e97ce30..8696b8a19 100644 --- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java +++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerIntegrationWithDockerIntegrationTest.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf.example.kafka; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties; import io.github.stavshamir.springwolf.example.kafka.consumers.ExampleService; import io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto; import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer; @@ -49,7 +49,7 @@ public class ProducerIntegrationWithDockerIntegrationTest { ExampleService exampleService; @Autowired - SpringWolfKafkaConfigProperties properties; + SpringwolfKafkaConfigProperties properties; @Container public static DockerComposeContainer environment = diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfAmqpController.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfAmqpController.java index 43917728b..021db4282 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfAmqpController.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfAmqpController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED; @Slf4j @RestController diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScanner.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScanner.java index 9c3ba68c8..c5f087952 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScanner.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelRabbitListenerScanner.java @@ -22,7 +22,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED; @Slf4j @Service diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScanner.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScanner.java index 092c3f3c2..1da083da7 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScanner.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelRabbitListenerScanner.java @@ -20,7 +20,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED; @Slf4j @Service diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigConstants.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java similarity index 76% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigConstants.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java index 80e3ddda8..340749ffe 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigConstants.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java @@ -1,10 +1,10 @@ package io.github.stavshamir.springwolf.configuration.properties; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.ENABLED; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SCANNER; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX; -public class SpringWolfAmqpConfigConstants { +public class SpringwolfAmqpConfigConstants { public static final String SPRINGWOLF_AMQP_CONFIG_PREFIX = SPRINGWOLF_PLUGIN_CONFIG_PREFIX + ".amqp"; diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigProperties.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java similarity index 84% rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigProperties.java rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java index 061a388c4..4113d69bd 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfAmqpConfigProperties.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java @@ -12,11 +12,11 @@ * the spring-boot-configuration-processor. */ @Configuration -@ConfigurationProperties(prefix = SpringWolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX) -@ConditionalOnProperty(name = SpringWolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) +@ConfigurationProperties(prefix = SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX) +@ConditionalOnProperty(name = SpringwolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) @Getter @Setter -public class SpringWolfAmqpConfigProperties { +public class SpringwolfAmqpConfigProperties { @Nullable private Publishing publishing; @@ -45,7 +45,7 @@ public static class Scanner { public static class RabbitListener { /** - * This mirrors the ConfigConstant {@see SpringWolfAmqpConfigConstants#SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfAmqpConfigConstants#SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED} */ private boolean enabled = true; } diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java index 11ea77607..16224d177 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java @@ -16,8 +16,8 @@ import java.util.Map; import java.util.Optional; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED; @Slf4j @Service diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java index c65e2ad8a..90a025fd9 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java @@ -3,8 +3,8 @@ import io.github.stavshamir.springwolf.asyncapi.AsyncApiService; import io.github.stavshamir.springwolf.asyncapi.ChannelsService; import io.github.stavshamir.springwolf.asyncapi.SpringwolfAmqpController; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfAmqpConfigProperties; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class SpringwolfAmqpProducerConfigurationIntegrationTest { @ContextConfiguration( classes = {DefaultAsyncApiDocketService.class, SpringwolfAmqpProducer.class, SpringwolfAmqpController.class }) - @EnableConfigurationProperties(value = {SpringWolfConfigProperties.class, SpringWolfAmqpConfigProperties.class}) + @EnableConfigurationProperties(value = {SpringwolfConfigProperties.class, SpringwolfAmqpConfigProperties.class}) @TestPropertySource( properties = { "springwolf.enabled=true", @@ -59,7 +59,7 @@ void springwolfAmqpProducerShouldBePresentInSpringContext() { @ContextConfiguration( classes = {DefaultAsyncApiDocketService.class, SpringwolfAmqpProducer.class, SpringwolfAmqpController.class }) - @EnableConfigurationProperties(value = {SpringWolfConfigProperties.class, SpringWolfAmqpConfigProperties.class}) + @EnableConfigurationProperties(value = {SpringwolfConfigProperties.class, SpringwolfAmqpConfigProperties.class}) @TestPropertySource( properties = { "springwolf.enabled=true", diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaController.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaController.java index 6438c7279..b18ae4da4 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaController.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfKafkaController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; @Slf4j @RestController diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScanner.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScanner.java index 774478733..1ce3c0ed7 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScanner.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelKafkaListenerScanner.java @@ -21,7 +21,7 @@ import java.util.Map; import static io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.SpringPayloadAnnotationTypeExtractor.getPayloadType; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; @Slf4j @Service diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScanner.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScanner.java index 3079a2213..d01289ce2 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScanner.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelKafkaListenerScanner.java @@ -17,7 +17,7 @@ import java.lang.reflect.Method; import java.util.Map; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED; @Slf4j @Service diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfiguration.java index 5ae339bf3..92aac25da 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfiguration.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfiguration.java @@ -6,8 +6,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED; @Configuration @ConditionalOnProperty( diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactory.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactory.java index e44f397ef..f2582624a 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactory.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactory.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf.configuration; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.kafka.core.DefaultKafkaProducerFactory; @@ -15,7 +15,7 @@ @ConditionalOnBean(value = SpringwolfKafkaProducerConfiguration.class) public class SpringwolfKafkaTemplateFactory { - private final SpringWolfKafkaConfigProperties springWolfKafkaConfigProperties; + private final SpringwolfKafkaConfigProperties springWolfKafkaConfigProperties; public Optional> buildKafkaTemplate() { Optional> kafkaTemplate = Optional.empty(); diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigConstants.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java similarity index 76% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigConstants.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java index e49837d5f..654923bf0 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigConstants.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java @@ -1,10 +1,10 @@ package io.github.stavshamir.springwolf.configuration.properties; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.ENABLED; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SCANNER; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX; -public class SpringWolfKafkaConfigConstants { +public class SpringwolfKafkaConfigConstants { public static final String SPRINGWOLF_KAFKA_CONFIG_PREFIX = SPRINGWOLF_PLUGIN_CONFIG_PREFIX + ".kafka"; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java similarity index 87% rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigProperties.java rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java index 45298893b..40330d4b0 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringWolfKafkaConfigProperties.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; -import static io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using @@ -17,10 +17,10 @@ */ @Configuration @ConfigurationProperties(prefix = SPRINGWOLF_KAFKA_CONFIG_PREFIX) -@ConditionalOnProperty(name = SpringWolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) +@ConditionalOnProperty(name = SpringwolfConfigConstants.SPRINGWOLF_ENABLED, matchIfMissing = true) @Getter @Setter -public class SpringWolfKafkaConfigProperties { +public class SpringwolfKafkaConfigProperties { @Nullable private Publishing publishing; @@ -52,7 +52,7 @@ public static class Scanner { public static class KafkaListener { /** - * This mirrors the ConfigConstant {@see SpringWolfKafkaConfigConstants#SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED} + * This mirrors the ConfigConstant {@see SpringwolfKafkaConfigConstants#SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED} */ private boolean enabled = true; } diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java index 9feeee398..ac8207806 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java @@ -1,8 +1,8 @@ package io.github.stavshamir.springwolf.configuration; import io.github.stavshamir.springwolf.asyncapi.SpringwolfKafkaController; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfConfigProperties; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties; import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class SpringwolfKafkaProducerConfigurationIntegrationTest { SpringwolfKafkaTemplateFactory.class, SpringwolfKafkaController.class }) - @EnableConfigurationProperties(value = {SpringWolfConfigProperties.class, SpringWolfKafkaConfigProperties.class}) + @EnableConfigurationProperties(value = {SpringwolfConfigProperties.class, SpringwolfKafkaConfigProperties.class}) @TestPropertySource( properties = { "springwolf.enabled=true", @@ -61,7 +61,7 @@ void springwolfKafkaTemplateShouldBePresentInSpringContext() { SpringwolfKafkaProducerConfiguration.class, SpringwolfKafkaController.class }) - @EnableConfigurationProperties(value = {SpringWolfConfigProperties.class, SpringWolfKafkaConfigProperties.class}) + @EnableConfigurationProperties(value = {SpringwolfConfigProperties.class, SpringwolfKafkaConfigProperties.class}) @TestPropertySource( properties = { "springwolf.enabled=true", diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactoryTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactoryTest.java index 748dbc285..b8b352dc3 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactoryTest.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaTemplateFactoryTest.java @@ -1,6 +1,6 @@ package io.github.stavshamir.springwolf.configuration; -import io.github.stavshamir.springwolf.configuration.properties.SpringWolfKafkaConfigProperties; +import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; import org.springframework.kafka.core.KafkaTemplate; @@ -14,7 +14,7 @@ class SpringwolfKafkaTemplateFactoryTest { @Test void kafkaTemplateShouldNotBeCreatedForEmptyProperties() { - SpringWolfKafkaConfigProperties configProperties = new SpringWolfKafkaConfigProperties(); + SpringwolfKafkaConfigProperties configProperties = new SpringwolfKafkaConfigProperties(); SpringwolfKafkaTemplateFactory templateFactory = new SpringwolfKafkaTemplateFactory(configProperties); @@ -25,8 +25,8 @@ void kafkaTemplateShouldNotBeCreatedForEmptyProperties() { @Test void kafkaTemplateShouldNotBeCreatedForEmptyProducerConfiguration() { - SpringWolfKafkaConfigProperties configProperties = new SpringWolfKafkaConfigProperties(); - configProperties.setPublishing(new SpringWolfKafkaConfigProperties.Publishing()); + SpringwolfKafkaConfigProperties configProperties = new SpringwolfKafkaConfigProperties(); + configProperties.setPublishing(new SpringwolfKafkaConfigProperties.Publishing()); SpringwolfKafkaTemplateFactory templateFactory = new SpringwolfKafkaTemplateFactory(configProperties); @@ -37,8 +37,8 @@ void kafkaTemplateShouldNotBeCreatedForEmptyProducerConfiguration() { @Test void kafkaTemplateShouldBeCreatedWithProducerConfiguration() { - SpringWolfKafkaConfigProperties configProperties = new SpringWolfKafkaConfigProperties(); - SpringWolfKafkaConfigProperties.Publishing publishing = new SpringWolfKafkaConfigProperties.Publishing(); + SpringwolfKafkaConfigProperties configProperties = new SpringwolfKafkaConfigProperties(); + SpringwolfKafkaConfigProperties.Publishing publishing = new SpringwolfKafkaConfigProperties.Publishing(); publishing.setEnabled(true); publishing.setProducer(new KafkaProperties.Producer()); From c9bbe0fc321820d1f8c16a7913039f45a55b5524 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Fri, 28 Jul 2023 14:22:35 +0200 Subject: [PATCH 3/6] chore: Ensure spelling of Springwolf Co-authored-by: sam0r040 <93372330+sam0r040@users.noreply.github.com> --- springwolf-ui/src/app/app.component.ts | 2 +- springwolf-ui/src/app/header/header.component.html | 2 +- springwolf-ui/src/asyncapi-ui.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springwolf-ui/src/app/app.component.ts b/springwolf-ui/src/app/app.component.ts index 252020809..10f4b72e9 100644 --- a/springwolf-ui/src/app/app.component.ts +++ b/springwolf-ui/src/app/app.component.ts @@ -6,5 +6,5 @@ import { Component } from "@angular/core"; styleUrls: ["./app.component.css"], }) export class AppComponent { - title = "springwolf"; + title = "Springwolf"; } diff --git a/springwolf-ui/src/app/header/header.component.html b/springwolf-ui/src/app/header/header.component.html index fb6bb09f4..0e6d474fd 100644 --- a/springwolf-ui/src/app/header/header.component.html +++ b/springwolf-ui/src/app/header/header.component.html @@ -1,6 +1,6 @@ -

springwolf

+

Springwolf

diff --git a/springwolf-ui/src/asyncapi-ui.html b/springwolf-ui/src/asyncapi-ui.html index f9309aa12..3d42ebdd1 100644 --- a/springwolf-ui/src/asyncapi-ui.html +++ b/springwolf-ui/src/asyncapi-ui.html @@ -2,7 +2,7 @@ - springwolf + Springwolf From c701b6b3f60aba0a82a599c931d5455187c3ff36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCller?= Date: Fri, 28 Jul 2023 14:22:53 +0200 Subject: [PATCH 4/6] chore: Make TestApplication package private Co-authored-by: Timon Back --- .../stavshamir/springwolf/integrationtests/TestApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/TestApplication.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/TestApplication.java index c0beb6708..b158441ee 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/TestApplication.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/TestApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean; @SpringBootApplication -public class TestApplication { +class TestApplication { @TestConfiguration @ConditionalOnProperty(name = "test.springwolf.asyncapidocket", havingValue = "true", matchIfMissing = true) public static class TestApplicationConfiguration { From 7872fb6cf53c9a167c07d464e85d7c2a09f42c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCller?= Date: Fri, 28 Jul 2023 14:37:53 +0200 Subject: [PATCH 5/6] refactor: Extract AsyncApiDocketFixture Co-authored-by: Timon Back --- .../asyncapi/DefaultAsyncApiServiceTest.java | 41 ++----------------- .../fixtures/AsyncApiDocketFixture.java | 13 ++++++ 2 files changed, 17 insertions(+), 37 deletions(-) create mode 100644 springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java index 1e2c5cfa5..f0115423f 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java @@ -1,10 +1,9 @@ package io.github.stavshamir.springwolf.asyncapi; -import com.asyncapi.v2._6_0.model.info.Info; -import com.asyncapi.v2._6_0.model.server.Server; import io.github.stavshamir.springwolf.asyncapi.types.AsyncAPI; import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService; +import io.github.stavshamir.springwolf.fixtures.AsyncApiDocketFixture; import io.github.stavshamir.springwolf.schemas.SchemasService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,7 +44,7 @@ public void setup() { @Test void shouldThrowExceptionOnSubsequentGetAsyncApi() { // Given an AsyncApiDocketService which throws an exception on 'getAsyncApiDocket()' - prepareExceptionDocket(); + when(asyncApiDocketService.getAsyncApiDocket()).thenThrow(new RuntimeException("test exception")); // When getAsyncAPI is invoked the first time Throwable cause = null; @@ -74,7 +73,8 @@ void shouldThrowExceptionOnSubsequentGetAsyncApi() { @Test void shouldLazyInitializeOnLoadingModeLazy() { // Given a valid Docket-Specification - prepareValidDocket(); + AsyncApiDocket docket = AsyncApiDocketFixture.createMinimal(); + when(asyncApiDocketService.getAsyncApiDocket()).thenReturn(docket); // When getAsyncAPI() isn't called yet // Then isNotInitilized() returns 'true'. @@ -88,37 +88,4 @@ void shouldLazyInitializeOnLoadingModeLazy() { assertThat(asyncAPI).isNotNull(); assertThat(defaultAsyncApiService.isNotInitialized()).isFalse(); } - - /** - * prepares prepares {@link AsyncApiDocketService} mock to throw Exception on getAsyncApiDocket(). - */ - private void prepareExceptionDocket() { - when(asyncApiDocketService.getAsyncApiDocket()).thenThrow(new RuntimeException("test exception")); - } - - /** - * prepares {@link AsyncApiDocketService} mock to return a valid AsyncApiDocket. - */ - private void prepareValidDocket() { - Info info = Info.builder() - .description("Info") - .version("1.0") - .title("Test AsyncApi") - .build(); - - Server server1 = Server.builder() - .description("Server 1") - .url("mq:/localhost:1234") - .protocol("kafka") - .build(); - - AsyncApiDocket docket = AsyncApiDocket.builder() - .id("id") - .defaultContentType("application/json") - .servers(Map.of("server", server1)) - .info(info) - .build(); - - when(asyncApiDocketService.getAsyncApiDocket()).thenReturn(docket); - } } diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java new file mode 100644 index 000000000..9fe96b22b --- /dev/null +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java @@ -0,0 +1,13 @@ +package io.github.stavshamir.springwolf.fixtures; + +import com.asyncapi.v2._6_0.model.info.Info; +import io.github.stavshamir.springwolf.configuration.AsyncApiDocket; + +public class AsyncApiDocketFixture { + + public static AsyncApiDocket createMinimal() { + Info info = Info.builder().version("1.0").title("Test AsyncApi").build(); + + return AsyncApiDocket.builder().info(info).build(); + } +} From b2c813d27e102b908efca03c60de84712440e7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCller?= Date: Fri, 28 Jul 2023 14:53:51 +0200 Subject: [PATCH 6/6] chore: Extend and apply spotless wildcard import configuration Co-authored-by: Timon Back --- .../springwolf-common-model-converters/build.gradle | 2 +- .../converters/MonetaryAmountConverterTest.java | 4 +++- springwolf-core/build.gradle | 2 +- .../channels/operationdata/ConsumerOperationDataScanner.java | 2 +- .../channels/operationdata/ProducerOperationDataScanner.java | 2 +- .../DefaultAsyncApiSerializerServiceIntegrationTest.java | 4 ++-- springwolf-examples/springwolf-amqp-example/build.gradle | 2 +- .../springwolf-cloud-stream-example/build.gradle | 2 +- springwolf-examples/springwolf-kafka-example/build.gradle | 2 +- springwolf-plugins/springwolf-amqp-plugin/build.gradle | 2 +- .../springwolf/producer/SpringwolfAmqpProducerTest.java | 4 +++- .../springwolf-cloud-stream-plugin/build.gradle | 2 +- springwolf-plugins/springwolf-kafka-plugin/build.gradle | 2 +- 13 files changed, 18 insertions(+), 14 deletions(-) diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle index 9949aa35e..959bd8c22 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/build.gradle +++ b/springwolf-add-ons/springwolf-common-model-converters/build.gradle @@ -46,7 +46,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/common_converters/converters/MonetaryAmountConverterTest.java b/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/common_converters/converters/MonetaryAmountConverterTest.java index 4067243f1..e45de4ae0 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/common_converters/converters/MonetaryAmountConverterTest.java +++ b/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/common_converters/converters/MonetaryAmountConverterTest.java @@ -8,7 +8,9 @@ import javax.money.MonetaryAmount; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; class MonetaryAmountConverterTest { diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index 7955595de..057a6738e 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -88,7 +88,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java index 31c3404c3..f867f23af 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.*; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_CONSUMER_DATA_ENABLED; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java index 5de139eed..6f98f3d1c 100644 --- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java +++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.*; +import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_PRODUCER_DATA_ENABLED; @Slf4j @RequiredArgsConstructor diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java index 85465c70c..71fb12a32 100644 --- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java @@ -89,8 +89,8 @@ private AsyncAPI getAsyncAPITestObject() { .subscribe(newUserOperation) .build(); - Map schemas = - ModelConverters.getInstance().read(DefaultAsyncApiSerializerServiceIntegrationTest.ExamplePayload.class); + Map schemas = ModelConverters.getInstance() + .read(DefaultAsyncApiSerializerServiceIntegrationTest.ExamplePayload.class); AsyncAPI asyncapi = AsyncAPI.builder() .info(info) diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 5f6f2d242..91c83308a 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -79,7 +79,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index 6f58f68bf..374493db7 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -89,7 +89,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index 7f059cfaa..b53dbe461 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -95,7 +95,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index bd922490d..ca2137d29 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -62,7 +62,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java index 74a58cd9c..e11044831 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java @@ -17,7 +17,9 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; class SpringwolfAmqpProducerTest { private SpringwolfAmqpProducer springwolfAmqpProducer; diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index 9981ad266..38c0a7126 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -65,7 +65,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace() diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index e9590eb26..ec1a2a116 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -70,7 +70,7 @@ spotless { palantirJavaFormat() importOrder('', 'javax', 'java', '\\#') - replaceRegex("Remove wildcard imports", "import\\s+[^\\*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$1") + replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2") removeUnusedImports() trimTrailingWhitespace()