Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add StreamFlatMapOptional error-prone check #2946

Merged
merged 4 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* (c) Copyright 2024 Palantir Technologies Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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 com.palantir.baseline.errorprone;

import com.google.auto.service.AutoService;
import com.google.errorprone.BugPattern;
import com.google.errorprone.VisitorState;
import com.google.errorprone.bugpatterns.BugChecker;
import com.google.errorprone.fixes.SuggestedFix;
import com.google.errorprone.matchers.Description;
import com.google.errorprone.matchers.Matcher;
import com.google.errorprone.matchers.method.MethodMatchers;
import com.google.errorprone.util.ASTHelpers;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.MethodInvocationTree;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Stream;

@AutoService(BugChecker.class)
@BugPattern(
link = "https://github.com/palantir/gradle-baseline#baseline-error-prone-checks",
linkType = BugPattern.LinkType.CUSTOM,
severity = BugPattern.SeverityLevel.WARNING,
summary = "`Stream.filter(Optional::isPresent).map(Optional::get)` is more efficient than "
+ "`Stream.flatMap(Optional::stream)`")
public final class StreamFlatMapOptional extends BugChecker implements BugChecker.MethodInvocationTreeMatcher {
private static final long serialVersionUID = 1L;

private static final Matcher<ExpressionTree> STREAM_FLAT_MAP = MethodMatchers.instanceMethod()
.onDescendantOf(Stream.class.getName())
.namedAnyOf("flatMap")
.withParameters(Function.class.getName());

private static final Matcher<ExpressionTree> OPTIONAL_STREAM = MethodMatchers.instanceMethod()
.onDescendantOf(Optional.class.getName())
.named("stream")
.withNoParameters();

@Override
public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
if (STREAM_FLAT_MAP.matches(tree, state)) {
ExpressionTree stream = ASTHelpers.getReceiver(tree);
if (stream != null) {
List<? extends ExpressionTree> arguments = tree.getArguments();
if (arguments != null && arguments.size() == 1) {
if (OPTIONAL_STREAM.matches(arguments.get(0), state)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error-prone provides a utility function which may be helpful here. Sometimes I opt not to use it in order to get access to parameters required to build the suggested fix, but I figured I'd call it out in case you find it helpful:

private static final Matcher<ExpressionTree> 
STREAM_FLATMAP_OPTIONAL_STREAM = Matchers.methodInvocation(
    STREAM_FLAT_MAP,
    // Any of the three MatchTypes are reasonable in this case, given a single arg
    MatchType.LAST,
    OPTIONAL_STREAM);

String replacement = state.getSourceForNode(ASTHelpers.getReceiver(tree.getMethodSelect()))
+ ".filter(Optional::isPresent).map(Optional::get)";
SuggestedFix fix = SuggestedFix.builder()
.addImport("java.util.Optional")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be a bit safer to use qualifyType for these, in case something like the old guava Optional type is also imported in the same class.

e.g.

qualifiedType = SuggestedFixes.qualifyType(state, fix, "com.google.common.collect.Lists");

This replaces addImport and potentially uses a fully qualified reference if another type with the same simple name is already imported.

.replace(tree, replacement)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case there are multiple Stream.flatMap(Optional::stream) occurrences in a single call chain, it may be helpful to make a more specific replacement, allowing a single round of applying the fixes to produce a passing build.

Instead of replacing the full tree, we can do something along these lines:

.replace(
    state.getEndPosition(ASTHelpers.getReceiver(tree.getMethodSelect())),
    state.getEndPosition(tree),
    ".filter(Optional::isPresent).map(Optional::get)")

I imagine a test could produce this case using something along these lines:

Stream<String> f(Stream<Optional<Optional<String>>> in) {
    return in.flatMap(Optional::stream).flatMap(Optional::stream);
}

.build();
return buildDescription(tree).addFix(fix).build();
}
}
}
}
return Description.NO_MATCH;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* (c) Copyright 2024 Palantir Technologies Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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 com.palantir.baseline.errorprone;

import org.junit.jupiter.api.Test;

class StreamFlatmapOptionalTest {
@Test
public void test() {
fix().addInputLines(
"Test.java",
"import java.util.Collection;",
"import java.util.List;",
"import java.util.Optional;",
"import java.util.stream.Collectors;",
"public class Test {",
" List<String> f1(List<List<Optional<String>>> in) {",
" return in.stream().flatMap(Collection::stream)"
+ ".flatMap(Optional::stream).collect(Collectors.toList());",
" }",
" List<String> f2(List<List<Optional<String>>> in) {",
" return in.stream().flatMap(list -> list.stream().flatMap(Optional::stream))"
+ ".collect(Collectors.toList());",
" }",
"}")
.addOutputLines(
"Test.java",
"import java.util.Collection;",
"import java.util.List;",
"import java.util.Optional;",
"import java.util.stream.Collectors;",
"public class Test {",
" List<String> f1(List<List<Optional<String>>> in) {",
" return in.stream().flatMap(Collection::stream)"
+ ".filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList());",
" }",
" List<String> f2(List<List<Optional<String>>> in) {",
" return in.stream().flatMap(list -> list.stream()"
+ ".filter(Optional::isPresent).map(Optional::get)).collect(Collectors.toList());",
" }",
"}")
.doTest();
}

private RefactoringValidator fix() {
return RefactoringValidator.of(StreamFlatMapOptional.class, getClass());
}
}
8 changes: 8 additions & 0 deletions changelog/@unreleased/pr-2946.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
type: improvement
improvement:
description: |-
If one has a `Stream<Optional<T>> stream` of size `N` and does `stream.flatMap(Optional::stream)`, you’ll end up allocating `N` extra streams — one for each `Optional` input element. When `N` is large, those allocations can cause extra GC cycles and pauses if allocation rate is high enough leading to issues with latency, throughput, and allocation sensitive code paths.

`Stream.filter(Optional::isPresent).map(Optional::get)` is more efficient than `Stream.flatMap(Optional::stream)` as it does not allocate a new `Stream` for every element in the stream.
links:
- https://github.com/palantir/gradle-baseline/pull/2946
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public class BaselineErrorProneExtension {
"Slf4jLogsafeArgs",
"Slf4jThrowable",
"StreamOfEmpty",
"StreamFlatMapOptional",
"StrictUnusedVariable",
"StringBuilderConstantParameters",
"ThrowError",
Expand Down