Update inline Guava recipes for Guava 33.7.0

build.gradle.kts

@@ -14,7 +14,7 @@ recipeDependencies {
     parserClasspath("javax.persistence:javax.persistence-api:2.2")
     parserClasspath("org.glassfish:javax.servlet:3.0")
     parserClasspath("javax.annotation:javax.annotation-api:1.3.2")
-    parserClasspath("com.google.guava:guava:33.5.0-jre")
+    parserClasspath("com.google.guava:guava:33.7.0-jre")
     parserClasspath("com.google.errorprone:error_prone_core:2.+")
 
     testParserClasspath("com.sun.faces:jsf-api:2.1.29-11")

src/main/resources/META-INF/rewrite/examples.yml

@@ -4006,27 +4006,6 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
-recipeName: org.openrewrite.java.migrate.guava.NoGuavaAtomicsNewReference
-examples:
-- description: '`NoGuavaAtomicsNewReferenceTest#noNewReference`'
-  sources:
-  - before: |
-      import com.google.common.util.concurrent.Atomics;
-
-      class Test {
-          Object o1 = Atomics.newReference();
-          Object o2 = Atomics.newReference(0);
-      }
-    after: |
-      import java.util.concurrent.atomic.AtomicReference;
-
-      class Test {
-          Object o1 = new AtomicReference<>();
-          Object o2 = new AtomicReference<>(0);
-      }
-    language: java
----
-type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.migrate.guava.NoGuavaCollections2Transform
 examples:
 - description: '`NoGuavaCollections2TransformTest#replaceCollections2Transform`'

src/main/resources/META-INF/rewrite/inline-guava-33-methods.yml

@@ -15,7 +15,8 @@
 #
 
 #
-# Recipes generated for `@InlineMe` annotated methods in `com.google.guava:guava:33.5.0-jre`
+# Recipes generated for `@InlineMe` annotated methods in `com.google.guava:guava:33.7.0-jre`
+# by `InlineMethodCallsRecipeGenerator` in https://github.com/openrewrite/rewrite-third-party
 #
 
 type: specs.openrewrite.org/v1beta/recipe
@@ -105,12 +106,12 @@ recipeList:
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.collect.Range apply(java.lang.Comparable)'
+      methodPattern: 'com.google.common.collect.Range apply(*)'
       replacement: 'this.contains(input)'
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.collect.Range test(java.lang.Comparable)'
+      methodPattern: 'com.google.common.collect.Range test(*)'
       replacement: 'this.contains(input)'
       classpathFromResources:
         - 'guava-33'
@@ -172,7 +173,7 @@ recipeList:
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.collect.Ordering binarySearch(java.util.List, java.lang.Object)'
+      methodPattern: 'com.google.common.collect.Ordering binarySearch(java.util.List, *)'
       replacement: 'Collections.binarySearch(sortedList, key, this)'
       imports:
         - 'java.util.Collections'
@@ -205,7 +206,7 @@ recipeList:
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.base.Equivalence test(java.lang.Object, java.lang.Object)'
+      methodPattern: 'com.google.common.base.Equivalence test(*, *)'
       replacement: 'this.equivalent(t, u)'
       classpathFromResources:
         - 'guava-33'
@@ -229,12 +230,12 @@ recipeList:
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.hash.BloomFilter apply(java.lang.Object)'
+      methodPattern: 'com.google.common.hash.BloomFilter apply(*)'
       replacement: 'this.mightContain(input)'
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.hash.BloomFilter test(java.lang.Object)'
+      methodPattern: 'com.google.common.hash.BloomFilter test(*)'
       replacement: 'this.mightContain(input)'
       classpathFromResources:
         - 'guava-33'
@@ -318,7 +319,7 @@ recipeList:
       classpathFromResources:
         - 'guava-33'
   - org.openrewrite.java.InlineMethodCalls:
-      methodPattern: 'com.google.common.base.Converter apply(java.lang.Object)'
+      methodPattern: 'com.google.common.base.Converter apply(*)'
       replacement: 'this.convert(a)'
       classpathFromResources:
         - 'guava-33'
@@ -403,3 +404,31 @@ recipeList:
       replacement: 'Math.multiplyExact(a, b)'
       classpathFromResources:
         - 'guava-33'
+  - org.openrewrite.java.InlineMethodCalls:
+      methodPattern: 'com.google.common.util.concurrent.Atomics newReference()'
+      replacement: 'new AtomicReference<>()'
+      imports:
+        - 'java.util.concurrent.atomic.AtomicReference'
+      classpathFromResources:
+        - 'guava-33'
+  - org.openrewrite.java.InlineMethodCalls:
+      methodPattern: 'com.google.common.util.concurrent.Atomics newReference(*)'
+      replacement: 'new AtomicReference<>(initialValue)'
+      imports:
+        - 'java.util.concurrent.atomic.AtomicReference'
+      classpathFromResources:
+        - 'guava-33'
+  - org.openrewrite.java.InlineMethodCalls:
+      methodPattern: 'com.google.common.util.concurrent.Atomics newReferenceArray(int)'
+      replacement: 'new AtomicReferenceArray<>(length)'
+      imports:
+        - 'java.util.concurrent.atomic.AtomicReferenceArray'
+      classpathFromResources:
+        - 'guava-33'
+  - org.openrewrite.java.InlineMethodCalls:
+      methodPattern: 'com.google.common.util.concurrent.Atomics newReferenceArray(*[])'
+      replacement: 'new AtomicReferenceArray<>(array)'
+      imports:
+        - 'java.util.concurrent.atomic.AtomicReferenceArray'
+      classpathFromResources:
+        - 'guava-33'

src/main/resources/META-INF/rewrite/no-guava.yml

@@ -77,7 +77,6 @@ recipeList:
   - org.openrewrite.java.migrate.guava.PreferMathAddExact
   - org.openrewrite.java.migrate.guava.PreferMathSubtractExact
   - org.openrewrite.java.migrate.guava.PreferMathMultiplyExact
-  - org.openrewrite.java.migrate.guava.NoGuavaAtomicsNewReference
 
   - tech.picnic.errorprone.refasterrules.InputStreamRulesRecipes