UseImportPolicy in NoGuavaRefaster (#717)

timtebeek · web-flow · commit 6b98403236ad · 2025-05-04T20:09:15.000+02:00
* UseImportPolicy in NoGuavaRefaster

* Update expected examples.yml
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaRefaster.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaRefaster.java
@@ -15,8 +15,10 @@
  */
 package org.openrewrite.java.migrate.guava;
 
+import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import org.openrewrite.java.template.RecipeDescriptor;
 
 @RecipeDescriptor(
@@ -36,6 +38,7 @@ Object before(Object object) {
         }
 
         @AfterTemplate
+        @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
         Object after(Object object) {
             return java.util.Objects.requireNonNull(object);
         }
@@ -53,6 +56,7 @@ Object before(Object object, String message) {
         }
 
         @AfterTemplate
+        @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
         Object after(Object object, String message) {
             return java.util.Objects.requireNonNull(object, message);
         }
@@ -69,6 +73,7 @@ Object before(Object object, Object message) {
         }
 
         @AfterTemplate
+        @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
         Object after(Object object, Object message) {
             return java.util.Objects.requireNonNull(object, String.valueOf(message));
         }
diff --git a/src/main/resources/META-INF/rewrite/examples.yml b/src/main/resources/META-INF/rewrite/examples.yml
@@ -994,31 +994,34 @@ recipeName: org.openrewrite.java.migrate.UpgradePluginsForJava11
 examples:
 - description: ''
   sources:
+  - before: project
+    language: mavenProject
   - before: |
       <project>
         <groupId>com.mycompany.app</groupId>
         <artifactId>my-app</artifactId>
         <version>1</version>
-        <properties>
-          <wro4j.version>1.8.0</wro4j.version>
-        </properties>
         <build>
           <plugins>
             <plugin>
-              <groupId>ro.isdc.wro4j</groupId>
-              <artifactId>wro4j-maven-plugin</artifactId>
-              <version>${wro4j.version}</version>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>jaxb2-maven-plugin</artifactId>
+              <version>2.3.1</version>
             </plugin>
           </plugins>
         </build>
       </project>
-    after: |
+    path: pom.xml
+    language: xml
+- description: ''
+  sources:
+  - before: |
       <project>
         <groupId>com.mycompany.app</groupId>
         <artifactId>my-app</artifactId>
         <version>1</version>
         <properties>
-          <wro4j.version>1.10.1</wro4j.version>
+          <wro4j.version>1.8.0</wro4j.version>
         </properties>
         <build>
           <plugins>
@@ -1030,23 +1033,20 @@ examples:
           </plugins>
         </build>
       </project>
-    path: pom.xml
-    language: xml
-- description: ''
-  sources:
-  - before: project
-    language: mavenProject
-  - before: |
+    after: |
       <project>
         <groupId>com.mycompany.app</groupId>
         <artifactId>my-app</artifactId>
         <version>1</version>
+        <properties>
+          <wro4j.version>1.10.1</wro4j.version>
+        </properties>
         <build>
           <plugins>
             <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>jaxb2-maven-plugin</artifactId>
-              <version>2.3.1</version>
+              <groupId>ro.isdc.wro4j</groupId>
+              <artifactId>wro4j-maven-plugin</artifactId>
+              <version>${wro4j.version}</version>
             </plugin>
           </plugins>
         </build>
@@ -3608,11 +3608,11 @@ examples:
           }
       }
     after: |
-      import java.util.Objects;
+      import static java.util.Objects.requireNonNull;
 
       class A {
           Object foo(Object obj) {
-              return Objects.requireNonNull(obj);
+              return requireNonNull(obj);
           }
       }
     language: java
diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaRefasterTest.java
@@ -46,11 +46,11 @@ Object foo(Object obj) {
               }
               """,
             """
-              import java.util.Objects;
+              import static java.util.Objects.requireNonNull;
 
               class A {
                   Object foo(Object obj) {
-                      return Objects.requireNonNull(obj);
+                      return requireNonNull(obj);
                   }
               }
               """
@@ -73,11 +73,11 @@ String foo(String str) {
               }
               """,
             """
-              import java.util.Objects;
+              import static java.util.Objects.requireNonNull;
 
               class A {
                   String foo(String str) {
-                      return Objects.requireNonNull(str);
+                      return requireNonNull(str);
                   }
               }
               """
@@ -100,11 +100,11 @@ Object foo(Object obj) {
               }
               """,
             """
-              import java.util.Objects;
+              import static java.util.Objects.requireNonNull;
 
               class A {
                   Object foo(Object obj) {
-                      return Objects.requireNonNull(obj, "foo");
+                      return requireNonNull(obj, "foo");
                   }
               }
               """
@@ -127,11 +127,11 @@ Object foo(Object obj, StringBuilder description) {
               }
               """,
             """
-              import java.util.Objects;
+              import static java.util.Objects.requireNonNull;
 
               class A {
                   Object foo(Object obj, StringBuilder description) {
-                      return Objects.requireNonNull(obj, String.valueOf(description));
+                      return requireNonNull(obj, String.valueOf(description));
                   }
               }
               """
