jlengrand/error-prone-support
1
0
Fork 0
mirror of https://github.com/jlengrand/error-prone-support.git synced 2026-03-10 08:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE in IsEmpty matcher (#978)

Browse Source
This commit is contained in:
Stephan Schroevers
2024-01-20 12:34:50 +01:00
committed by GitHub
parent f12474e8e6
commit dc65917ef1
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsEmpty.java
View File

@@ -56,6 +56,7 @@ import java.util.stream.Stream;
// XXX: Also recognize empty builders and `emptyBuilder.build()` invocations.
public final class IsEmpty implements Matcher<ExpressionTree> {
private static final long serialVersionUID = 1L;
private static final Integer ZERO = 0;
private static final Pattern EMPTY_INSTANCE_FACTORY_METHOD_PATTERN = Pattern.compile("empty.*");
private static final Matcher<Tree> EMPTY_COLLECTION_CONSTRUCTOR_ARGUMENT =
anyOf(isPrimitiveType(), isSubtypeOf(Comparator.class));
@@ -145,7 +146,7 @@ public final class IsEmpty implements Matcher<ExpressionTree> {
NewArrayTree newArray = (NewArrayTree) tree;
return (!newArray.getDimensions().isEmpty()
&& ASTHelpers.constValue(newArray.getDimensions().get(0), Integer.class) == 0)
&& ZERO.equals(ASTHelpers.constValue(newArray.getDimensions().get(0), Integer.class)))
|| (newArray.getInitializers() != null && newArray.getInitializers().isEmpty());
}
}

41
refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsEmptyTest.java
View File

@@ -55,75 +55,80 @@ final class IsEmptyTest {
" return new int[][] {{0}};",
" }",
"",
" Random negative5() {",
" int[] negative5() {",
" int i = hashCode();",
" return new int[i];",
" }",
"",
" Random negative6() {",
" return new Random();",
" }",
"",
" List<Integer> negative6() {",
" List<Integer> negative7() {",
" return new ArrayList<>(ImmutableList.of(1));",
" }",
"",
" Map<Integer, Integer> negative7() {",
" Map<Integer, Integer> negative8() {",
" return new HashMap<>(ImmutableMap.of(1, 2));",
" }",
"",
" Set<Integer> negative8() {",
" Set<Integer> negative9() {",
" return new HashSet<>(ImmutableList.of(1));",
" }",
"",
" Map<Integer, Integer> negative9() {",
" Map<Integer, Integer> negative10() {",
" return new LinkedHashMap<>(ImmutableMap.of(1, 2));",
" }",
"",
" Set<Integer> negative10() {",
" Set<Integer> negative11() {",
" return new LinkedHashSet<>(ImmutableList.of(1));",
" }",
"",
" List<Integer> negative11() {",
" List<Integer> negative12() {",
" return new LinkedList<>(ImmutableList.of(1));",
" }",
"",
" Map<Integer, Integer> negative12() {",
" Map<Integer, Integer> negative13() {",
" return new HashMap<>(ImmutableMap.of(1, 2));",
" }",
"",
" Set<Integer> negative13() {",
" Set<Integer> negative14() {",
" return new HashSet<>(ImmutableList.of(1));",
" }",
"",
" List<Integer> negative14() {",
" List<Integer> negative15() {",
" return new Vector<>(ImmutableList.of(1));",
" }",
"",
" ImmutableList<Integer> negative15() {",
" ImmutableList<Integer> negative16() {",
" return ImmutableList.of(1);",
" }",
"",
" ImmutableSet<Integer> negative16() {",
" ImmutableSet<Integer> negative17() {",
" return ImmutableSet.of(1);",
" }",
"",
" ImmutableMap<Integer, Integer> negative17() {",
" ImmutableMap<Integer, Integer> negative18() {",
" return ImmutableMap.of(1, 2);",
" }",
"",
" ImmutableSetMultimap<Integer, Integer> negative18() {",
" ImmutableSetMultimap<Integer, Integer> negative19() {",
" return ImmutableSetMultimap.of(1, 2);",
" }",
"",
" List<Integer> negative19() {",
" List<Integer> negative20() {",
" return List.of(1);",
" }",
"",
" Map<Integer, Integer> negative20() {",
" Map<Integer, Integer> negative21() {",
" return Map.of(1, 2);",
" }",
"",
" Set<Integer> negative21() {",
" Set<Integer> negative22() {",
" return Set.of(1);",
" }",
"",
" Stream<Integer> negative22() {",
" Stream<Integer> negative23() {",
" return Stream.of(1);",
" }",
"",