diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractAsyncTypeReturnsNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractAsyncTypeReturnsNull.java index 8d911280d81..b8b831d5915 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractAsyncTypeReturnsNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractAsyncTypeReturnsNull.java @@ -55,9 +55,6 @@ private static Matcher overridesMethodOfClass(Class clazz) { @Override public boolean matches(MethodTree tree, VisitorState state) { MethodSymbol symbol = getSymbol(tree); - if (symbol == null) { - return false; - } for (MethodSymbol superMethod : findSuperMethods(symbol, state.getTypes())) { if (superMethod.owner != null && superMethod.owner.getQualifiedName().contentEquals(clazz.getName())) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/CacheLoaderNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/CacheLoaderNull.java index ff7363b9b00..c4b6d50d116 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/CacheLoaderNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/CacheLoaderNull.java @@ -49,9 +49,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) { return NO_MATCH; } MethodSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } if (!ASTHelpers.isSubtype(sym.owner.asType(), CACHE_LOADER_TYPE.get(state), state)) { return NO_MATCH; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ClassCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/ClassCanBeStatic.java index 874a5eacd35..a361de022a2 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ClassCanBeStatic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ClassCanBeStatic.java @@ -49,7 +49,7 @@ public class ClassCanBeStatic extends BugChecker implements ClassTreeMatcher { @Override public Description matchClass(ClassTree tree, VisitorState state) { ClassSymbol currentClass = ASTHelpers.getSymbol(tree); - if (currentClass == null || !currentClass.hasOuterInstance()) { + if (!currentClass.hasOuterInstance()) { return NO_MATCH; } if (currentClass.getNestingKind() != NestingKind.MEMBER) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/CompileTimeConstantChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/CompileTimeConstantChecker.java index 8ab54b49363..598aca79a7f 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/CompileTimeConstantChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/CompileTimeConstantChecker.java @@ -201,9 +201,6 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState @Override public Description matchMethod(MethodTree node, VisitorState state) { Symbol.MethodSymbol method = ASTHelpers.getSymbol(node); - if (method == null) { - return Description.NO_MATCH; - } List compileTimeConstantAnnotationIndexes = getAnnotatedParams(method.getParameters(), state); if (compileTimeConstantAnnotationIndexes.isEmpty()) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantField.java b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantField.java index 5af55c9955c..7edbc756178 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantField.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantField.java @@ -44,7 +44,7 @@ public class ConstantField extends BugChecker implements VariableTreeMatcher { @Override public Description matchVariable(VariableTree tree, VisitorState state) { Symbol.VarSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null || sym.getKind() != ElementKind.FIELD) { + if (sym.getKind() != ElementKind.FIELD) { return Description.NO_MATCH; } String name = sym.getSimpleName().toString(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java index 08e2a10af21..4b3bed540cb 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java @@ -88,10 +88,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) { if (outerMethodTree == null) { return NO_MATCH; } - Symbol sym = getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } + VarSymbol sym = getSymbol(tree); switch (sym.getKind()) { case RESOURCE_VARIABLE: return describeMatch(tree); @@ -115,8 +112,7 @@ private static SuggestedFix fixLocal( } MethodSymbol methodSymbol = getSymbol(outerMethodTree); boolean canUseStatic = - (methodSymbol != null - && methodSymbol.owner.enclClass().getNestingKind() == NestingKind.TOP_LEVEL) + methodSymbol.owner.enclClass().getNestingKind() == NestingKind.TOP_LEVEL || outerMethodTree.getModifiers().getFlags().contains(Modifier.STATIC); String replacement = String.format( diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DateFormatConstant.java b/core/src/main/java/com/google/errorprone/bugpatterns/DateFormatConstant.java index 11114d51e14..fd99bbb5928 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/DateFormatConstant.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/DateFormatConstant.java @@ -56,7 +56,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } VarSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null || sym.getKind() != ElementKind.FIELD) { + if (sym.getKind() != ElementKind.FIELD) { return NO_MATCH; } String name = sym.getSimpleName().toString(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DeduplicateConstants.java b/core/src/main/java/com/google/errorprone/bugpatterns/DeduplicateConstants.java index a3919bac22d..9b0ef9382d4 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/DeduplicateConstants.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/DeduplicateConstants.java @@ -158,9 +158,6 @@ private void replaceLiteral(LiteralTree tree, Scope scope, VisitorState state) { private void saveConstValue(VariableTree tree, Scope scope) { VarSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return; - } if (!isConsideredFinal(sym)) { return; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallChecker.java index 8ea24257395..6d488fda57a 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallChecker.java @@ -140,9 +140,6 @@ public class DoNotCallChecker extends BugChecker @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol symbol = getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } if (hasAnnotation(tree, DO_NOT_CALL, state)) { if (symbol.getModifiers().contains(Modifier.PRIVATE)) { return buildDescription(tree) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java index 063f9cd886f..77593ab1615 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java @@ -93,9 +93,6 @@ public class DoNotCallSuggester extends BugChecker implements MethodTreeMatcher public Description matchMethod(MethodTree tree, VisitorState state) { // if we can't find the method symbol, exit MethodSymbol symbol = getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } // if the method is abstract, exit if (tree.getBody() == null) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/EqualsGetClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/EqualsGetClass.java index 3f522e971c7..4167c800e53 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/EqualsGetClass.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/EqualsGetClass.java @@ -87,7 +87,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState return Description.NO_MATCH; } ClassSymbol classSymbol = getSymbol(classTree); - if (classSymbol == null || classSymbol.isAnonymous()) { + if (classSymbol.isAnonymous()) { return Description.NO_MATCH; } MethodTree methodTree = (MethodTree) methodTreePath.getLeaf(); @@ -97,8 +97,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState VariableTree parameter = getOnlyElement(methodTree.getParameters()); ExpressionTree receiver = getReceiver(tree); VarSymbol symbol = getSymbol(parameter); - if (symbol == null - || receiver == null + if (receiver == null || receiver.getKind() != Kind.IDENTIFIER || !symbol.equals(getSymbol(receiver))) { return Description.NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java index 1ace552980f..c1ac860298e 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java @@ -257,7 +257,7 @@ private FinalScanner(VariableAssignmentRecords writes, VisitorState compilationS @Override public Void visitVariable(VariableTree node, InitializationContext init) { VarSymbol sym = ASTHelpers.getSymbol(node); - if (sym != null && sym.getKind() == ElementKind.FIELD && !isSuppressed(node)) { + if (sym.getKind() == ElementKind.FIELD && !isSuppressed(node)) { writes.recordDeclaration(sym, node); } return super.visitVariable(node, InitializationContext.NONE); @@ -281,7 +281,7 @@ public Void visitBlock(BlockTree node, InitializationContext init) { @Override public Void visitMethod(MethodTree node, InitializationContext init) { MethodSymbol sym = ASTHelpers.getSymbol(node); - if (sym != null && sym.isConstructor()) { + if (sym.isConstructor()) { init = InitializationContext.INSTANCE; } return super.visitMethod(node, init); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java index 89d9f2ca225..57fbcd51763 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeLocal.java @@ -83,8 +83,7 @@ public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState s @Override public Void visitVariable(VariableTree variableTree, Void unused) { VarSymbol symbol = getSymbol(variableTree); - if (symbol != null - && symbol.getKind() == ElementKind.FIELD + if (symbol.getKind() == ElementKind.FIELD && symbol.isPrivate() && canBeLocal(variableTree) && !shouldKeep(variableTree)) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java index a4f354f2371..06d7d71e05a 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java @@ -88,8 +88,7 @@ public FieldCanBeStatic(ErrorProneFlags flags) { @Override public Description matchVariable(VariableTree tree, VisitorState state) { VarSymbol symbol = getSymbol(tree); - if (symbol == null - || !canBeRemoved(symbol) + if (!canBeRemoved(symbol) || !tree.getModifiers().getFlags().contains(FINAL) || symbol.isStatic() || !symbol.getKind().equals(FIELD) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/HidingField.java b/core/src/main/java/com/google/errorprone/bugpatterns/HidingField.java index 441bc29d16c..a1600d15970 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/HidingField.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/HidingField.java @@ -16,6 +16,7 @@ package com.google.errorprone.bugpatterns; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; +import static com.google.errorprone.util.ASTHelpers.getSymbol; import static java.util.stream.Collectors.toCollection; import com.google.common.collect.ImmutableSet; @@ -23,7 +24,6 @@ import com.google.errorprone.VisitorState; import com.google.errorprone.bugpatterns.BugChecker.ClassTreeMatcher; import com.google.errorprone.matchers.Description; -import com.google.errorprone.util.ASTHelpers; import com.sun.source.tree.ClassTree; import com.sun.source.tree.VariableTree; import com.sun.tools.javac.code.Symbol; @@ -58,14 +58,10 @@ public Description matchClass(ClassTree classTree, VisitorState visitorState) { classTree.getMembers().stream() .filter(mem -> mem instanceof VariableTree) .map(mem -> (VariableTree) mem) - .filter( - mem -> - !isSuppressed(ASTHelpers.getSymbol(mem)) - && !isIgnoredType(mem) - && !isStatic(mem)) + .filter(mem -> !isSuppressed(getSymbol(mem)) && !isIgnoredType(mem) && !isStatic(mem)) .collect(toCollection(ArrayList::new)); - ClassSymbol classSymbol = ASTHelpers.getSymbol(classTree); + ClassSymbol classSymbol = getSymbol(classTree); while (!classSymbol.getSuperclass().getKind().equals(TypeKind.NONE)) { TypeSymbol parentSymbol = classSymbol.getSuperclass().asElement(); @@ -123,13 +119,7 @@ private void checkForHiddenFields( } private static boolean isIgnoredType(VariableTree variableTree) { - VarSymbol varSymbol = ASTHelpers.getSymbol(variableTree); - - if (varSymbol != null) { // varSymbol is null when variable is primitive type - return IGNORED_CLASSES.contains(varSymbol.getQualifiedName().toString()); - } - - return false; + return IGNORED_CLASSES.contains(getSymbol(variableTree).getQualifiedName().toString()); } private static boolean isStatic(VariableTree varTree) { @@ -142,7 +132,7 @@ private static boolean isPackagePrivateAndInDiffPackage( && !parentVariable.getModifiers().contains(Modifier.PROTECTED) && !parentVariable.getModifiers().contains(Modifier.PUBLIC)) { // package-private variable - if (!parentVariable.packge().equals(ASTHelpers.getSymbol(currClass).packge())) { + if (!parentVariable.packge().equals(getSymbol(currClass).packge())) { return true; } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InfiniteRecursion.java b/core/src/main/java/com/google/errorprone/bugpatterns/InfiniteRecursion.java index 96e14290345..5056f001cb1 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/InfiniteRecursion.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/InfiniteRecursion.java @@ -84,7 +84,7 @@ protected MethodInvocationTree defaultAction(Tree tree, Void unused) { } ExpressionTree select = invocation.getMethodSelect(); MethodSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null || !sym.equals(ASTHelpers.getSymbol(invocation))) { + if (!sym.equals(ASTHelpers.getSymbol(invocation))) { return NO_MATCH; } if (!sym.isStatic()) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InitializeInline.java b/core/src/main/java/com/google/errorprone/bugpatterns/InitializeInline.java index a1af4a073f6..9da96f40fc5 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/InitializeInline.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/InitializeInline.java @@ -55,7 +55,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } VarSymbol symbol = getSymbol(tree); - if (symbol == null || !isConsideredFinal(symbol)) { + if (!isConsideredFinal(symbol)) { return NO_MATCH; } List assignments = new ArrayList<>(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java b/core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java index 9deb188a7f3..7e106ace6da 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java @@ -61,7 +61,7 @@ public Description matchClass(ClassTree tree, VisitorState state) { } List members = tree.getMembers(); ClassSymbol symbol = getSymbol(tree); - if (symbol == null || !symbol.isInterface() || symbol.isAnnotationType()) { + if (!symbol.isInterface() || symbol.isAnnotationType()) { return Description.NO_MATCH; } int staticMembers = 0; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/IterablePathParameter.java b/core/src/main/java/com/google/errorprone/bugpatterns/IterablePathParameter.java index 9c780ca1506..f2823cc9084 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/IterablePathParameter.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/IterablePathParameter.java @@ -48,7 +48,7 @@ public class IterablePathParameter extends BugChecker implements VariableTreeMat public Description matchVariable(VariableTree tree, VisitorState state) { Type type = ASTHelpers.getType(tree); VarSymbol symbol = ASTHelpers.getSymbol(tree); - if (type == null || symbol == null) { + if (type == null) { return NO_MATCH; } if (symbol.getKind() != ElementKind.PARAMETER) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java b/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java index d1ef2a9a260..302e5b47d60 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java @@ -198,9 +198,6 @@ public Description matchClass(ClassTree tree, VisitorState state) { return NO_MATCH; } ClassSymbol symbol = ASTHelpers.getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } return describeIfObsolete(null, state.getTypes().directSupertypes(symbol.asType()), state); } @@ -416,9 +413,6 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) { private static boolean implementingObsoleteMethod( MethodTree enclosingMethod, VisitorState state, Type type) { MethodSymbol method = ASTHelpers.getSymbol(enclosingMethod); - if (method == null) { - return false; - } if (ASTHelpers.findSuperMethods(method, state.getTypes()).isEmpty()) { // not an override return false; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MemberName.java b/core/src/main/java/com/google/errorprone/bugpatterns/MemberName.java index b110e9daa76..ac33faa9294 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MemberName.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MemberName.java @@ -84,9 +84,6 @@ public final class MemberName extends BugChecker implements MethodTreeMatcher, V @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol symbol = getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } if (!annotationsAmong(symbol.owner, EXEMPTED_CLASS_ANNOTATIONS.get(state), state).isEmpty()) { return NO_MATCH; } @@ -138,9 +135,6 @@ private static boolean hasTestAnnotation(MethodSymbol symbol) { @Override public Description matchVariable(VariableTree tree, VisitorState state) { VarSymbol symbol = getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } String name = tree.getName().toString(); // Try to avoid dual-matching with ConstantCaseForConstants. if (UPPER_UNDERSCORE_PATTERN.matcher(name).matches() && !symbol.isStatic()) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java index 255afeed936..dd26b72b8cc 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java @@ -228,9 +228,6 @@ private void fixQualifier(Tree tree, ExpressionTree qualifierExpression) { private static boolean isExcluded(MethodTree tree, VisitorState state) { MethodSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return true; - } if (sym.isConstructor() || !disjoint(EXCLUDED_MODIFIERS, sym.getModifiers())) { return true; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java index db2c95b0913..46d2d5ac7fc 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java @@ -103,9 +103,6 @@ public Description matchAnnotation(AnnotationTree tree, VisitorState state) { } MethodSymbol methodSym = ASTHelpers.getSymbol(methodTree); - if (methodSym == null) { - return Description.NO_MATCH; - } if (!methodSym.getModifiers().contains(Modifier.ABSTRACT)) { return Description.NO_MATCH; @@ -131,9 +128,6 @@ public Description matchAnnotation(AnnotationTree tree, VisitorState state) { @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol methodSym = ASTHelpers.getSymbol(tree); - if (methodSym == null) { - return Description.NO_MATCH; - } // Allow abstract methods. if (methodSym.getModifiers().contains(Modifier.ABSTRACT)) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NoAllocationChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/NoAllocationChecker.java index 3c2ec8b8d78..1b260511a78 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NoAllocationChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NoAllocationChecker.java @@ -393,9 +393,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) { return NO_MATCH; } MethodSymbol symbol = ASTHelpers.getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } return findSuperMethods(symbol, state.getTypes()).stream() .filter(s -> ASTHelpers.hasAnnotation(s, NoAllocation.class.getName(), state)) .findAny() diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NonFinalCompileTimeConstant.java b/core/src/main/java/com/google/errorprone/bugpatterns/NonFinalCompileTimeConstant.java index 8b75987d341..9fb5fdfbd77 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NonFinalCompileTimeConstant.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NonFinalCompileTimeConstant.java @@ -47,9 +47,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) { } for (VariableTree parameter : tree.getParameters()) { VarSymbol sym = ASTHelpers.getSymbol(parameter); - if (sym == null) { - continue; - } if (!CompileTimeConstantExpressionMatcher.hasCompileTimeConstantAnnotation(state, sym)) { continue; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NullableConstructor.java b/core/src/main/java/com/google/errorprone/bugpatterns/NullableConstructor.java index ae6b5c22e9c..291e69731c3 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NullableConstructor.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NullableConstructor.java @@ -40,9 +40,6 @@ public class NullableConstructor extends BugChecker implements MethodTreeMatcher @Override public Description matchMethod(MethodTree tree, VisitorState state) { Symbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } if (!sym.isConstructor()) { return NO_MATCH; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NullablePrimitive.java b/core/src/main/java/com/google/errorprone/bugpatterns/NullablePrimitive.java index abf4e4360ec..addf3b3760f 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NullablePrimitive.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NullablePrimitive.java @@ -32,7 +32,6 @@ import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.MethodTree; import com.sun.source.tree.VariableTree; -import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symbol.MethodSymbol; import com.sun.tools.javac.code.Type; import java.util.List; @@ -56,19 +55,12 @@ public Description matchAnnotatedType(AnnotatedTypeTree tree, VisitorState state @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } return check(sym.getReturnType(), tree.getModifiers().getAnnotations()); } @Override public Description matchVariable(VariableTree tree, VisitorState state) { - Symbol.VarSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } - return check(sym.type, tree.getModifiers().getAnnotations()); + return check(ASTHelpers.getSymbol(tree).type, tree.getModifiers().getAnnotations()); } private Description check(Type type, List annotations) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NullableVoid.java b/core/src/main/java/com/google/errorprone/bugpatterns/NullableVoid.java index 6e5609b2c86..b65ba237c70 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NullableVoid.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NullableVoid.java @@ -43,9 +43,6 @@ public class NullableVoid extends BugChecker implements MethodTreeMatcher { @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } if (sym.getReturnType().getKind() != TypeKind.VOID) { return NO_MATCH; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java b/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java index f91b9838a21..a305f0381e1 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/PreferredInterfaceType.java @@ -213,7 +213,6 @@ private boolean variableIsFixable(VariableTree tree, VarSymbol symbol) { public Void visitMethod(MethodTree node, Void unused) { MethodSymbol methodSymbol = getSymbol(node); if (methodReturns(INTERESTING_TYPE).matches(node, state) - && methodSymbol != null && !methodCanBeOverridden(methodSymbol) && !SHOULD_IGNORE.matches(node, state)) { fixableTypes.put(methodSymbol, node.getReturnType()); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java b/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java index 13a00e2b488..5299fe98b25 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java @@ -171,7 +171,7 @@ public Void visitClass(ClassTree clazz, Void unused) { @Override public Void visitVariable(VariableTree variable, Void unused) { Symbol symbol = ASTHelpers.getSymbol(variable); - if (variable.getInitializer() != null && symbol != null && isConsideredFinal(symbol)) { + if (variable.getInitializer() != null && isConsideredFinal(symbol)) { getInitializer(variable.getInitializer()) .ifPresent(e -> effectivelyFinalValues.put(symbol, e)); } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java b/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java index d9e1aec33cf..f40f7d8b99e 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java @@ -57,9 +57,6 @@ public final class RedundantOverride extends BugChecker implements MethodTreeMat @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol methodSymbol = getSymbol(tree); - if (methodSymbol == null) { - return NO_MATCH; - } Optional maybeSuperMethod = findSuperMethod(methodSymbol, state.getTypes()); if (!maybeSuperMethod.isPresent()) { return NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ReferenceEquality.java b/core/src/main/java/com/google/errorprone/bugpatterns/ReferenceEquality.java index 6f8841db1c5..9be1aed96ed 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ReferenceEquality.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ReferenceEquality.java @@ -85,7 +85,7 @@ private static boolean inComparisonMethod(Type classType, Type type, VisitorStat return false; } MethodSymbol sym = ASTHelpers.getSymbol(methodTree); - if (sym == null || sym.isStatic()) { + if (sym.isStatic()) { return false; } if (overridesMethodOnType(classType, sym, symtab.comparatorType, "compare", state)) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentInConstructor.java b/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentInConstructor.java index 288cab53ba3..86ba4f61591 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentInConstructor.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentInConstructor.java @@ -43,7 +43,7 @@ public final class StaticAssignmentInConstructor extends BugChecker implements M @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol methodSymbol = getSymbol(tree); - if (methodSymbol == null || !methodSymbol.isConstructor()) { + if (!methodSymbol.isConstructor()) { return NO_MATCH; } new TreeScanner() { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentOfThrowable.java b/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentOfThrowable.java index e2c05c61c0e..5dac538976e 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentOfThrowable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/StaticAssignmentOfThrowable.java @@ -77,9 +77,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) { } MethodSymbol methodSymbol = getSymbol(tree); - if (methodSymbol == null) { - return NO_MATCH; - } if (methodSymbol.isConstructor()) { // To avoid duplicate/conflicting findings, this scenario delegated to // StaticAssignmentInConstructor diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ThreadLocalUsage.java b/core/src/main/java/com/google/errorprone/bugpatterns/ThreadLocalUsage.java index a3dc4a4fd01..06d6230efd2 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ThreadLocalUsage.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ThreadLocalUsage.java @@ -65,7 +65,7 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) { return NO_MATCH; } VarSymbol sym = getSymbol((VariableTree) parent); - if (sym != null && sym.isStatic()) { + if (sym.isStatic()) { return NO_MATCH; } if (Streams.stream(state.getPath()) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java b/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java index 99dd54ff51f..eed779e24df 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java @@ -46,9 +46,6 @@ public class TypeParameterUnusedInFormals extends BugChecker implements MethodTr @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree); - if (methodSymbol == null) { - return Description.NO_MATCH; - } // Only match methods where the return type is just a type parameter. // e.g. the following is OK: List newArrayList(); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java index a6c03392e40..32840984f51 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java @@ -90,8 +90,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } VarSymbol varSym = getSymbol(tree); - if (varSym == null - || varSym.getKind() != ElementKind.FIELD + if (varSym.getKind() != ElementKind.FIELD || !canBeRemoved(varSym) || !varSym.getModifiers().contains(Modifier.FINAL)) { return NO_MATCH; @@ -102,9 +101,6 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } MethodSymbol methodSymbol = getSymbol(implementation); - if (methodSymbol == null) { - return NO_MATCH; - } Symbol descriptorSymbol = state.getTypes().findDescriptorSymbol(type.tsym); if (!methodSymbol.getSimpleName().contentEquals(descriptorSymbol.getSimpleName())) { return NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java index d5b11239521..3f4af95466b 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryBoxedVariable.java @@ -82,9 +82,6 @@ public Description matchVariable(VariableTree tree, VisitorState state) { } VarSymbol varSymbol = ASTHelpers.getSymbol(tree); - if (varSymbol == null) { - return Description.NO_MATCH; - } switch (varSymbol.getKind()) { case PARAMETER: if (!canChangeMethodSignature(state, (MethodSymbol) varSymbol.getEnclosingElement())) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryFinal.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryFinal.java index 8a161b08892..7676bf4cff6 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryFinal.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryFinal.java @@ -46,9 +46,6 @@ public final class UnnecessaryFinal extends BugChecker implements VariableTreeMa @Override public Description matchVariable(VariableTree tree, VisitorState state) { Symbol symbol = getSymbol(tree); - if (symbol == null) { - return NO_MATCH; - } if (symbol.getKind() == ElementKind.FIELD) { return NO_MATCH; } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java index 9576b3b97f2..3d05772c03d 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java @@ -85,7 +85,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) { return NO_MATCH; } MethodSymbol sym = getSymbol(tree); - if (sym == null || !ASTHelpers.canBeRemoved(sym, state)) { + if (!ASTHelpers.canBeRemoved(sym, state)) { return NO_MATCH; } SuggestedFix.Builder fix = SuggestedFix.builder(); @@ -120,8 +120,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } Symbol sym = getSymbol(tree); - if (sym == null - || sym.getKind() != ElementKind.FIELD + if (sym.getKind() != ElementKind.FIELD || !sym.isPrivate() || !sym.getModifiers().contains(Modifier.FINAL)) { return NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnsafeFinalization.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnsafeFinalization.java index 451634715d8..a57c051a45d 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnsafeFinalization.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnsafeFinalization.java @@ -71,7 +71,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState // static methods don't have an instance to finalize, and we shouldn't need to worry about // finalization during construction. MethodSymbol enclosing = ASTHelpers.getSymbol(method); - if (enclosing == null || enclosing.isStatic() || enclosing.isConstructor()) { + if (enclosing.isStatic() || enclosing.isConstructor()) { return NO_MATCH; } // Check if any arguments of the static native method are members (e.g. fields) of the enclosing diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java index 6be0baaa771..0a505457703 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java @@ -201,8 +201,7 @@ private boolean isMethodSymbolEligibleForChecking(MethodTree tree) { return false; } MethodSymbol methodSymbol = getSymbol(tree); - if (methodSymbol == null - || isExemptedConstructor(methodSymbol, state) + if (isExemptedConstructor(methodSymbol, state) || SERIALIZATION_METHODS.matches(tree, state)) { return false; } @@ -286,9 +285,6 @@ public Void visitMethod(MethodTree tree, Void unused) { */ private void handleMethodSource(MethodTree tree) { MethodSymbol sym = getSymbol(tree); - if (sym == null) { - return; - } Name name = ORG_JUNIT_JUPITER_PARAMS_PROVIDER_METHODSOURCE.get(state); sym.getRawAttributes().stream() .filter(a -> a.type.tsym.getQualifiedName().equals(name)) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedNestedClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedNestedClass.java index b5ff9407ad9..d7435349fa9 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedNestedClass.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedNestedClass.java @@ -79,9 +79,6 @@ public Void visitClass(ClassTree classTree, Void unused) { return null; } ClassSymbol symbol = getSymbol(classTree); - if (symbol == null) { - return super.visitClass(classTree, null); - } boolean isAnonymous = classTree.getSimpleName().length() == 0; if (!isAnonymous && (canBeRemoved(symbol) || symbol.owner instanceof MethodSymbol)) { classes.put(symbol, getCurrentPath()); @@ -101,9 +98,6 @@ private static final class ClassUsageScanner extends TreePathScanner @Override public Void visitClass(ClassTree classTree, Void unused) { ClassSymbol symbol = getSymbol(classTree); - if (symbol == null) { - return super.visitClass(classTree, null); - } withinClasses.add(symbol); super.visitClass(classTree, null); withinClasses.remove(symbol); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java index 31cbb368de8..9aa155bcea4 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java @@ -571,9 +571,6 @@ public Void visitVariable(VariableTree variableTree, Void unused) { return null; } VarSymbol symbol = getSymbol(variableTree); - if (symbol == null) { - return null; - } if (symbol.getKind() == ElementKind.FIELD && symbol.getSimpleName().contentEquals("CREATOR") && isSubtype(symbol.type, PARCELABLE_CREATOR.get(state), state)) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/VarChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/VarChecker.java index bf3458d6ad2..d0e8b625834 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/VarChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/VarChecker.java @@ -55,9 +55,6 @@ public class VarChecker extends BugChecker implements VariableTreeMatcher { @Override public Description matchVariable(VariableTree tree, VisitorState state) { Symbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return Description.NO_MATCH; - } if (ASTHelpers.hasAnnotation(sym, Var.class, state)) { if ((sym.flags() & Flags.EFFECTIVELY_FINAL) != 0) { return buildDescription(tree) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java b/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java index 9f366b5901d..99fcd66b9b4 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/argumentselectiondefects/CreatesDuplicateCallHeuristic.java @@ -101,15 +101,13 @@ public Void visitNewClass(NewClassTree newClassTree, Void unused) { @Override public Void visitMethod(MethodTree methodTree, Void unused) { MethodSymbol methodSymbol = ASTHelpers.getSymbol(methodTree); - if (methodSymbol != null) { - // if the method declared here is the one we are calling then add it - addToResult(methodSymbol, methodTree); + // if the method declared here is the one we are calling then add it + addToResult(methodSymbol, methodTree); - // if any supermethod of the one declared here is the one we are calling then add it - for (MethodSymbol superSymbol : - ASTHelpers.findSuperMethods(methodSymbol, state.getTypes())) { - addToResult(superSymbol, methodTree); - } + // if any supermethod of the one declared here is the one we are calling then add it + for (MethodSymbol superSymbol : + ASTHelpers.findSuperMethods(methodSymbol, state.getTypes())) { + addToResult(superSymbol, methodTree); } return super.visitMethod(methodTree, unused); } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRequiredModifiers.java b/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRequiredModifiers.java index 570aeae3003..4e00b922c13 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRequiredModifiers.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRequiredModifiers.java @@ -271,12 +271,10 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState MethodTree owningMethod = state.findEnclosing(MethodTree.class); if (owningMethod != null) { MethodSymbol methodSym = ASTHelpers.getSymbol(owningMethod); - if (methodSym != null) { - Type returnType = methodSym.getReturnType(); - // Could be null for initializer blocks - if (ASTHelpers.isSameType(loggerType, returnType, state)) { - return NO_MATCH; - } + Type returnType = methodSym.getReturnType(); + // Could be null for initializer blocks + if (ASTHelpers.isSameType(loggerType, returnType, state)) { + return NO_MATCH; } } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/InlineFormatString.java b/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/InlineFormatString.java index b1f026422e5..2d76aacf41e 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/InlineFormatString.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/formatstring/InlineFormatString.java @@ -176,7 +176,7 @@ private void handle(Tree tree) { @Override public Void visitVariable(VariableTree tree, Void unused) { VarSymbol sym = getSymbol(tree); - if (sym != null && uses.containsKey(sym)) { + if (uses.containsKey(sym)) { declarations.put(sym, tree); } return super.visitVariable(tree, null); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inject/dagger/ProvidesNull.java b/core/src/main/java/com/google/errorprone/bugpatterns/inject/dagger/ProvidesNull.java index 514621ae1f0..58f8b53db1a 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/inject/dagger/ProvidesNull.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/inject/dagger/ProvidesNull.java @@ -71,9 +71,6 @@ public Description matchReturn(ReturnTree returnTree, VisitorState state) { } } MethodSymbol enclosingMethodSym = ASTHelpers.getSymbol(enclosingMethod); - if (enclosingMethodSym == null) { - return Description.NO_MATCH; - } if (!ASTHelpers.hasAnnotation(enclosingMethodSym, "dagger.Provides", state) || ASTHelpers.hasDirectAnnotationWithSimpleName(enclosingMethodSym, "Nullable")) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/InheritDoc.java b/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/InheritDoc.java index d1deb1214c8..737f349d00d 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/InheritDoc.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/javadoc/InheritDoc.java @@ -98,7 +98,7 @@ public Void visitVariable(VariableTree variableTree, Void unused) { @Override public Void visitMethod(MethodTree methodTree, Void unused) { MethodSymbol methodSymbol = getSymbol(methodTree); - if (methodSymbol != null && findSuperMethods(methodSymbol, state.getTypes()).isEmpty()) { + if (findSuperMethods(methodSymbol, state.getTypes()).isEmpty()) { state.reportMatch( buildDescription(diagnosticPosition(getCurrentPath(), state)) .setMessage( diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/VoidMissingNullable.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/VoidMissingNullable.java index 8493428a8f7..f5dadd22d11 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/VoidMissingNullable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/VoidMissingNullable.java @@ -85,9 +85,6 @@ public Description matchParameterizedType( @Override public Description matchMethod(MethodTree tree, VisitorState state) { MethodSymbol sym = getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } if (!typeMatches(sym.getReturnType(), sym, state)) { return NO_MATCH; } @@ -106,9 +103,6 @@ public Description matchVariable(VariableTree tree, VisitorState state) { return NO_MATCH; } VarSymbol sym = getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } if (sym.getKind() == LOCAL_VARIABLE) { return NO_MATCH; // Local variables are discussed in the comment about `var`, etc. above. } diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableAnnotationChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableAnnotationChecker.java index fe7d7ef5693..39d766e173b 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableAnnotationChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableAnnotationChecker.java @@ -66,9 +66,7 @@ public ImmutableAnnotationChecker(ErrorProneFlags flags) { @Override public Description matchClass(ClassTree tree, VisitorState state) { ClassSymbol symbol = getSymbol(tree); - if (symbol == null - || symbol.isAnnotationType() - || !WellKnownMutability.isAnnotation(state, symbol.type)) { + if (symbol.isAnnotationType() || !WellKnownMutability.isAnnotation(state, symbol.type)) { return NO_MATCH; } if (!Collections.disjoint(getGeneratedBy(symbol, state), IGNORED_PROCESSORS)) { diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableChecker.java index f844e95a292..67d9e2cd2cf 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableChecker.java @@ -290,9 +290,6 @@ private Description.Builder describeClass( private Description handleAnonymousClass( ClassTree tree, VisitorState state, ImmutableAnalysis analysis) { ClassSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } Type superType = immutableSupertype(sym, state); if (superType == null) { return NO_MATCH; @@ -338,9 +335,6 @@ private Description.Builder describeAnonymous(Tree tree, Type superType, Violati /** Check for classes without {@code @Immutable} that have immutable supertypes. */ private Description checkSubtype(ClassTree tree, VisitorState state) { ClassSymbol sym = ASTHelpers.getSymbol(tree); - if (sym == null) { - return NO_MATCH; - } Type superType = immutableSupertype(sym, state); if (superType == null) { return NO_MATCH; diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableEnumChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableEnumChecker.java index d0e9e362a4a..18c66f75fb8 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableEnumChecker.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableEnumChecker.java @@ -62,7 +62,7 @@ public ImmutableEnumChecker(ErrorProneFlags flags) { @Override public Description matchClass(ClassTree tree, VisitorState state) { ClassSymbol symbol = getSymbol(tree); - if (symbol == null || !symbol.isEnum()) { + if (!symbol.isEnum()) { return NO_MATCH; }