Update the StringFormatted single source applicability test to use Applicability#and, also update the StringFormattedTest to use the new Assertions#version(SourceSpecs, int).

Author: pway99

src/main/java/org/openrewrite/java/migrate/lang/StringFormatted.java

@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java.migrate.lang;
 
+import org.openrewrite.Applicability;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
@@ -24,7 +25,6 @@
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaSourceFile;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -46,16 +46,7 @@ public String getDescription() {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
-        return new JavaIsoVisitor<ExecutionContext>() {
-            @Override
-            public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, ExecutionContext executionContext) {
-                JavaSourceFile sf = (JavaSourceFile) new UsesJavaVersion<ExecutionContext>(17).visit(cu, executionContext);
-                if (sf != cu) {
-                    doAfterVisit(new UsesMethod<>(STRING_FORMAT));
-                }
-                return cu;
-            }
-        };
+        return Applicability.and(new UsesJavaVersion<>(17),new UsesMethod<>(STRING_FORMAT));
     }
 
     @Override

src/test/kotlin/org/openrewrite/java/migrate/lang/StringFormattedTest.kt

@@ -21,7 +21,6 @@ import org.openrewrite.java.Assertions.*
 import org.openrewrite.java.JavaParser
 import org.openrewrite.test.RecipeSpec
 import org.openrewrite.test.RewriteTest
-import org.openrewrite.test.SourceSpec
 import org.openrewrite.test.TypeValidation
 
 @Suppress("RedundantStringFormatCall")
@@ -45,7 +44,7 @@ class StringFormattedTest : RewriteTest {
                         class A {
                             String str = "foo".formatted();
                         }
-                    """) as SourceSpec<*>,
+                    """),
             17)
     )
 
@@ -62,7 +61,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s".formatted("a");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -79,7 +78,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s %d".formatted("a", 1);
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -96,7 +95,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s %d %f".formatted("a", 1, 2.0);
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -113,7 +112,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = ("foo " + "%s").formatted("a");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -130,7 +129,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s".formatted("a" + "b");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -153,7 +152,7 @@ class StringFormattedTest : RewriteTest {
                         return "foo %s";
                     }
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -176,7 +175,7 @@ class StringFormattedTest : RewriteTest {
                         String str = fmt.formatted("a");
                     }
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -195,7 +194,7 @@ class StringFormattedTest : RewriteTest {
                     static final String fmt = "foo %s";
                     String str = fmt.formatted("a");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -213,7 +212,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s".formatted("a");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -226,7 +225,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = String.format(Locale.US, "foo %s", "a");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -243,7 +242,7 @@ class StringFormattedTest : RewriteTest {
                 class A {
                     String str = "foo %s %s".formatted("a", "b");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )
 
@@ -264,8 +263,7 @@ class StringFormattedTest : RewriteTest {
                             "a",
                             "b");
                 }
-            """) as SourceSpec<*>, 17
-        )
+            """), 17)
     )
 
     @Test
@@ -287,7 +285,7 @@ class StringFormattedTest : RewriteTest {
                             // B
                             "b");
                 }
-            """) as SourceSpec<*>, 17
+            """), 17
         )
     )