chore: Extend and apply spotless wildcard import configuration

Co-authored-by: Timon Back <[email protected]>
springwolf · Jul 28, 2023 · b2c813d · b2c813d
1 parent 7872fb6
commit b2c813d
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 14 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/...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/...ithub/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java b/...ithub/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
@@ -89,8 +89,8 @@ private AsyncAPI getAsyncAPITestObject() {
                 .subscribe(newUserOperation)
                 .build();
 
-        Map<String, Schema> schemas =
-                ModelConverters.getInstance().read(DefaultAsyncApiSerializerServiceIntegrationTest.ExamplePayload.class);
+        Map<String, Schema> 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
@@ -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
@@ -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
@@ -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
@@ -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/...in/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java b/...in/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
@@ -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
@@ -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()