-
Notifications
You must be signed in to change notification settings - Fork 134
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
[improvement] Ensure Optional#orElse argument is not method invocation #655
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7057c7e
Ensure Optional#orElse argument is compile-time constant, otherwise m…
gatesn a571b92
Ensure Optional#orElse argument is compile-time constant, otherwise m…
gatesn 6130ccf
Rename class
gatesn 63526e0
Rename class
gatesn 42c80f8
Update summary
gatesn 0f0a6f6
Use static matcher
gatesn b21ba5c
Reword descriptions
gatesn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
73 changes: 73 additions & 0 deletions
73
...-prone/src/main/java/com/palantir/baseline/errorprone/OptionalOrElseMethodInvocation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* (c) Copyright 2019 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.BugPattern.SeverityLevel; | ||
import com.google.errorprone.VisitorState; | ||
import com.google.errorprone.bugpatterns.BugChecker; | ||
import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher; | ||
import com.google.errorprone.fixes.SuggestedFix; | ||
import com.google.errorprone.matchers.Description; | ||
import com.google.errorprone.matchers.Matcher; | ||
import com.google.errorprone.matchers.Matchers; | ||
import com.google.errorprone.matchers.method.MethodMatchers; | ||
import com.sun.source.tree.ExpressionTree; | ||
import com.sun.source.tree.MethodInvocationTree; | ||
import com.sun.source.tree.Tree; | ||
|
||
@AutoService(BugChecker.class) | ||
@BugPattern( | ||
name = "OptionalOrElseMethodInvocation", | ||
link = "https://github.com/palantir/gradle-baseline#baseline-error-prone-checks", | ||
linkType = BugPattern.LinkType.CUSTOM, | ||
severity = SeverityLevel.ERROR, | ||
summary = "Expression passed to Optional#orElse invokes a method, use Optional#orElseGet instead") | ||
public final class OptionalOrElseMethodInvocation extends BugChecker implements MethodInvocationTreeMatcher { | ||
|
||
private static final long serialVersionUID = 1L; | ||
|
||
private static final Matcher<ExpressionTree> OR_ELSE_METHOD = MethodMatchers.instanceMethod() | ||
.onExactClass("java.util.Optional") | ||
.named("orElse"); | ||
|
||
private static final Matcher<Tree> METHOD_INVOCATIONS = | ||
Matchers.contains(ExpressionTree.class, MethodMatchers.anyMethod()); | ||
|
||
@Override | ||
public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) { | ||
if (!OR_ELSE_METHOD.matches(tree, state)) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
ExpressionTree orElseArg = tree.getArguments().get(0); | ||
|
||
if (!METHOD_INVOCATIONS.matches(orElseArg, state)) { | ||
return Description.NO_MATCH; | ||
} | ||
|
||
return buildDescription(tree) | ||
.setMessage("Expression passed to Optional#orElse invokes a method") | ||
.addFix(SuggestedFix.builder() | ||
.postfixWith(tree.getMethodSelect(), "Get") | ||
.prefixWith(orElseArg, "() -> ") | ||
.build()) | ||
.build(); | ||
} | ||
|
||
} |
98 changes: 98 additions & 0 deletions
98
...e/src/test/java/com/palantir/baseline/errorprone/OptionalOrElseMethodInvocationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/* | ||
* (c) Copyright 2019 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.errorprone.BugCheckerRefactoringTestHelper; | ||
import com.google.errorprone.CompilationTestHelper; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
public final class OptionalOrElseMethodInvocationTests { | ||
|
||
private CompilationTestHelper compilationHelper; | ||
private BugCheckerRefactoringTestHelper refactoringTestHelper; | ||
|
||
@Before | ||
public void before() { | ||
compilationHelper = CompilationTestHelper.newInstance(OptionalOrElseMethodInvocation.class, getClass()); | ||
refactoringTestHelper = BugCheckerRefactoringTestHelper.newInstance( | ||
new OptionalOrElseMethodInvocation(), getClass()); | ||
} | ||
|
||
private void test(String expr) { | ||
compilationHelper | ||
.addSourceLines( | ||
"Test.java", | ||
"import java.util.Optional;", | ||
"class Test {", | ||
" String f() { return \"hello\"; }", | ||
" String s = \"world\";", | ||
" // BUG: Diagnostic contains: invokes a method", | ||
" private final String string = Optional.of(\"hello\").orElse(" + expr + ");", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
@Test | ||
public void testNonCompileTimeConstantExpression() { | ||
test("f()"); | ||
test("s + s"); | ||
test("\"world\" + s"); | ||
test("\"world\".substring(1)"); | ||
} | ||
|
||
@Test | ||
public void testNonCompileTimeConstantExpression_replacement() { | ||
refactoringTestHelper | ||
.addInputLines( | ||
"Test.java", | ||
"import java.util.Optional;", | ||
"class Test {", | ||
" String f() { return \"hello\"; }", | ||
" private final String string = Optional.of(\"hello\").orElse(f());", | ||
"}") | ||
.addOutputLines( | ||
"Test.java", | ||
"import java.util.Optional;", | ||
"class Test {", | ||
" String f() { return \"hello\"; }", | ||
" private final String string = Optional.of(\"hello\").orElseGet(() -> f());", | ||
"}") | ||
.doTest(BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH); | ||
} | ||
|
||
@Test | ||
public void negative() { | ||
compilationHelper | ||
.addSourceLines( | ||
"Test.java", | ||
"import java.util.Optional;", | ||
"class Test {", | ||
" private static final String compileTimeConstant = \"constant\";", | ||
" String f() { return \"hello\"; }", | ||
" void test() {", | ||
" Optional.of(\"hello\").orElse(\"constant\");", | ||
" Optional.of(\"hello\").orElse(compileTimeConstant);", | ||
" String string = f();", | ||
" Optional.of(\"hello\").orElse(string);", | ||
" Optional.of(\"hello\").orElseGet(() -> f());", | ||
" }", | ||
"}") | ||
.doTest(); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is missing test coverage for
Optional.of(foo).orElseGet(() -> bar);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what you mean, you want this check to revert it to
orElse(bar)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see a test verifying that
Optional.of(foo).orElseGet(() -> bar)
is an acceptable thing to writeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, I mean
Optional.of(foo).orElseGet(() -> f());
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I've done that now