Release Preparation (#308)

* test: Rename all integration test with IntegrationTest postfix Co-authored-by: Timon Back <[email protected]> * chore: Ensure spelling of Springwolf Co-authored-by: Timon Back <[email protected]> * chore: Ensure spelling of Springwolf Co-authored-by: sam0r040 <[email protected]> * chore: Make TestApplication package private Co-authored-by: Timon Back <[email protected]> * refactor: Extract AsyncApiDocketFixture Co-authored-by: Timon Back <[email protected]> * chore: Extend and apply spotless wildcard import configuration Co-authored-by: Timon Back <[email protected]> --------- Co-authored-by: Timon Back <[email protected]> Co-authored-by: Timon Back <[email protected]>
springwolf · Jul 28, 2023 · e9a3d60 · e9a3d60
1 parent 06069cb
commit e9a3d60
Show file tree

Hide file tree

Showing 79 changed files with 396 additions and 412 deletions.
diff --git 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/...ithub/stavshamir/springwolf/common_converters/converters/MonetaryAmountConverterTest.java b/...ithub/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
@@ -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/...ringwolf/SpringWolfAutoConfiguration.java → ...ringwolf/SpringwolfAutoConfiguration.java b/...ringwolf/SpringWolfAutoConfiguration.java → ...ringwolf/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/...pi/SpringWolfInitApplicationListener.java → ...pi/SpringwolfInitApplicationListener.java b/...pi/SpringWolfInitApplicationListener.java → ...pi/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<ApplicationReadyEvent>, InitializingBean {
+public class SpringwolfInitApplicationListener implements ApplicationListener<ApplicationReadyEvent>, 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/...mir/springwolf/asyncapi/scanners/channels/operationdata/ConsumerOperationDataScanner.java b/...mir/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/...mir/springwolf/asyncapi/scanners/channels/operationdata/ProducerOperationDataScanner.java b/...mir/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/...f/asyncapi/scanners/channels/operationdata/annotation/AsyncListenerAnnotationScanner.java b/...f/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/.../asyncapi/scanners/channels/operationdata/annotation/AsyncPublisherAnnotationScanner.java b/.../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/...main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java b/...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<SpringWolfConfigProperties> configProperties;
+    private final Optional<SpringwolfConfigProperties> 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/...properties/SpringWolfConfigConstants.java → ...properties/SpringwolfConfigConstants.java b/...properties/SpringWolfConfigConstants.java → ...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/...roperties/SpringWolfConfigProperties.java → ...roperties/SpringwolfConfigProperties.java b/...roperties/SpringWolfConfigProperties.java → ...roperties/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/...e/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonGenerator.java b/...e/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/...n/java/io/github/stavshamir/springwolf/schemas/example/SwaggerInflectorJsonGenerator.java b/...n/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/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.SpringWolfAutoConfiguration
+io.github.stavshamir.springwolf.SpringwolfAutoConfiguration
diff --git a/...vshamir/springwolf/SpringContextTest.java → ...ingwolf/SpringContextIntegrationTest.java b/...vshamir/springwolf/SpringContextTest.java → ...ingwolf/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;
@@ -21,13 +21,13 @@
 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
     @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/...DefaultAsyncApiSerializerServiceTest.java → ...cApiSerializerServiceIntegrationTest.java b/...DefaultAsyncApiSerializerServiceTest.java → ...cApiSerializerServiceIntegrationTest.java
@@ -35,7 +35,7 @@
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DefaultAsyncApiSerializerService.class})
-class DefaultAsyncApiSerializerServiceTest {
+class DefaultAsyncApiSerializerServiceIntegrationTest {
 
     @Autowired
     private DefaultAsyncApiSerializerService serializer;
@@ -89,8 +89,8 @@ private AsyncAPI getAsyncAPITestObject() {
                 .subscribe(newUserOperation)
                 .build();
 
-        Map<String, Schema> schemas =
-                ModelConverters.getInstance().read(DefaultAsyncApiSerializerServiceTest.ExamplePayload.class);
+        Map<String, Schema> schemas = ModelConverters.getInstance()
+                .read(DefaultAsyncApiSerializerServiceIntegrationTest.ExamplePayload.class);
 
         AsyncAPI asyncapi = AsyncAPI.builder()
                 .info(info)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		io.github.stavshamir.springwolf.SpringWolfAutoConfiguration
		io.github.stavshamir.springwolf.SpringwolfAutoConfiguration