From a18708ea4fd734cec462a187a3e7e8955b6c1edb Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 16 Sep 2024 21:52:25 +0000 Subject: [PATCH 1/2] refactor: Order imports Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.OrderImports?organizationId=T3BlblJld3JpdGU%3D#defaults=W3sidmFsdWUiOiJUcnVlIiwibmFtZSI6InJlbW92ZVVudXNlZCJ9XQ== Co-authored-by: Moderne --- .../org/openrewrite/internal/StringUtilsTest.java | 8 +++++++- .../org/openrewrite/marker/GitProvenanceTest.java | 1 - .../openrewrite/gradle/marker/GradleBuildscript.java | 5 ++++- .../org/openrewrite/groovy/GroovyTypeMapping.java | 4 +++- .../openrewrite/java/ReloadableJava8TypeMapping.java | 4 +++- .../org/openrewrite/java/JavaTypeMappingTest.java | 4 +++- .../internal/grammar/AnnotationSignatureLexer.java | 10 ++++------ .../internal/grammar/AnnotationSignatureParser.java | 12 +++++++----- .../internal/grammar/TemplateParameterLexer.java | 10 ++++------ .../internal/grammar/TemplateParameterParser.java | 12 +++++++----- .../main/java/org/openrewrite/json/JsonParser.java | 5 ++++- .../org/openrewrite/maven/AddRuntimeConfigTest.java | 6 +++++- .../src/main/java/org/openrewrite/xml/XmlParser.java | 5 ++++- .../openrewrite/xml/internal/grammar/XMLLexer.java | 10 ++++------ .../openrewrite/xml/internal/grammar/XMLParser.java | 12 +++++++----- 15 files changed, 66 insertions(+), 42 deletions(-) diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java index 0ed57e28f1f..1b57bab3f9a 100644 --- a/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java +++ b/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java @@ -19,7 +19,13 @@ import org.openrewrite.Issue; import static org.assertj.core.api.Assertions.assertThat; -import static org.openrewrite.internal.StringUtils.*; +import static org.openrewrite.internal.StringUtils.containsOnlyWhitespaceAndComments; +import static org.openrewrite.internal.StringUtils.countOccurrences; +import static org.openrewrite.internal.StringUtils.greatestCommonMargin; +import static org.openrewrite.internal.StringUtils.greatestCommonSubstringLength; +import static org.openrewrite.internal.StringUtils.matchesGlob; +import static org.openrewrite.internal.StringUtils.replaceFirst; +import static org.openrewrite.internal.StringUtils.trimIndentPreserveCRLF; class StringUtilsTest { diff --git a/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java b/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java index 4fe19dd901a..434a59d62fd 100644 --- a/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java +++ b/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java @@ -48,7 +48,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import static com.fasterxml.jackson.core.JsonParser.Feature.IGNORE_UNDEFINED; import static com.fasterxml.jackson.core.JsonParser.Feature.INCLUDE_SOURCE_IN_LOCATION; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleBuildscript.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleBuildscript.java index 81cee15799b..22f7667b785 100644 --- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleBuildscript.java +++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleBuildscript.java @@ -23,7 +23,10 @@ import org.openrewrite.maven.tree.MavenRepository; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java index 56eb0efdff9..872160fa148 100644 --- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java +++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java @@ -30,7 +30,9 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.*; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.CONTRAVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.COVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.INVARIANT; class GroovyTypeMapping implements JavaTypeMapping { private final GroovyAstTypeSignatureBuilder signatureBuilder = new GroovyAstTypeSignatureBuilder(); diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java index 14787c651c2..7bb5a56544c 100644 --- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java +++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java @@ -35,7 +35,9 @@ import java.util.stream.Collectors; import static java.util.Collections.singletonList; -import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.*; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.CONTRAVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.COVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.INVARIANT; @RequiredArgsConstructor class ReloadableJava8TypeMapping implements JavaTypeMapping { diff --git a/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeMappingTest.java b/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeMappingTest.java index f88523ea5a8..591d897bfc3 100644 --- a/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeMappingTest.java +++ b/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeMappingTest.java @@ -25,7 +25,9 @@ import static java.util.Objects.requireNonNull; import static org.assertj.core.api.Assertions.assertThat; -import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.*; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.CONTRAVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.COVARIANT; +import static org.openrewrite.java.tree.JavaType.GenericTypeVariable.Variance.INVARIANT; /** * Based on type attribution mappings of [JavaTypeGoat]. diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java index b7de3acdab7..c5f2864b95e 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java @@ -16,13 +16,11 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.java.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) public class AnnotationSignatureLexer extends Lexer { diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java index 914f7238853..a36d8d41798 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java @@ -16,13 +16,15 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.java.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java index 9eed4532351..195399da966 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java @@ -16,13 +16,11 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.java.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) public class TemplateParameterLexer extends Lexer { diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java index ac2dcac7364..01d3d651a7b 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java @@ -16,13 +16,15 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.java.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) 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 e3494066a2e..7f654cd33e9 100755 --- a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java +++ b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java @@ -18,7 +18,10 @@ import org.antlr.v4.runtime.*; import org.intellij.lang.annotations.Language; import org.jspecify.annotations.Nullable; -import org.openrewrite.*; +import org.openrewrite.ExecutionContext; +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; 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-xml/src/main/java/org/openrewrite/xml/XmlParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java index e9e323443a8..098a5279fc0 100755 --- a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java +++ b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java @@ -18,7 +18,10 @@ import org.antlr.v4.runtime.*; import org.intellij.lang.annotations.Language; import org.jspecify.annotations.Nullable; -import org.openrewrite.*; +import org.openrewrite.ExecutionContext; +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; diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java index 066e1a879e3..3756f23a97e 100644 --- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java +++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java @@ -16,13 +16,11 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.xml.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) public class XMLLexer extends Lexer { diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java index fef0184a3a9..31beb42c95a 100644 --- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java +++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java @@ -16,13 +16,15 @@ // Generated from java-escape by ANTLR 4.11.1 package org.openrewrite.xml.internal.grammar; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"}) From b4d52283cffa038298e2a872c0e6383b0c68866d Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 17 Sep 2024 10:13:25 +0200 Subject: [PATCH 2/2] Apply suggestions from code review --- .../java/org/openrewrite/internal/StringUtilsTest.java | 8 +------- .../java/org/openrewrite/maven/AddRuntimeConfigTest.java | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java index 1b57bab3f9a..0ed57e28f1f 100644 --- a/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java +++ b/rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java @@ -19,13 +19,7 @@ import org.openrewrite.Issue; import static org.assertj.core.api.Assertions.assertThat; -import static org.openrewrite.internal.StringUtils.containsOnlyWhitespaceAndComments; -import static org.openrewrite.internal.StringUtils.countOccurrences; -import static org.openrewrite.internal.StringUtils.greatestCommonMargin; -import static org.openrewrite.internal.StringUtils.greatestCommonSubstringLength; -import static org.openrewrite.internal.StringUtils.matchesGlob; -import static org.openrewrite.internal.StringUtils.replaceFirst; -import static org.openrewrite.internal.StringUtils.trimIndentPreserveCRLF; +import static org.openrewrite.internal.StringUtils.*; class StringUtilsTest { 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 f73a1ea5f7e..983e32f4d7c 100644 --- a/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java +++ b/rewrite-maven/src/test/java/org/openrewrite/maven/AddRuntimeConfigTest.java @@ -24,11 +24,7 @@ import org.openrewrite.test.RewriteTest; import org.openrewrite.test.SourceSpecs; -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.AddRuntimeConfig.*; import static org.openrewrite.maven.Assertions.pomXml; import static org.openrewrite.test.SourceSpecs.text;