Correctly propagate safety information for Multimap collectors (#2891)

palantir · Sep 27, 2024 · 2d3f434 · 2d3f434
1 parent cf48eef
commit 2d3f434
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/...rone/src/main/java/com/palantir/baseline/errorprone/safety/SafetyPropagationTransfer.java b/...rone/src/main/java/com/palantir/baseline/errorprone/safety/SafetyPropagationTransfer.java
@@ -406,6 +406,12 @@ public final class SafetyPropagationTransfer implements ForwardTransferFunction<
                     .onClass(Collectors.class.getName())
                     .namedAnyOf("toMap", "toUnmodifiableMap", "toConcurrentMap"),
             MethodMatchers.staticMethod().onClass(ImmutableMap.class.getName()).named("toImmutableMap"),
+            MethodMatchers.staticMethod()
+                    .onClass(ImmutableListMultimap.class.getName())
+                    .namedAnyOf("toImmutableListMultimap", "flatteningToImmutableListMultimap"),
+            MethodMatchers.staticMethod()
+                    .onClass(ImmutableSetMultimap.class.getName())
+                    .namedAnyOf("toImmutableSetMultimap", "flatteningToImmutableSetMultimap"),
             MethodMatchers.staticMethod()
                     .onClass(ImmutableBiMap.class.getName())
                     .named("toImmutableBiMap"));

diff --git a/...-prone/src/test/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgumentTest.java b/...-prone/src/test/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgumentTest.java
@@ -1753,6 +1753,14 @@ public void testTransformingStreamCollectors() {
                         "    fun(stream.collect(Collectors.toConcurrentMap(TopLevel::name, TopLevel::value)));",
                         "    fun(stream.collect(Collectors.toUnmodifiableMap(TopLevel::name, TopLevel::value)));",
                         "    fun(stream.collect(ImmutableMap.toImmutableMap(TopLevel::name, TopLevel::value)));",
+                        "    fun(stream.collect(ImmutableListMultimap.toImmutableListMultimap(TopLevel::name,"
+                                + " TopLevel::value)));",
+                        "    fun(stream.collect(ImmutableListMultimap.flatteningToImmutableListMultimap(TopLevel::name,"
+                                + " v -> Stream.of(v.value()))));",
+                        "    fun(stream.collect(ImmutableSetMultimap.toImmutableSetMultimap(TopLevel::name,"
+                                + " TopLevel::value)));",
+                        "    fun(stream.collect(ImmutableSetMultimap.flatteningToImmutableSetMultimap(TopLevel::name,"
+                                + " v -> Stream.of(v.value()))));",
                         "    fun(stream.collect(ImmutableBiMap.toImmutableBiMap(TopLevel::name, TopLevel::value)));",
                         "  }",
                         "  private static void fun(@Safe Object value) {}",

diff --git a/changelog/@unreleased/pr-2891.v2.yml b/changelog/@unreleased/pr-2891.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Eliminate false positives produces by `IllegalSafeLoggingArgument`
+    when using `Multimap` collectors.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2891