@@ -154,11 +154,11 @@ Object foo(Object obj) {
               }
               """,
             """
-              import java.util.Objects;
+              import static java.util.Objects.requireNonNull;
 
               class A {
                   Object foo(Object obj) {
-                      return Objects.requireNonNull(obj);
+                      return requireNonNull(obj);
                   }
               }
               """

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,10 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.openrewrite.java.migrate.guava;`
`17`	`17`
	`18`	`+import com.google.errorprone.refaster.ImportPolicy;`
`18`	`19`	`import com.google.errorprone.refaster.annotation.AfterTemplate;`
`19`	`20`	`import com.google.errorprone.refaster.annotation.BeforeTemplate;`
	`21`	`+import com.google.errorprone.refaster.annotation.UseImportPolicy;`
`20`	`22`	`import org.openrewrite.java.template.RecipeDescriptor;`
`21`	`23`
`22`	`24`	`@RecipeDescriptor(`
`@@ -36,6 +38,7 @@ Object before(Object object) {`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`@AfterTemplate`
	`41`	`+ @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)`
`39`	`42`	`Object after(Object object) {`
`40`	`43`	`return java.util.Objects.requireNonNull(object);`
`41`	`44`	`}`
`@@ -53,6 +56,7 @@ Object before(Object object, String message) {`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`@AfterTemplate`
	`59`	`+ @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)`
`56`	`60`	`Object after(Object object, String message) {`
`57`	`61`	`return java.util.Objects.requireNonNull(object, message);`
`58`	`62`	`}`
`@@ -69,6 +73,7 @@ Object before(Object object, Object message) {`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`@AfterTemplate`
	`76`	`+ @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)`
`72`	`77`	`Object after(Object object, Object message) {`
`73`	`78`	`return java.util.Objects.requireNonNull(object, String.valueOf(message));`
`74`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ Object foo(Object obj) {`
`46`	`46`	`}`
`47`	`47`	`""",`
`48`	`48`	`"""`
`49`		`- import java.util.Objects;`
	`49`	`+ import static java.util.Objects.requireNonNull;`
`50`	`50`
`51`	`51`	`class A {`
`52`	`52`	`Object foo(Object obj) {`
`53`		`- return Objects.requireNonNull(obj);`
	`53`	`+ return requireNonNull(obj);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`"""`
`@@ -73,11 +73,11 @@ String foo(String str) {`
`73`	`73`	`}`
`74`	`74`	`""",`
`75`	`75`	`"""`
`76`		`- import java.util.Objects;`
	`76`	`+ import static java.util.Objects.requireNonNull;`
`77`	`77`
`78`	`78`	`class A {`
`79`	`79`	`String foo(String str) {`
`80`		`- return Objects.requireNonNull(str);`
	`80`	`+ return requireNonNull(str);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`"""`
`@@ -100,11 +100,11 @@ Object foo(Object obj) {`
`100`	`100`	`}`
`101`	`101`	`""",`
`102`	`102`	`"""`
`103`		`- import java.util.Objects;`
	`103`	`+ import static java.util.Objects.requireNonNull;`
`104`	`104`
`105`	`105`	`class A {`
`106`	`106`	`Object foo(Object obj) {`
`107`		`- return Objects.requireNonNull(obj, "foo");`
	`107`	`+ return requireNonNull(obj, "foo");`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`"""`
`@@ -127,11 +127,11 @@ Object foo(Object obj, StringBuilder description) {`
`127`	`127`	`}`
`128`	`128`	`""",`
`129`	`129`	`"""`
`130`		`- import java.util.Objects;`
	`130`	`+ import static java.util.Objects.requireNonNull;`
`131`	`131`
`132`	`132`	`class A {`
`133`	`133`	`Object foo(Object obj, StringBuilder description) {`
`134`		`- return Objects.requireNonNull(obj, String.valueOf(description));`
	`134`	`+ return requireNonNull(obj, String.valueOf(description));`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`"""`
`@@ -154,11 +154,11 @@ Object foo(Object obj) {`
`154`	`154`	`}`
`155`	`155`	`""",`
`156`	`156`	`"""`
`157`		`- import java.util.Objects;`
	`157`	`+ import static java.util.Objects.requireNonNull;`
`158`	`158`
`159`	`159`	`class A {`
`160`	`160`	`Object foo(Object obj) {`
`161`		`- return Objects.requireNonNull(obj);`
	`161`	`+ return requireNonNull(obj);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`"""`