From 1ed522465adf529a2fdfdb84eff31f0eef8de0cf Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 20 Sep 2024 11:08:47 +0000 Subject: [PATCH] refactor: OpenRewrite best practices Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.recipes.OpenRewriteBestPractices?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .../test/java/org/openrewrite/java/OrderImportsTest.java | 6 ++++-- .../src/main/java/org/openrewrite/json/JsonParser.java | 1 - .../java/org/openrewrite/maven/AddRuntimeConfigTest.java | 6 +++++- .../openrewrite/maven/internal/MavenPomDownloaderTest.java | 5 ++++- .../src/main/java/org/openrewrite/xml/XmlParser.java | 1 - 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/OrderImportsTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/OrderImportsTest.java index 85e6f79bfd7..938134b5de7 100755 --- a/rewrite-java-test/src/test/java/org/openrewrite/java/OrderImportsTest.java +++ b/rewrite-java-test/src/test/java/org/openrewrite/java/OrderImportsTest.java @@ -22,12 +22,14 @@ import org.openrewrite.style.NamedStyles; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; -import org.openrewrite.test.SourceSpec; import static java.util.Collections.emptySet; import static java.util.Collections.singletonList; import static org.openrewrite.Tree.randomId; -import static org.openrewrite.java.Assertions.*; +import static org.openrewrite.java.Assertions.addTypesToSourceSet; +import static org.openrewrite.java.Assertions.java; +import static org.openrewrite.java.Assertions.srcMainJava; +import static org.openrewrite.java.Assertions.version; class OrderImportsTest implements RewriteTest { diff --git a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java index 7f654cd33e9..98c43ede841 100755 --- a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java +++ b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java @@ -22,7 +22,6 @@ import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Parser; import org.openrewrite.SourceFile; -import org.openrewrite.Parser; import org.openrewrite.json.internal.JsonParserVisitor; import org.openrewrite.json.internal.grammar.JSON5Lexer; import org.openrewrite.json.internal.grammar.JSON5Parser; diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java index 983e32f4d7c..f73a1ea5f7e 100644 --- a/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java +++ b/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java @@ -24,7 +24,11 @@ import org.openrewrite.test.RewriteTest; import org.openrewrite.test.SourceSpecs; -import static org.openrewrite.maven.AddRuntimeConfig.*; +import static org.openrewrite.maven.AddRuntimeConfig.JVM_CONFIG_FILENAME; +import static org.openrewrite.maven.AddRuntimeConfig.JVM_CONFIG_PATH; +import static org.openrewrite.maven.AddRuntimeConfig.MAVEN_CONFIG_FILENAME; +import static org.openrewrite.maven.AddRuntimeConfig.MAVEN_CONFIG_PATH; +import static org.openrewrite.maven.AddRuntimeConfig.Separator; import static org.openrewrite.maven.Assertions.pomXml; import static org.openrewrite.test.SourceSpecs.text; diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java index 5423675b68b..e1e0a770709 100755 --- a/rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java +++ b/rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java @@ -45,7 +45,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import static java.util.Collections.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java index 098a5279fc0..cca7af905b5 100755 --- a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java +++ b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java @@ -22,7 +22,6 @@ import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Parser; import org.openrewrite.SourceFile; -import org.openrewrite.Parser; import org.openrewrite.internal.EncodingDetectingInputStream; import org.openrewrite.tree.ParseError; import org.openrewrite.tree.ParsingEventListener;