From 56a67de44f4c259580086bc713292c5dcf8bb7c1 Mon Sep 17 00:00:00 2001 From: Laurent Redor Date: Fri, 24 Oct 2025 17:18:09 +0200 Subject: [PATCH 1/7] Convert Guava `Sets.filter` --- .../java/migrate/guava/NoGuavaSetsFilter.java | 78 +++++++++++++++++++ .../resources/META-INF/rewrite/no-guava.yml | 1 + .../migrate/guava/NoGuavaSetsFilterTest.java | 77 ++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java create mode 100644 src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java new file mode 100644 index 0000000000..070a6968b5 --- /dev/null +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java @@ -0,0 +1,78 @@ +/* + * Copyright 2024 the original author or authors. + *

+ * Licensed under the Moderne Source Available License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://docs.moderne.io/licensing/moderne-source-available-license + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.openrewrite.java.migrate.guava; + +import org.openrewrite.ExecutionContext; +import org.openrewrite.Preconditions; +import org.openrewrite.Recipe; +import org.openrewrite.TreeVisitor; +import org.openrewrite.java.JavaIsoVisitor; +import org.openrewrite.java.JavaTemplate; +import org.openrewrite.java.JavaVisitor; +import org.openrewrite.java.MethodMatcher; +import org.openrewrite.java.search.UsesMethod; +import org.openrewrite.java.tree.J; +import org.openrewrite.java.tree.TypeUtils; + +import java.util.Set; + +import static java.util.Collections.singleton; + +public class NoGuavaSetsFilter extends Recipe { + private static final MethodMatcher SETS_FILTER = new MethodMatcher("com.google.common.collect.Sets filter(java.util.Set, com.google.common.base.Predicate)"); + + @Override + public String getDisplayName() { + return "Prefer `Collection.stream().filter(Predicate)`"; + } + + @Override + public String getDescription() { + return "Prefer `Collection.stream().filter(Predicate)` over `Sets.filter(Set, Predicate)`."; + } + + @Override + public Set getTags() { + return singleton("guava"); + } + + @Override + public TreeVisitor getVisitor() { + return Preconditions.check( + new UsesMethod<>("com.google.common.collect.Sets filter(java.util.Set, com.google.common.base.Predicate)"), + new JavaIsoVisitor() { + @Override + public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { + if (SETS_FILTER.matches(method)) { + maybeRemoveImport("com.google.common.base.Predicate"); + maybeRemoveImport("com.google.common.collect.Sets"); + maybeAddImport("java.util.function.Predicate"); + maybeAddImport("java.util.stream.Collectors"); + + return JavaTemplate.builder("#{any(java.util.Collection)}.stream().filter(#{any(java.util.function.Predicate)}).collect(Collectors.toSet())") + .imports("java.util.stream.Collectors") + .build() + .apply(getCursor(), + method.getCoordinates().replace(), + method.getArguments().get(0), + method.getArguments().get(1)); + } + return super.visitMethodInvocation(method, ctx); + } + } + ); + } +} diff --git a/src/main/resources/META-INF/rewrite/no-guava.yml b/src/main/resources/META-INF/rewrite/no-guava.yml index 3b01ea22e2..ab7879a5ea 100644 --- a/src/main/resources/META-INF/rewrite/no-guava.yml +++ b/src/main/resources/META-INF/rewrite/no-guava.yml @@ -38,6 +38,7 @@ recipeList: - org.openrewrite.java.migrate.guava.NoGuavaPrimitiveAsList - org.openrewrite.java.migrate.guava.NoGuavaRefasterRecipes - org.openrewrite.java.migrate.guava.NoGuavaMapsNewHashMap + - org.openrewrite.java.migrate.guava.NoGuavaSetsFilter - org.openrewrite.java.migrate.guava.NoGuavaSetsNewHashSet - org.openrewrite.java.migrate.guava.NoGuavaSetsNewConcurrentHashSet - org.openrewrite.java.migrate.guava.NoGuavaSetsNewLinkedHashSet diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java new file mode 100644 index 0000000000..108533b19d --- /dev/null +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java @@ -0,0 +1,77 @@ +/* + * Copyright 2024 the original author or authors. + *

+ * Licensed under the Moderne Source Available License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://docs.moderne.io/licensing/moderne-source-available-license + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.openrewrite.java.migrate.guava; + +import org.junit.jupiter.api.Test; +import org.openrewrite.DocumentExample; +import org.openrewrite.InMemoryExecutionContext; +import org.openrewrite.java.JavaParser; +import org.openrewrite.test.RecipeSpec; +import org.openrewrite.test.RewriteTest; + +import static org.openrewrite.java.Assertions.java; + +class NoGuavaSetsFilterTest implements RewriteTest { + + @Override + public void defaults(RecipeSpec spec) { + spec + .recipe(new NoGuavaSetsFilter()) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "guava")); + } + + @DocumentExample + @Test + void replaceSetsFilter() { + //language=java + rewriteRun( + java( + """ + import java.util.HashSet; + import java.util.Objects; + import java.util.Set; + + import com.google.common.base.Predicate; + import com.google.common.collect.Sets; + + class Test { + public static Set test() { + Set set = new HashSet<>(); + Predicate isNotNull = Objects::nonNull; + return Sets.filter(set, isNotNull); + } + } + """, + """ + import java.util.HashSet; + import java.util.Objects; + import java.util.Set; + import java.util.stream.Collectors; + + import com.google.common.base.Predicate; + + class Test { + public static Set test() { + Set set = new HashSet<>(); + Predicate isNotNull = Objects::nonNull; + return set.stream().filter(isNotNull).collect(Collectors.toSet()); + } + } + """ + ) + ); + } +} From 0aad42484600c61f72acdc009f46fb4d72c02d37 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 24 Oct 2025 18:30:39 +0200 Subject: [PATCH 2/7] Minimize irrelevant parts in test method setup --- .../java/migrate/guava/NoGuavaSetsFilter.java | 2 +- .../java/migrate/guava/NoGuavaSetsFilterTest.java | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java index 070a6968b5..2fe8c8fe11 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 the original author or authors. + * Copyright 2025 the original author or authors. *

* Licensed under the Moderne Source Available License (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java index 108533b19d..30f3d0a6d8 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 the original author or authors. + * Copyright 2025 the original author or authors. *

* Licensed under the Moderne Source Available License (the "License"); * you may not use this file except in compliance with the License. @@ -40,33 +40,25 @@ void replaceSetsFilter() { rewriteRun( java( """ - import java.util.HashSet; - import java.util.Objects; import java.util.Set; import com.google.common.base.Predicate; import com.google.common.collect.Sets; class Test { - public static Set test() { - Set set = new HashSet<>(); - Predicate isNotNull = Objects::nonNull; + public static Set test(Set set, Predicate isNotNull) { return Sets.filter(set, isNotNull); } } """, """ - import java.util.HashSet; - import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import com.google.common.base.Predicate; class Test { - public static Set test() { - Set set = new HashSet<>(); - Predicate isNotNull = Objects::nonNull; + public static Set test(Set set, Predicate isNotNull) { return set.stream().filter(isNotNull).collect(Collectors.toSet()); } } From d54bc22af3ee2882d42884e82fd8070495a2cfb6 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 24 Oct 2025 18:31:06 +0200 Subject: [PATCH 3/7] Remove unused imports --- .../org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java index 2fe8c8fe11..4593c003fa 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java @@ -21,11 +21,9 @@ import org.openrewrite.TreeVisitor; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.JavaTemplate; -import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import org.openrewrite.java.tree.TypeUtils; import java.util.Set; From 4e550736c97464f5966922f1847317a0c99bd19e Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 24 Oct 2025 18:41:40 +0200 Subject: [PATCH 4/7] Reuse method matcher --- .../org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java index 4593c003fa..130b59b260 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java @@ -50,7 +50,7 @@ public Set getTags() { @Override public TreeVisitor getVisitor() { return Preconditions.check( - new UsesMethod<>("com.google.common.collect.Sets filter(java.util.Set, com.google.common.base.Predicate)"), + new UsesMethod<>(SETS_FILTER), new JavaIsoVisitor() { @Override public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { From 0d4df6fd7249a845f58bad3154ada6d85f69aff0 Mon Sep 17 00:00:00 2001 From: Laurent Redor Date: Fri, 24 Oct 2025 19:54:06 +0200 Subject: [PATCH 5/7] Add a specific case for SortedSet to preserve existing behavior --- .../java/migrate/guava/NoGuavaSetsFilter.java | 57 ++++++++++++------- .../migrate/guava/NoGuavaSetsFilterTest.java | 36 ++++++++++++ 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java index 130b59b260..6343d0d6d2 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilter.java @@ -19,8 +19,8 @@ import org.openrewrite.Preconditions; import org.openrewrite.Recipe; import org.openrewrite.TreeVisitor; -import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.JavaTemplate; +import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; @@ -31,6 +31,7 @@ public class NoGuavaSetsFilter extends Recipe { private static final MethodMatcher SETS_FILTER = new MethodMatcher("com.google.common.collect.Sets filter(java.util.Set, com.google.common.base.Predicate)"); + private static final MethodMatcher SETS_FILTER_SORTED_SET = new MethodMatcher("com.google.common.collect.Sets filter(java.util.SortedSet, com.google.common.base.Predicate)"); @Override public String getDisplayName() { @@ -49,28 +50,44 @@ public Set getTags() { @Override public TreeVisitor getVisitor() { - return Preconditions.check( - new UsesMethod<>(SETS_FILTER), - new JavaIsoVisitor() { - @Override - public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { - if (SETS_FILTER.matches(method)) { - maybeRemoveImport("com.google.common.base.Predicate"); - maybeRemoveImport("com.google.common.collect.Sets"); - maybeAddImport("java.util.function.Predicate"); - maybeAddImport("java.util.stream.Collectors"); + TreeVisitor precondition = Preconditions.or(new UsesMethod<>(SETS_FILTER), new UsesMethod<>(SETS_FILTER_SORTED_SET)); + return Preconditions.check(precondition, new JavaVisitor() { + @Override + public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { + if (SETS_FILTER_SORTED_SET.matches(method)) { + maybeRemoveImport("com.google.common.base.Predicate"); + maybeRemoveImport("com.google.common.collect.Sets"); + maybeAddImport("java.util.TreeSet"); + maybeAddImport("java.util.function.Predicate"); + maybeAddImport("java.util.stream.Collectors"); - return JavaTemplate.builder("#{any(java.util.Collection)}.stream().filter(#{any(java.util.function.Predicate)}).collect(Collectors.toSet())") - .imports("java.util.stream.Collectors") - .build() - .apply(getCursor(), - method.getCoordinates().replace(), - method.getArguments().get(0), - method.getArguments().get(1)); - } - return super.visitMethodInvocation(method, ctx); + return JavaTemplate.builder("#{any(java.util.Collection)}.stream().filter(#{any(java.util.function.Predicate)}).collect(Collectors.toCollection(TreeSet::new))") + .imports("java.util.TreeSet") + .imports("java.util.stream.Collectors") + .build() + .apply(getCursor(), + method.getCoordinates().replace(), + method.getArguments().get(0), + method.getArguments().get(1)); } + if (SETS_FILTER.matches(method)) { + maybeRemoveImport("com.google.common.base.Predicate"); + maybeRemoveImport("com.google.common.collect.Sets"); + maybeAddImport("java.util.TreeSet"); + maybeAddImport("java.util.function.Predicate"); + maybeAddImport("java.util.stream.Collectors"); + + return JavaTemplate.builder("#{any(java.util.Collection)}.stream().filter(#{any(java.util.function.Predicate)}).collect(Collectors.toSet())") + .imports("java.util.stream.Collectors") + .build() + .apply(getCursor(), + method.getCoordinates().replace(), + method.getArguments().get(0), + method.getArguments().get(1)); + } + return super.visitMethodInvocation(method, ctx); } + } ); } } diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java index 30f3d0a6d8..4608ee83df 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java @@ -66,4 +66,40 @@ public static Set test(Set set, Predicate isNotNull) { ) ); } + + @Test + void replaceSetsFilterUsingSortedSet() { + //language=java + rewriteRun( + java( + """ + import java.util.Set; + import java.util.SortedSet; + + import com.google.common.base.Predicate; + import com.google.common.collect.Sets; + + class Test { + public static Set test(SortedSet set, Predicate isNotNull) { + return Sets.filter(set, isNotNull); + } + } + """, + """ + import java.util.Set; + import java.util.SortedSet; + import java.util.TreeSet; + import java.util.stream.Collectors; + + import com.google.common.base.Predicate; + + class Test { + public static Set test(SortedSet set, Predicate isNotNull) { + return set.stream().filter(isNotNull).collect(Collectors.toCollection(TreeSet::new)); + } + } + """ + ) + ); + } } From c90bfe6eeafc164916d783295f16c99aba929112 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 24 Oct 2025 21:05:12 +0200 Subject: [PATCH 6/7] Also retain behavior for indirect use of sorted set --- .../migrate/guava/NoGuavaSetsFilterTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java index 4608ee83df..de7abb5a54 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java @@ -102,4 +102,42 @@ public static Set test(SortedSet set, Predicate isNotNul ) ); } + + @Test + void replaceSetsFilterIndirectlyUsingSortedSet() { + //language=java + rewriteRun( + java( + """ + import java.util.Set; + import java.util.SortedSet; + + import com.google.common.base.Predicate; + import com.google.common.collect.Sets; + + class Test { + public static Set test(SortedSet set, Predicate isNotNull) { + Set indirectSet = set; + return Sets.filter(indirectSet, isNotNull); + } + } + """, + """ + import java.util.Set; + import java.util.SortedSet; + import java.util.TreeSet; + import java.util.stream.Collectors; + + import com.google.common.base.Predicate; + + class Test { + public static Set test(SortedSet set, Predicate isNotNull) { + Set indirectSet = set; + return indirectSet.stream().filter(isNotNull).collect(Collectors.toCollection(TreeSet::new)); + } + } + """ + ) + ); + } } From b2e62c85acc2a51804b216e0f813b12bf585ff46 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sun, 26 Oct 2025 12:10:13 +0100 Subject: [PATCH 7/7] Document an unhandled edge case --- .../migrate/guava/NoGuavaSetsFilterTest.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java index de7abb5a54..e19e8587dc 100644 --- a/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java +++ b/src/test/java/org/openrewrite/java/migrate/guava/NoGuavaSetsFilterTest.java @@ -16,6 +16,8 @@ package org.openrewrite.java.migrate.guava; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.ExpectedToFail; +import org.junitpioneer.jupiter.Issue; import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.java.JavaParser; @@ -103,6 +105,8 @@ public static Set test(SortedSet set, Predicate isNotNul ); } + @ExpectedToFail("Sets.filter has special handling for sorted sets which now gets lost") + @Issue("https://github.com/openrewrite/rewrite-migrate-java/pull/898#discussion_r2461706208") @Test void replaceSetsFilterIndirectlyUsingSortedSet() { //language=java @@ -121,22 +125,8 @@ public static Set test(SortedSet set, Predicate isNotNul return Sets.filter(indirectSet, isNotNull); } } - """, - """ - import java.util.Set; - import java.util.SortedSet; - import java.util.TreeSet; - import java.util.stream.Collectors; - - import com.google.common.base.Predicate; - - class Test { - public static Set test(SortedSet set, Predicate isNotNull) { - Set indirectSet = set; - return indirectSet.stream().filter(isNotNull).collect(Collectors.toCollection(TreeSet::new)); - } - } """ + // This now gets converted, but skips past a `instanceof SortedSet` check that keeps it a sorted set ) ); }