Merge branch 'main' into example-yaml-recipe-test

moderneinc · Feb 6, 2024 · c6a7dfa · c6a7dfa
2 parents 1d36f24 + 20b3d00
commit c6a7dfa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ build/
 .gradle/
 .idea/
 out/
+src/main/generated/
diff --git a/gradle/licenseHeader.txt b/gradle/licenseHeader.txt
@@ -1,4 +1,4 @@
-Copyright 2023 the original author or authors.
+Copyright ${year} the original author or authors.
 <p>
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/yourorg/NoGuavaListsNewArrayList.java b/src/main/java/com/yourorg/NoGuavaListsNewArrayList.java
@@ -68,7 +68,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                     .build();
 
                 @Override
-                public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
+                public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                     if (NEW_ARRAY_LIST.matches(method)) {
                         maybeRemoveImport("com.google.common.collect.Lists");
                         maybeAddImport("java.util.ArrayList");
@@ -84,7 +84,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
                         return newArrayListCapacity.apply(getCursor(), method.getCoordinates().replace(),
                             method.getArguments().get(0));
                     }
-                    return super.visitMethodInvocation(method, executionContext);
+                    return super.visitMethodInvocation(method, ctx);
                 }
             }
         );

diff --git a/src/test/java/com/yourorg/NoGuavaListsNewArrayListTest.java b/src/test/java/com/yourorg/NoGuavaListsNewArrayListTest.java
@@ -16,6 +16,7 @@
 package com.yourorg;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -35,6 +36,7 @@ public void defaults(RecipeSpec spec) {
                 .classpath("guava"));
     }
 
+    @DocumentExample
     @Test
     void replaceWithNewArrayList() {
         rewriteRun(
@@ -45,7 +47,8 @@ void replaceWithNewArrayList() {
                     .logCompilationWarningsAndErrors(false)
                     .classpath("guava")),
             // language=java
-            java("""
+            java(
+            """
                     import com.google.common.collect.*;
                     
                     import java.util.List;
@@ -70,7 +73,8 @@ class Test {
     void replaceWithNewArrayListIterable() {
         rewriteRun(
             // language=java
-            java("""
+            java(
+            """
                     import com.google.common.collect.*;
                     
                     import java.util.Collections;
@@ -99,7 +103,8 @@ class Test {
     void replaceWithNewArrayListWithCapacity() {
         rewriteRun(
             // language=java
-            java("""
+            java(
+            """
                 import com.google.common.collect.*;
                 
                 import java.util.ArrayList;

diff --git a/src/test/java/com/yourorg/SimplifyTernaryTest.java b/src/test/java/com/yourorg/SimplifyTernaryTest.java
@@ -16,11 +16,13 @@
 package com.yourorg;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
 import org.openrewrite.test.RewriteTest;
 
 import static org.openrewrite.java.Assertions.java;
 
 class SimplifyTernaryTest implements RewriteTest {
+    @DocumentExample
     @Test
     void simplified() {
         rewriteRun(