Create recipe for @InlineMe annotation replacements

[timtebeek]

Any additional context

• Support refactoring based on an annotation that provides the replacement template (e.g. @InlineMe) rewrite#5400

[timtebeek]

Replicated with

• MethodType parameter names not retained rewrite#5923

[timtebeek]

So as a proof of concept this now works; there's still possible improvements to be made:

• add / remove static imports as well
• apply this recipe with a Guava precondition to inline any methods as part of the NoGuava composite recipe
• add a precondition that we must be using a type that uses @InlineMe; likely requires a change in TypesInUse, with a trade off between performance here and storage needs in the LST, as annotations on types are quite common

[knutwannheden]

Nice! I am not sure if we can change the TypesInUse like that, but perhaps we also find a different solution. For now I think wrapping in a declarative recipe with a precondition is quite sufficient.

[timtebeek]

Confirmed by running at scale: These two methods are annotated with their replacements

1. https://github.com/google/s2-geometry-library-java/blob/57151fc0f7fe543b75e9f743bf897e81928d5c3f/library/src/com/google/common/geometry/S2EdgeUtil.java#L2925-L2931
2. https://github.com/google/s2-geometry-library-java/blob/57151fc0f7fe543b75e9f743bf897e81928d5c3f/library/src/com/google/common/geometry/S2Shape.java#L108-L112

Which we ran through the platform: https://app.moderne.io/results/v7n9xVESH
Which then resulted in the following patch file

diff --git a/library/src/com/google/common/geometry/S2ConvexHullQuery.java b/library/src/com/google/common/geometry/S2ConvexHullQuery.java
index d30e9b9..0683d66 100644
--- a/library/src/com/google/common/geometry/S2ConvexHullQuery.java
+++ b/library/src/com/google/common/geometry/S2ConvexHullQuery.java
@@ -268,7 +268,7 @@ org.openrewrite.java.migrate.guava.NoGuavaInlineMeMethods
     // Construct a loop consisting of the two vertices and their midpoint. We use
     // S2EdgeUtil.interpolate() to ensure that the midpoint is very close to the edge even when its
     // endpoints are nearly antipodal.
-    S2Loop loop = new S2Loop(ImmutableList.of(a, b, S2EdgeUtil.interpolate(0.5, a, b)));
+    S2Loop loop = new S2Loop(ImmutableList.of(a, b, S2EdgeUtil.interpolate(a, b, 0.5)));
     // The resulting loop may be clockwise, so invert it if necessary.
     loop.normalize();
     return loop;
diff --git a/library/src/com/google/common/geometry/S2ContainsPointQuery.java b/library/src/com/google/common/geometry/S2ContainsPointQuery.java
index 1eff5c9..a99bfb6 100644
--- a/library/src/com/google/common/geometry/S2ContainsPointQuery.java
+++ b/library/src/com/google/common/geometry/S2ContainsPointQuery.java
@@ -314,7 +314,7 @@ org.openrewrite.java.migrate.guava.NoGuavaInlineMeMethods
       for (int i = 0; i < numEdges; i++) {
         int edgeId = clipped.edge(i);
         shape.getEdge(edgeId, tmp);
-        if (tmp.isEndpoint(p) && !visitor.test(shapeId, edgeId, tmp.a, tmp.b)) {
+        if (tmp.hasEndpoint(p) && !visitor.test(shapeId, edgeId, tmp.a, tmp.b)) {
           return false;
         }
       }
diff --git a/library/src/com/google/common/geometry/S2EdgeTessellator.java b/library/src/com/google/common/geometry/S2EdgeTessellator.java
index 531b88d..d15cf22 100644
--- a/library/src/com/google/common/geometry/S2EdgeTessellator.java
+++ b/library/src/com/google/common/geometry/S2EdgeTessellator.java
@@ -280,8 +280,8 @@ org.openrewrite.java.migrate.guava.NoGuavaInlineMeMethods
 
     double t1 = INTERPOLATION_FRACTION;
     double t2 = 1 - INTERPOLATION_FRACTION;
-    S2Point mid1 = S2EdgeUtil.interpolate(t1, a, b);
-    S2Point mid2 = S2EdgeUtil.interpolate(t2, a, b);
+    S2Point mid1 = S2EdgeUtil.interpolate(a, b, t1);
+    S2Point mid2 = S2EdgeUtil.interpolate(a, b, t2);
     S2Point projectedMid1 = projection.unproject(Projection.interpolate(t1, pa, pb));
     S2Point projectedMid2 = projection.unproject(Projection.interpolate(t2, pa, pb));
     S1ChordAngle mid1Angle = new S1ChordAngle(mid1, projectedMid1);
diff --git a/tests/tests/com/google/common/geometry/S2PolylineTest.java b/tests/tests/com/google/common/geometry/S2PolylineTest.java
index d45801b..8c5a3bc 100644
--- a/tests/tests/com/google/common/geometry/S2PolylineTest.java
+++ b/tests/tests/com/google/common/geometry/S2PolylineTest.java
@@ -565,14 +565,14 @@ org.openrewrite.java.migrate.guava.NoGuavaInlineMeMethods
   @Test
   public void testNumEdges() {
     // Empty polyline has zero edges
-    assertEquals(0, makePolyline("").numEdges());
+    assertEquals(0, makePolyline("").shape().numEdges());
 
     // Single vertex polyline has one degenerate edge
-    assertEquals(1, makePolyline("0:0").numEdges());
+    assertEquals(1, makePolyline("0:0").shape().numEdges());
 
     // Multiple vertex polylines have non-zero edges
-    assertEquals(1, makePolyline("0:0, 1:1").numEdges());
-    assertEquals(2, makePolyline("0:0, 1:1, 2:2").numEdges());
+    assertEquals(1, makePolyline("0:0, 1:1").shape().numEdges());
+    assertEquals(2, makePolyline("0:0, 1:1, 2:2").shape().numEdges());
   }
 
   @Test

[timtebeek]

@mike-solomon could make for a nice addition to the docs as something we now support for folks looking to migrate internal methods more easily: add that annotation to your deprecated method, then run the recipe that switches over any usage, and finally remove the deprecated method.