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.

Sign up for GitHub

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

Jump to bottom

Upgrade Error Prone 2.18.0 -> 2.19.1 #621

Merged
merged 7 commits into from May 14, 2023
Merged

Upgrade Error Prone 2.18.0 -> 2.19.1 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed44740
Upgrade version.error-prone-orig 2.18.0 -> 2.19.0
Picnic-Bot May 10, 2023
a9cb13f
Drop `StringCaseLocaleUsage` check
rickie May 10, 2023
ea721e2
Resolve build issues
Stephan202 May 10, 2023
447aa24
Fix the build
Stephan202 May 10, 2023
db74304
Enable new non-default flags
Stephan202 May 10, 2023
4a367c9
JDK 11 fix
Stephan202 May 10, 2023
78264c3
Upgrade to 2.19.1
Stephan202 May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions error-prone-contrib/pom.xml
View file
Open in desktop
Expand Up @@ -126,6 +126,11 @@
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion ...in/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;
import javax.inject.Inject;
import org.jspecify.annotations.Nullable;
import tech.picnic.errorprone.bugpatterns.util.AnnotationAttributeMatcher;
import tech.picnic.errorprone.bugpatterns.util.Flags;
Expand Down Expand Up @@ -94,7 +95,8 @@ public LexicographicalAnnotationAttributeListing() {
*
* @param flags Any provided command line flags.
*/
public LexicographicalAnnotationAttributeListing(ErrorProneFlags flags) {
@Inject
LexicographicalAnnotationAttributeListing(ErrorProneFlags flags) {
matcher = createAnnotationAttributeMatcher(flags);
}

Expand Down
4 changes: 3 additions & 1 deletion ...e-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RedundantStringConversion.java
View file
Open in desktop
Expand Up @@ -50,6 +50,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
import javax.inject.Inject;
import tech.picnic.errorprone.bugpatterns.util.Flags;
import tech.picnic.errorprone.bugpatterns.util.MethodMatcherFactory;
import tech.picnic.errorprone.bugpatterns.util.SourceCode;
Expand Down Expand Up @@ -155,7 +156,8 @@ public RedundantStringConversion() {
*
* @param flags Any provided command line flags.
*/
public RedundantStringConversion(ErrorProneFlags flags) {
@Inject
RedundantStringConversion(ErrorProneFlags flags) {
conversionMethodMatcher = createConversionMethodMatcher(flags);
}

Expand Down
4 changes: 3 additions & 1 deletion error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/RequestParamType.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import com.google.errorprone.suppliers.Suppliers;
import com.sun.source.tree.Tree;
import com.sun.source.tree.VariableTree;
import javax.inject.Inject;
import tech.picnic.errorprone.bugpatterns.util.Flags;

/** A {@link BugChecker} that flags {@code @RequestParam} parameters with an unsupported type. */
Expand Down Expand Up @@ -55,7 +56,8 @@ public RequestParamType() {
*
* @param flags Any provided command line flags.
*/
public RequestParamType(ErrorProneFlags flags) {
@Inject
RequestParamType(ErrorProneFlags flags) {
hasUnsupportedRequestParamType = hasUnsupportedRequestParamType(flags);
}

Expand Down
89 changes: 0 additions & 89 deletions ...prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringCaseLocaleUsage.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/BugCheckerRules.java
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
import com.google.errorprone.BugCheckerRefactoringTestHelper;
import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChooser;
import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChoosers;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand All @@ -25,6 +26,7 @@ BugCheckerRefactoringTestHelper before(BugCheckerRefactoringTestHelper helper) {
}

@AfterTemplate
@CanIgnoreReturnValue
BugCheckerRefactoringTestHelper after(BugCheckerRefactoringTestHelper helper) {
return helper;
}
Comment on lines 28 to 32
Copy link
Member

Choose a reason for hiding this comment

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

It might be nice to open a PR upstream to skip suggesting @CanIgnoreReturnValue on @AfterTemplate. After all, such methods are not really meant to be invoked.

Copy link
Member

Choose a reason for hiding this comment

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

I'm totally up for that, will create it tomorrow morning 🦺.

Copy link
Member

Choose a reason for hiding this comment

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

Consider first checking the internal upgrade PR; as I mention there, there are a bunch of other (non-Refaster) cases in which adding @CanIgnoreReturnValue also doesn't really make sense.

Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ComparatorRules.java
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
import com.google.common.collect.Comparators;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -78,6 +79,7 @@ Comparator<T> before(Comparator<T> cmp) {
}

@AfterTemplate
@CanIgnoreReturnValue
@UseImportPolicy(STATIC_IMPORT_ALWAYS)
Comparator<T> after(Comparator<T> cmp) {
return cmp;
Expand Down
2 changes: 2 additions & 0 deletions ...r-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/DoubleStreamRules.java
View file
Open in desktop
@@ -1,6 +1,7 @@
package tech.picnic.errorprone.refasterrules;

import com.google.common.collect.Streams;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand All @@ -27,6 +28,7 @@ DoubleStream before(DoubleStream stream) {
}

@AfterTemplate
@CanIgnoreReturnValue
DoubleStream after(DoubleStream stream) {
return stream;
}
Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/EqualityRules.java
View file
Open in desktop
@@ -1,5 +1,6 @@
package tech.picnic.errorprone.refasterrules;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.AlsoNegation;
Expand Down Expand Up @@ -63,6 +64,7 @@ boolean before(boolean b) {
}

@AfterTemplate
@CanIgnoreReturnValue
boolean after(boolean b) {
return b;
}
Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/IntStreamRules.java
View file
Open in desktop
@@ -1,6 +1,7 @@
package tech.picnic.errorprone.refasterrules;

import com.google.common.collect.Streams;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -40,6 +41,7 @@ IntStream before(IntStream stream) {
}

@AfterTemplate
@CanIgnoreReturnValue
IntStream after(IntStream stream) {
return stream;
}
Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/LongStreamRules.java
View file
Open in desktop
@@ -1,6 +1,7 @@
package tech.picnic.errorprone.refasterrules;

import com.google.common.collect.Streams;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -40,6 +41,7 @@ LongStream before(LongStream stream) {
}

@AfterTemplate
@CanIgnoreReturnValue
LongStream after(LongStream stream) {
return stream;
}
Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/OptionalRules.java
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;

import com.google.common.collect.Streams;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -351,6 +352,7 @@ Optional<T> before(Optional<T> optional, Comparator<? super T> comparator) {
}

@AfterTemplate
@CanIgnoreReturnValue
Optional<T> after(Optional<T> optional) {
return optional;
}
Expand Down
4 changes: 4 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -411,6 +412,7 @@ Mono<ImmutableList<T>> before3(Mono<ImmutableList<T>> mono) {
}

@AfterTemplate
@CanIgnoreReturnValue
Mono<T> after(Mono<T> mono) {
return mono;
}
Expand All @@ -424,6 +426,7 @@ Flux<T> before(Flux<T> flux) {
}

@AfterTemplate
@CanIgnoreReturnValue
Flux<T> after(Flux<T> flux) {
return flux;
}
Expand Down Expand Up @@ -1276,6 +1279,7 @@ StepVerifier.Step<T> before(StepVerifier.Step<T> step) {
}

@AfterTemplate
@CanIgnoreReturnValue
StepVerifier.Step<T> after(StepVerifier.Step<T> step) {
return step;
}
Expand Down
2 changes: 2 additions & 0 deletions error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/StreamRules.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import static java.util.stream.Collectors.summingLong;

import com.google.common.collect.Streams;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.refaster.Refaster;
import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
Expand Down Expand Up @@ -124,6 +125,7 @@ Stream<T> before(Stream<T> stream) {
}

@AfterTemplate
@CanIgnoreReturnValue
Stream<T> after(Stream<T> stream) {
return stream;
}
Expand Down