From 1a41a7f37dd4a73596bb41e03aab7bdb6998b00d Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut@moderne.io>
Date: Thu, 11 Jan 2024 21:14:47 +0100
Subject: [PATCH] Added `PreferLongCompareUnsigned` to `NoGuava`

---
 .../java/migrate/guava/PreferJavaStringJoinVisitor.java    | 7 +++----
 src/main/resources/META-INF/rewrite/no-guava.yml           | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
index 422aa7d627..fc07f417e1 100644
--- a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
+++ b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoinVisitor.java
@@ -33,7 +33,7 @@
 
 class PreferJavaStringJoinVisitor extends JavaIsoVisitor<ExecutionContext> {
     private static final MethodMatcher ON_METHOD_MATCHER =
-        new MethodMatcher("com.google.common.base.Joiner on(String)");
+            new MethodMatcher("com.google.common.base.Joiner on(String)");
 
     @Override
     public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
@@ -61,13 +61,12 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
             maybeRemoveImport("com.google.common.base.Joiner");
 
-            J.MethodInvocation x = JavaTemplate.apply(
+            return JavaTemplate.<J.MethodInvocation>apply(
                     "String.join(#{any(java.lang.CharSequence)}",
                     getCursor(),
                     mi.getCoordinates().replace(),
                     select.getArguments().get(0)
-            );
-            return x.withArguments(newArgs);
+            ).withArguments(newArgs);
         }
         return mi;
     }
diff --git a/src/main/resources/META-INF/rewrite/no-guava.yml b/src/main/resources/META-INF/rewrite/no-guava.yml
index b5a40e7ac6..ee04c543bb 100644
--- a/src/main/resources/META-INF/rewrite/no-guava.yml
+++ b/src/main/resources/META-INF/rewrite/no-guava.yml
@@ -49,6 +49,7 @@ recipeList:
   - org.openrewrite.java.migrate.guava.PreferIntegerCompareUnsigned
   - org.openrewrite.java.migrate.guava.PreferIntegerDivideUnsigned
   - org.openrewrite.java.migrate.guava.PreferIntegerParseUnsignedInt
+  - org.openrewrite.java.migrate.guava.PreferJavaStringJoinVisitor
   - org.openrewrite.java.migrate.guava.PreferLongCompareUnsigned
   - org.openrewrite.java.migrate.guava.PreferLongDivideUnsigned
   - org.openrewrite.java.migrate.guava.PreferLongParseUnsignedLong