diff --git a/src/main/java/org/openrewrite/kotlin/FindKotlinSources.java b/src/main/java/org/openrewrite/kotlin/FindKotlinSources.java index 78e8a281c..bbb603668 100644 --- a/src/main/java/org/openrewrite/kotlin/FindKotlinSources.java +++ b/src/main/java/org/openrewrite/kotlin/FindKotlinSources.java @@ -26,7 +26,7 @@ import org.openrewrite.text.PlainText; @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class FindKotlinSources extends Recipe { transient KotlinSourceFile kotlinSourceFile = new KotlinSourceFile(this); diff --git a/src/main/java/org/openrewrite/kotlin/RenameTypeAlias.java b/src/main/java/org/openrewrite/kotlin/RenameTypeAlias.java index 25bd8d0ce..99df3571d 100644 --- a/src/main/java/org/openrewrite/kotlin/RenameTypeAlias.java +++ b/src/main/java/org/openrewrite/kotlin/RenameTypeAlias.java @@ -23,7 +23,7 @@ import org.openrewrite.kotlin.tree.K; @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class RenameTypeAlias extends Recipe { @Option(displayName = "Old alias name", @@ -56,7 +56,7 @@ public String getDescription() { public TreeVisitor getVisitor() { return new KotlinIsoVisitor() { @Override - public K.TypeAlias visitTypeAlias(K.TypeAlias typeAlias, ExecutionContext executionContext) { + public K.TypeAlias visitTypeAlias(K.TypeAlias typeAlias, ExecutionContext ctx) { if (!aliasName.equals(typeAlias.getSimpleName()) || !TypeUtils.isOfClassType(typeAlias.getType(), fullyQualifiedAliasedType)) { return typeAlias; } diff --git a/src/main/java/org/openrewrite/kotlin/cleanup/EqualsMethodUsage.java b/src/main/java/org/openrewrite/kotlin/cleanup/EqualsMethodUsage.java index 01952d2d8..b765172b5 100644 --- a/src/main/java/org/openrewrite/kotlin/cleanup/EqualsMethodUsage.java +++ b/src/main/java/org/openrewrite/kotlin/cleanup/EqualsMethodUsage.java @@ -35,7 +35,7 @@ import static org.openrewrite.Tree.randomId; @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class EqualsMethodUsage extends Recipe { @Nullable private static J.Binary equalsBinaryTemplate; diff --git a/src/main/java/org/openrewrite/kotlin/cleanup/ImplicitParameterInLambda.java b/src/main/java/org/openrewrite/kotlin/cleanup/ImplicitParameterInLambda.java index aa8d0a988..a651f9562 100644 --- a/src/main/java/org/openrewrite/kotlin/cleanup/ImplicitParameterInLambda.java +++ b/src/main/java/org/openrewrite/kotlin/cleanup/ImplicitParameterInLambda.java @@ -31,7 +31,7 @@ @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class ImplicitParameterInLambda extends Recipe { @Override public String getDisplayName() { diff --git a/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingComma.java b/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingComma.java index 0e368ae81..8ea654de4 100644 --- a/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingComma.java +++ b/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingComma.java @@ -23,7 +23,7 @@ import org.openrewrite.kotlin.format.TrailingCommaVisitor; @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class RemoveTrailingComma extends Recipe { @Override public String getDisplayName() { diff --git a/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingSemicolon.java b/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingSemicolon.java index 204ab7245..f7422fa22 100644 --- a/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingSemicolon.java +++ b/src/main/java/org/openrewrite/kotlin/cleanup/RemoveTrailingSemicolon.java @@ -37,7 +37,7 @@ @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class RemoveTrailingSemicolon extends Recipe { @Override public String getDisplayName() { @@ -72,7 +72,7 @@ public M visitMarker(Marker marker, ExecutionContext ctx) { } @Value - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode(callSuper = false) private static class CollectSemicolonRemovableElements extends KotlinPrinter> { Pattern WS = Pattern.compile("^\\s+"); diff --git a/src/main/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCode.java b/src/main/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCode.java index 27265477e..e1d14814e 100644 --- a/src/main/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCode.java +++ b/src/main/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCode.java @@ -29,7 +29,7 @@ @Value -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) public class ReplaceCharToIntWithCode extends Recipe { private static final MethodMatcher CHAR_TO_INT_METHOD_MATCHER = new MethodMatcher("kotlin.Char toInt()"); @Nullable diff --git a/src/test/java/org/openrewrite/kotlin/AddImportTest.java b/src/test/java/org/openrewrite/kotlin/AddImportTest.java index 4aa2fc9c2..5e8f2c894 100644 --- a/src/test/java/org/openrewrite/kotlin/AddImportTest.java +++ b/src/test/java/org/openrewrite/kotlin/AddImportTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.ExecutionContext; import org.openrewrite.Issue; import org.openrewrite.Recipe; @@ -70,6 +71,7 @@ class A { ); } + @DocumentExample @Test void jvmStaticMember() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/AnnotationMatcherTest.java b/src/test/java/org/openrewrite/kotlin/AnnotationMatcherTest.java index 7a1bd78f2..76a902a18 100644 --- a/src/test/java/org/openrewrite/kotlin/AnnotationMatcherTest.java +++ b/src/test/java/org/openrewrite/kotlin/AnnotationMatcherTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.openrewrite.kotlin.Assertions.kotlin; -public class AnnotationMatcherTest implements RewriteTest { +class AnnotationMatcherTest implements RewriteTest { @Test void matchAnnotation() { diff --git a/src/test/java/org/openrewrite/kotlin/AssertionsTest.java b/src/test/java/org/openrewrite/kotlin/AssertionsTest.java index 7d20777bb..5bf622dbd 100644 --- a/src/test/java/org/openrewrite/kotlin/AssertionsTest.java +++ b/src/test/java/org/openrewrite/kotlin/AssertionsTest.java @@ -29,7 +29,7 @@ import static org.openrewrite.kotlin.Assertions.kotlin; import static org.openrewrite.test.RewriteTest.toRecipe; -public class AssertionsTest implements RewriteTest { +class AssertionsTest implements RewriteTest { @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/30") @Test diff --git a/src/test/java/org/openrewrite/kotlin/ChangeAnnotationAttributeNameTest.java b/src/test/java/org/openrewrite/kotlin/ChangeAnnotationAttributeNameTest.java index 8d4c3c08a..16d784ecb 100644 --- a/src/test/java/org/openrewrite/kotlin/ChangeAnnotationAttributeNameTest.java +++ b/src/test/java/org/openrewrite/kotlin/ChangeAnnotationAttributeNameTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.java.ChangeAnnotationAttributeName; import org.openrewrite.test.RewriteTest; @@ -23,8 +24,9 @@ class ChangeAnnotationAttributeNameTest implements RewriteTest { + @DocumentExample @Test - public void changeAnnotationAttributes() { + void changeAnnotationAttributes() { rewriteRun( spec -> spec.recipe(new ChangeAnnotationAttributeName( "org.junit.jupiter.api.Tag", diff --git a/src/test/java/org/openrewrite/kotlin/FindFieldsTest.java b/src/test/java/org/openrewrite/kotlin/FindFieldsTest.java index 1ebd941c7..29c683066 100644 --- a/src/test/java/org/openrewrite/kotlin/FindFieldsTest.java +++ b/src/test/java/org/openrewrite/kotlin/FindFieldsTest.java @@ -16,13 +16,15 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.java.search.FindFields; import org.openrewrite.test.RewriteTest; import static org.openrewrite.kotlin.Assertions.kotlin; -public class FindFieldsTest implements RewriteTest { +class FindFieldsTest implements RewriteTest { + @DocumentExample @Test void jvmStaticField() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/FindMethodsTest.java b/src/test/java/org/openrewrite/kotlin/FindMethodsTest.java index 60498e36e..c6065600a 100644 --- a/src/test/java/org/openrewrite/kotlin/FindMethodsTest.java +++ b/src/test/java/org/openrewrite/kotlin/FindMethodsTest.java @@ -16,13 +16,15 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.java.search.FindMethods; import org.openrewrite.test.RewriteTest; import static org.openrewrite.kotlin.Assertions.kotlin; -public class FindMethodsTest implements RewriteTest { +class FindMethodsTest implements RewriteTest { + @DocumentExample @Test void jvmStaticMethod() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/KotlinTypeGoatTest.java b/src/test/java/org/openrewrite/kotlin/KotlinTypeGoatTest.java index 0360bfc4c..644c90a93 100644 --- a/src/test/java/org/openrewrite/kotlin/KotlinTypeGoatTest.java +++ b/src/test/java/org/openrewrite/kotlin/KotlinTypeGoatTest.java @@ -25,7 +25,7 @@ import static org.openrewrite.ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT; import static org.openrewrite.kotlin.Assertions.kotlin; -public class KotlinTypeGoatTest implements RewriteTest { +class KotlinTypeGoatTest implements RewriteTest { @Language("kotlin") private static final String goat = StringUtils.readFully(KotlinTypeMappingTest.class.getResourceAsStream("/KotlinTypeGoat.kt")); diff --git a/src/test/java/org/openrewrite/kotlin/MethodMatcherTest.java b/src/test/java/org/openrewrite/kotlin/MethodMatcherTest.java index 1e66381cf..b276f182e 100644 --- a/src/test/java/org/openrewrite/kotlin/MethodMatcherTest.java +++ b/src/test/java/org/openrewrite/kotlin/MethodMatcherTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.ExecutionContext; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.tree.J; @@ -27,6 +28,7 @@ class MethodMatcherTest implements RewriteTest { + @DocumentExample @Test void matchesTopLevelFunction() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java b/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java index 67ea03ba8..02e2f459d 100644 --- a/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java +++ b/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.ExecutionContext; import org.openrewrite.Recipe; import org.openrewrite.kotlin.tree.K; @@ -25,8 +26,9 @@ import static org.openrewrite.kotlin.Assertions.kotlin; import static org.openrewrite.test.RewriteTest.toRecipe; -public class RemoveImportTest implements RewriteTest { +class RemoveImportTest implements RewriteTest { + @DocumentExample @Test void jvmStaticMember() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/RenameTypeAliasTest.java b/src/test/java/org/openrewrite/kotlin/RenameTypeAliasTest.java index 6c598f28f..f5dfd35b1 100644 --- a/src/test/java/org/openrewrite/kotlin/RenameTypeAliasTest.java +++ b/src/test/java/org/openrewrite/kotlin/RenameTypeAliasTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.Issue; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; @@ -54,6 +55,7 @@ class Test ); } + @DocumentExample @Test void declaration() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/UseStaticImportTest.java b/src/test/java/org/openrewrite/kotlin/UseStaticImportTest.java index 94ca43ae5..285970b40 100644 --- a/src/test/java/org/openrewrite/kotlin/UseStaticImportTest.java +++ b/src/test/java/org/openrewrite/kotlin/UseStaticImportTest.java @@ -16,13 +16,15 @@ package org.openrewrite.kotlin; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.java.UseStaticImport; import org.openrewrite.test.RewriteTest; import static org.openrewrite.kotlin.Assertions.kotlin; -public class UseStaticImportTest implements RewriteTest { +class UseStaticImportTest implements RewriteTest { + @DocumentExample @Test void noPriorImports() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCodeTest.java b/src/test/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCodeTest.java index 453382c21..4d900186b 100644 --- a/src/test/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCodeTest.java +++ b/src/test/java/org/openrewrite/kotlin/cleanup/ReplaceCharToIntWithCodeTest.java @@ -23,7 +23,7 @@ import static org.openrewrite.kotlin.Assertions.kotlin; -public class ReplaceCharToIntWithCodeTest implements RewriteTest { +class ReplaceCharToIntWithCodeTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipe(new ReplaceCharToIntWithCode()); diff --git a/src/test/java/org/openrewrite/kotlin/format/AutoFormatVisitorTest.java b/src/test/java/org/openrewrite/kotlin/format/AutoFormatVisitorTest.java index 8425af232..cb098be01 100644 --- a/src/test/java/org/openrewrite/kotlin/format/AutoFormatVisitorTest.java +++ b/src/test/java/org/openrewrite/kotlin/format/AutoFormatVisitorTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin.format; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.tree.J; @@ -40,6 +41,7 @@ public void defaults(RecipeSpec spec) { spec.recipe(new AutoFormat()); } + @DocumentExample @Test void keepMaximumBetweenHeaderAndPackage() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/format/MinimumViableSpacingTest.java b/src/test/java/org/openrewrite/kotlin/format/MinimumViableSpacingTest.java index c1d8c0ece..2195b30ab 100644 --- a/src/test/java/org/openrewrite/kotlin/format/MinimumViableSpacingTest.java +++ b/src/test/java/org/openrewrite/kotlin/format/MinimumViableSpacingTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin.format; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.ExecutionContext; import org.openrewrite.Issue; import org.openrewrite.java.JavaIsoVisitor; @@ -46,6 +47,7 @@ public Space visitSpace(Space space, Space.Location loc, ExecutionContext ctx) { ); } + @DocumentExample @Test void classDeclaration() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/format/NormalizeTabsOrSpacesTest.java b/src/test/java/org/openrewrite/kotlin/format/NormalizeTabsOrSpacesTest.java index f0c261066..4264c8c63 100644 --- a/src/test/java/org/openrewrite/kotlin/format/NormalizeTabsOrSpacesTest.java +++ b/src/test/java/org/openrewrite/kotlin/format/NormalizeTabsOrSpacesTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin.format; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.Issue; import org.openrewrite.Tree; import org.openrewrite.kotlin.KotlinParser; @@ -47,6 +48,7 @@ private static Consumer tabsAndIndents(UnaryOperator trailingCommaStyle(UnaryOperator return spec -> spec.recipe(toRecipe(() -> new TrailingCommaVisitor<>(with.apply(IntelliJ.other()).getUseTrailingComma()))); } + @DocumentExample @Test void classPropertiesWithTrailingCommaOff() { rewriteRun( diff --git a/src/test/java/org/openrewrite/kotlin/format/WrappingAndBracesTest.java b/src/test/java/org/openrewrite/kotlin/format/WrappingAndBracesTest.java index 5ae62afb5..2cb62cb11 100644 --- a/src/test/java/org/openrewrite/kotlin/format/WrappingAndBracesTest.java +++ b/src/test/java/org/openrewrite/kotlin/format/WrappingAndBracesTest.java @@ -16,6 +16,7 @@ package org.openrewrite.kotlin.format; import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; import org.openrewrite.Issue; import org.openrewrite.Tree; import org.openrewrite.kotlin.KotlinParser; @@ -77,6 +78,7 @@ class A ( ); } + @DocumentExample @SuppressWarnings({"ClassInitializerMayBeStatic", "ReassignedVariable", "UnusedAssignment"}) @Test void blockLevelStatements() { diff --git a/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java b/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java index 583a79616..d56050bf2 100644 --- a/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java +++ b/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java @@ -464,7 +464,8 @@ sealed interface InvalidField { @Test void init() { rewriteRun( - kotlin(""" + kotlin( + """ class Test { init { println ( "Hello, world!" ) diff --git a/src/test/java/org/openrewrite/kotlin/tree/ContinueTest.java b/src/test/java/org/openrewrite/kotlin/tree/ContinueTest.java index 9f2e093a0..ee0bbedfa 100644 --- a/src/test/java/org/openrewrite/kotlin/tree/ContinueTest.java +++ b/src/test/java/org/openrewrite/kotlin/tree/ContinueTest.java @@ -27,11 +27,11 @@ void continueFromWhileLoop() { rewriteRun( kotlin( """ - class Test { - fun test ( ) { - while ( true ) continue - } - } + class Test { + fun test ( ) { + while ( true ) continue + } + } """ ) ); diff --git a/src/test/java/org/openrewrite/kotlin/tree/ImportTest.java b/src/test/java/org/openrewrite/kotlin/tree/ImportTest.java index 39f6adffe..fdc643172 100644 --- a/src/test/java/org/openrewrite/kotlin/tree/ImportTest.java +++ b/src/test/java/org/openrewrite/kotlin/tree/ImportTest.java @@ -98,7 +98,7 @@ void methodName() { kotlin( "import createInstance /*C1*/", spec -> spec.afterRecipe(cu -> { - System.out.println(cu.getImports().get(0).getPackageName()); + assertThat(cu.getImports().get(0).getPackageName()).isEmpty(); }) ) ); diff --git a/src/test/java/org/openrewrite/kotlin/tree/KTSTest.java b/src/test/java/org/openrewrite/kotlin/tree/KTSTest.java index c8ca37769..802a9a8ff 100644 --- a/src/test/java/org/openrewrite/kotlin/tree/KTSTest.java +++ b/src/test/java/org/openrewrite/kotlin/tree/KTSTest.java @@ -31,7 +31,8 @@ class KTSTest implements RewriteTest { @Test void topLevelAssignmentExpression() { rewriteRun( - kotlinScript(""" + kotlinScript( + """ var x = 5 x += 1 /*C1*/ """) @@ -41,7 +42,8 @@ void topLevelAssignmentExpression() { @Test void topLevelFunctionCall() { rewriteRun( - kotlinScript(""" + kotlinScript( + """ println("foo") """) ); @@ -50,7 +52,8 @@ void topLevelFunctionCall() { @Test void topLevelForLoop() { rewriteRun( - kotlinScript(""" + kotlinScript( + """ val items = listOf("foo", "bar", "buz") for (item in items) { println(item) diff --git a/src/test/java/org/openrewrite/kotlin/tree/VariableDeclarationTest.java b/src/test/java/org/openrewrite/kotlin/tree/VariableDeclarationTest.java index bbab81dcc..75390b2c8 100644 --- a/src/test/java/org/openrewrite/kotlin/tree/VariableDeclarationTest.java +++ b/src/test/java/org/openrewrite/kotlin/tree/VariableDeclarationTest.java @@ -56,7 +56,8 @@ void addition() { @Test void deSugar() { rewriteRun( - kotlin(""" + kotlin( + """ val a = if (2 !in 1 .. 10) "X" else "Y" """ )