Apply Optional cleanups to Error Prone

cushon · Error Prone Team · commit 22c7428b75b8 · 2025-11-10T14:42:56.000-08:00
PiperOrigin-RevId: 830605360
diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessAnnotations.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessAnnotations.java
@@ -211,7 +211,7 @@ public static Optional<Nullness> getUpperBound(TypeVariable typeVar) {
 
     // If the type variable doesn't have an explicit bound, see if its declaration is in the scope
     // of a default and use that as the bound.
-    return result.isPresent() ? result : fromDefaultAnnotations(typeVar.asElement());
+    return result.or(() -> fromDefaultAnnotations(typeVar.asElement()));
   }
 
   private static Optional<Nullness> fromAnnotationStream(
diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/InferredNullability.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/InferredNullability.java
@@ -87,20 +87,18 @@ private Optional<Nullness> getNullness(InferenceVariable iv) {
       result =
           constraintGraph.predecessors(iv).stream()
               .map(this::getNullness)
-              .filter(Optional::isPresent)
-              .map(Optional::get)
+              .flatMap(Optional::stream)
               .reduce(Nullness::leastUpperBound); // use least upper bound (lub) to combine
       // 2. If not, resolve successors and use them as upper bounds
-      if (!result.isPresent()) {
+      if (result.isEmpty()) {
         result =
             constraintGraph.successors(iv).stream()
                 .map(this::getNullness)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
+                .flatMap(Optional::stream)
                 .reduce(Nullness::greatestLowerBound); // use greatest lower bound (glb) to combine
       }
 
-      checkState(!inferredMemoTable.put(iv, result).isPresent());
+      checkState(inferredMemoTable.put(iv, result).isEmpty());
       return result;
     }
   }
diff --git a/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java b/check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/inference/NullnessQualifierInference.java
@@ -153,14 +153,14 @@ private void generateConstraintsFromAnnotations(
 
     Optional<Nullness> fromAnnotations =
         extractExplicitNullness(declaredType, argSelector.isEmpty() ? decl : null);
-    if (!fromAnnotations.isPresent()) {
+    if (fromAnnotations.isEmpty()) {
       // Check declared type before inferred type so that type annotations on the declaration take
       // precedence (just like declaration annotations) over annotations on the inferred type.
       // For instance, we want a @Nullable T m() to take precedence over annotations on T's inferred
       // type (e.g., @NotNull String), whether @Nullable is a declaration or type annotation.
       fromAnnotations = NullnessAnnotations.fromAnnotationsOn(inferredType);
     }
-    if (!fromAnnotations.isPresent()) {
+    if (fromAnnotations.isEmpty()) {
       if (declaredType instanceof TypeVariable typeVariable) {
         // Check bounds second so explicit annotations take precedence. Even for bounds we still use
         // equality constraint below since we have to assume the bound as the "worst" case.
@@ -359,7 +359,7 @@ private static ImmutableSet<InferenceVariable> findUnannotatedTypeVarRefs(
         new ArrayDeque<>(),
         null,
         (typeVarRef, selector, unused) -> {
-          if (!extractExplicitNullness(typeVarRef, selector.isEmpty() ? decl : null).isPresent()) {
+          if (extractExplicitNullness(typeVarRef, selector.isEmpty() ? decl : null).isEmpty()) {
             result.add(TypeArgInferenceVar.create(ImmutableList.copyOf(selector), sourceNode));
           }
         });
@@ -378,7 +378,7 @@ private void visitUnannotatedTypeVarRefsAndEquateInferredComponents(
         new ArrayDeque<>(),
         ((JCExpression) sourceNode).type,
         (declaredType, selector, inferredType) -> {
-          if (!extractExplicitNullness(type, selector.isEmpty() ? decl : null).isPresent()) {
+          if (extractExplicitNullness(type, selector.isEmpty() ? decl : null).isEmpty()) {
             consumer.accept(TypeArgInferenceVar.create(ImmutableList.copyOf(selector), sourceNode));
           }
 
@@ -482,7 +482,7 @@ private void generateConstraintsForWrite(
     boolean isBound = false;
     Optional<Nullness> fromAnnotations =
         extractExplicitNullness(lType, argSelector.isEmpty() ? decl : null);
-    if (!fromAnnotations.isPresent()) {
+    if (fromAnnotations.isEmpty()) {
       if (lType instanceof TypeVariable typeVariable) {
         fromAnnotations = NullnessAnnotations.getUpperBound(typeVariable);
         isBound = true;
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java b/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java
@@ -1132,7 +1132,7 @@ public static SuggestedFix.Builder addValuesToAnnotationArgument(
                   .replaceFirst("\\(\\)", "(" + parameterPrefix + newArgument(newValues) + ")"));
     }
     Optional<ExpressionTree> maybeExistingArgument = findArgument(annotation, parameterName);
-    if (!maybeExistingArgument.isPresent()) {
+    if (maybeExistingArgument.isEmpty()) {
       return SuggestedFix.builder()
           .prefixWith(
               annotation.getArguments().getFirst(),
@@ -1192,7 +1192,7 @@ public static SuggestedFix.Builder updateAnnotationArgumentValues(
                   + ')');
     }
     Optional<ExpressionTree> maybeExistingArgument = findArgument(annotation, parameterName);
-    if (!maybeExistingArgument.isPresent()) {
+    if (maybeExistingArgument.isEmpty()) {
       return SuggestedFix.builder()
           .prefixWith(
               annotation.getArguments().getFirst(),
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java b/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java
@@ -483,7 +483,7 @@ public static Matcher<ExpressionTree> compile(Iterable<Rule> rules) {
       // First collect all the nodes that accept any token at all
       for (Node node : curr) {
         for (Map.Entry<Optional<Token>, Node> entry : nfa.row(node).entrySet()) {
-          if (!entry.getKey().isPresent()) {
+          if (entry.getKey().isEmpty()) {
             acceptsAny.add(entry.getValue());
           }
         }
diff --git a/check_api/src/main/java/com/google/errorprone/util/Comments.java b/check_api/src/main/java/com/google/errorprone/util/Comments.java
@@ -111,7 +111,7 @@ private static ImmutableList<Commented<ExpressionTree>> findCommentsForArguments
 
     CharSequence sourceCode = state.getSourceCode();
     Optional<Integer> endPosition = computeEndPosition(tree, sourceCode, state);
-    if (!endPosition.isPresent()) {
+    if (endPosition.isEmpty()) {
       return noComments(arguments);
     }
 
diff --git a/check_api/src/test/java/com/google/errorprone/util/CommentsTest.java b/check_api/src/test/java/com/google/errorprone/util/CommentsTest.java
@@ -54,7 +54,7 @@ public static class ComputeEndPosition extends BugChecker implements MethodInvoc
     public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
       CharSequence sourceCode = state.getSourceCode();
       Optional<Integer> endPosition = Comments.computeEndPosition(tree, sourceCode, state);
-      if (!endPosition.isPresent()) {
+      if (endPosition.isEmpty()) {
         return Description.NO_MATCH;
       }
       int startPosition = endPosition.get();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractReturnValueIgnored.java b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractReturnValueIgnored.java
@@ -161,7 +161,7 @@ public Description matchNewClass(NewClassTree newClassTree, VisitorState state)
   public Description matchMemberReference(MemberReferenceTree tree, VisitorState state) {
     Description description =
         matcher.get().matches(tree, state) ? describeReturnValueIgnored(tree, state) : NO_MATCH;
-    if (!lostType(state).isPresent() || !description.equals(NO_MATCH)) {
+    if (lostType(state).isEmpty() || !description.equals(NO_MATCH)) {
       return description;
     }
     if (lostReferenceTreeMatcher.get().matches(tree, state)) {
@@ -335,7 +335,7 @@ && matchingMethods(
      * this a constructor call or build() call?"
      */
     if (parent instanceof ExpressionStatementTree
-        && !constantExpressions.constantExpression(invocationTree, state).isPresent()
+        && constantExpressions.constantExpression(invocationTree, state).isEmpty()
         && considerBlanketFixes) {
       ImmutableSet<String> identifiersInScope =
           findAllIdents(state).stream().map(v -> v.name.toString()).collect(toImmutableSet());
@@ -407,7 +407,7 @@ protected String getMessage(Name name) {
 
   private Description checkLostType(MethodInvocationTree tree, VisitorState state) {
     Optional<Type> optionalType = lostType(state);
-    if (!optionalType.isPresent()) {
+    if (optionalType.isEmpty()) {
       return NO_MATCH;
     }
 
@@ -567,7 +567,7 @@ private static boolean isExemptedInterfaceMethod(MethodSymbol symbol, VisitorSta
   @Override
   public Description matchReturn(ReturnTree tree, VisitorState state) {
     Optional<Type> optionalType = lostType(state);
-    if (!optionalType.isPresent()) {
+    if (optionalType.isEmpty()) {
       return NO_MATCH;
     }
     Type objectType = state.getSymtab().objectType;
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AssertionFailureIgnored.java b/core/src/main/java/com/google/errorprone/bugpatterns/AssertionFailureIgnored.java
@@ -91,7 +91,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     }
     Optional<JCCatch> maybeCatchTree =
         catchesType(tryStatement, state.getSymtab().assertionErrorType, state);
-    if (!maybeCatchTree.isPresent()) {
+    if (maybeCatchTree.isEmpty()) {
       return NO_MATCH;
     }
     JCCatch catchTree = maybeCatchTree.get();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DoubleBraceInitialization.java b/core/src/main/java/com/google/errorprone/bugpatterns/DoubleBraceInitialization.java
@@ -229,7 +229,7 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
         Arrays.stream(CollectionTypes.values())
             .filter(type -> type.constructorMatcher.matches(tree, state))
             .findFirst();
-    if (!collectionType.isPresent()) {
+    if (collectionType.isEmpty()) {
       return NO_MATCH;
     }
     Description.Builder description = buildDescription(tree);
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ImmutableSetForContains.java b/core/src/main/java/com/google/errorprone/bugpatterns/ImmutableSetForContains.java
@@ -134,10 +134,7 @@ public Description matchClass(ClassTree tree, VisitorState state) {
         fix.merge(convertListToSetInit(var, state));
       }
     }
-    if (!firstReplacement.isPresent()) {
-      return Description.NO_MATCH;
-    }
-    return describeMatch(firstReplacement.get(), fix.build());
+    return firstReplacement.map(fr -> describeMatch(fr, fix.build())).orElse(Description.NO_MATCH);
   }
 
   private static SuggestedFix convertListToSetInit(VariableTree var, VisitorState state) {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/JUnitParameterMethodNotFound.java b/core/src/main/java/com/google/errorprone/bugpatterns/JUnitParameterMethodNotFound.java
@@ -91,7 +91,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
             .filter(annotationTree -> PARAMETERS_ANNOTATION_MATCHER.matches(annotationTree, state))
             .findFirst();
 
-    if (!parametersAnnotation.isPresent()) {
+    if (parametersAnnotation.isEmpty()) {
       return Description.NO_MATCH;
     }
 
@@ -145,7 +145,7 @@ private static ImmutableSet<String> getMethodIdentifiersInSourceAnnotation(
     Optional<? extends AssignmentTree> paramSourceAssignmentTree =
         getParamAssignmentTree(annotationsArguments, /* parameterName= */ "source");
 
-    if (!paramSourceAssignmentTree.isPresent()) {
+    if (paramSourceAssignmentTree.isEmpty()) {
       return ImmutableSet.of();
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingDefault.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingDefault.java
@@ -56,7 +56,7 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
       return NO_MATCH;
     }
     Optional<? extends CaseTree> maybeDefault = getSwitchDefault(tree);
-    if (!maybeDefault.isPresent()) {
+    if (maybeDefault.isEmpty()) {
       if (isExhaustive(tree)) {
         return NO_MATCH;
       }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java b/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java
@@ -96,7 +96,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
     }
 
     // Don't alert if method is an override (this includes interfaces)
-    if (!streamSuperMethods(methodSymbol, state.getTypes()).findAny().isPresent()
+    if (streamSuperMethods(methodSymbol, state.getTypes()).findAny().isEmpty()
         && DISALLOWED_METHOD_NAME_MATCHER.matches(tree, state)) {
       return describeMatch(tree);
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ProtoTruthMixedDescriptors.java b/core/src/main/java/com/google/errorprone/bugpatterns/ProtoTruthMixedDescriptors.java
@@ -82,8 +82,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     ImmutableSet<TypeSymbol> types =
         arguments.stream()
             .map(t -> protoType(t, state))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
+            .flatMap(Optional::stream)
             .collect(toImmutableSet());
     if (types.size() > 1) {
       return describeMatch(tree);
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java b/core/src/main/java/com/google/errorprone/bugpatterns/RedundantOverride.java
@@ -62,7 +62,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
     Types types = state.getTypes();
     Optional<MethodSymbol> maybeSuperMethod =
         streamSuperMethods(methodSymbol, types).filter(t -> !t.owner.isInterface()).findFirst();
-    if (!maybeSuperMethod.isPresent()) {
+    if (maybeSuperMethod.isEmpty()) {
       return NO_MATCH;
     }
     MethodSymbol superMethod = maybeSuperMethod.get();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/RestrictedApiChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/RestrictedApiChecker.java
@@ -263,7 +263,7 @@ private static Matcher<Tree> shouldAllow(Attribute.Compound api) {
     Optional<Attribute> allowlistAnnotations =
         MoreAnnotations.getValue(api, "allowlistAnnotations");
     // TODO(b/178905039): remove handling of legacy names
-    if (!allowlistAnnotations.isPresent()) {
+    if (allowlistAnnotations.isEmpty()) {
       allowlistAnnotations = MoreAnnotations.getValue(api, "whitelistAnnotations");
     }
     return Matchers.hasAnyAnnotation(
@@ -277,7 +277,7 @@ private static Matcher<Tree> shouldAllowWithWarning(Attribute.Compound api) {
     Optional<Attribute> allowlistWithWarningAnnotations =
         MoreAnnotations.getValue(api, "allowlistWithWarningAnnotations");
     // TODO(b/178905039): remove handling of legacy names
-    if (!allowlistWithWarningAnnotations.isPresent()) {
+    if (allowlistWithWarningAnnotations.isEmpty()) {
       allowlistWithWarningAnnotations =
           MoreAnnotations.getValue(api, "whitelistWithWarningAnnotations");
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StaticMockMember.java b/core/src/main/java/com/google/errorprone/bugpatterns/StaticMockMember.java
@@ -54,7 +54,7 @@ public Description matchVariable(VariableTree varTree, VisitorState state) {
     Optional<SuggestedFix> optionalFix =
         SuggestedFixes.removeModifiers(varTree, state, Modifier.STATIC);
 
-    if (!optionalFix.isPresent()) {
+    if (optionalFix.isEmpty()) {
       return NO_MATCH;
     }
     if (SuggestedFixes.compilesWithFix(optionalFix.get(), state)) {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StringSplitter.java b/core/src/main/java/com/google/errorprone/bugpatterns/StringSplitter.java
@@ -78,12 +78,8 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     if (!MATCHER.matches(tree, state)) {
       return NO_MATCH;
     }
-    Optional<Fix> fix = buildFix(tree, state);
-    if (!fix.isPresent()) {
-      return NO_MATCH;
-    }
     // TODO(b/112270644): skip Splitter fix if guava isn't on the classpath
-    return describeMatch(tree, fix.get());
+    return buildFix(tree, state).map(fix -> describeMatch(tree, fix)).orElse(NO_MATCH);
   }
 
   public Optional<Fix> buildFix(MethodInvocationTree tree, VisitorState state) {
@@ -241,7 +237,7 @@ private static String getMethodAndArgument(
       return onPattern(fix, argSource);
     }
     Optional<String> regexAsLiteral = convertRegexToLiteral(constValue);
-    if (!regexAsLiteral.isPresent()) {
+    if (regexAsLiteral.isEmpty()) {
       // Can't convert the regex to a literal string: have to treat it as a regex.
       return onPattern(fix, argSource);
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/SwitchDefault.java b/core/src/main/java/com/google/errorprone/bugpatterns/SwitchDefault.java
@@ -47,7 +47,7 @@ public class SwitchDefault extends BugChecker implements SwitchTreeMatcher {
   @Override
   public Description matchSwitch(SwitchTree tree, VisitorState state) {
     Optional<? extends CaseTree> maybeDefault = getSwitchDefault(tree);
-    if (!maybeDefault.isPresent()) {
+    if (maybeDefault.isEmpty()) {
       return NO_MATCH;
     }
     // Collect all case trees in the statement group containing the default
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java
@@ -131,14 +131,9 @@ descriptorSymbol, enclosingClass(methodSymbol), state.getTypes(), false)) {
     fixBuilder.merge(trimToMethodDef(tree, state, implementation));
 
     // Replace all uses of the identifier with a method reference.
-    Optional<SuggestedFix> methodReferenceReplacement =
-        replaceUsesWithMethodReference(newName, varSym, implementation, state);
-    if (!methodReferenceReplacement.isPresent()) {
-      return NO_MATCH;
-    }
-    fixBuilder.merge(methodReferenceReplacement.get());
-
-    return describeMatch(tree, fixBuilder.build());
+    return replaceUsesWithMethodReference(newName, varSym, implementation, state)
+        .map(mrr -> describeMatch(tree, fixBuilder.merge(mrr).build()))
+        .orElse(NO_MATCH);
   }
 
   /** Remove anonymous class definition beginning and end, leaving only the method definition. */
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/apidiff/ApiDiffChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/apidiff/ApiDiffChecker.java
@@ -106,7 +106,7 @@ protected Description check(ExpressionTree tree, VisitorState state) {
   }
 
   private boolean classOrEnclosingClassIsForbiddenByAnnotation(Symbol clazz, VisitorState state) {
-    if (!alsoForbidApisAnnotated.isPresent()) {
+    if (alsoForbidApisAnnotated.isEmpty()) {
       return false;
     }
     for (; clazz instanceof ClassSymbol; clazz = clazz.owner) {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java b/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java
@@ -80,7 +80,7 @@ public Description matchIf(IfTree ifTree, VisitorState state) {
 
     // If then-block contains exactly one expression and it is a `log` invocation, extract it.
     Optional<MethodInvocationTree> methodCall = extractLoneLogInvocation(ifTree, state);
-    if (!methodCall.isPresent()) {
+    if (methodCall.isEmpty()) {
       return NO_MATCH;
     }
     MethodInvocationTree logInvocation = methodCall.get();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullablePrimitiveArray.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullablePrimitiveArray.java
@@ -126,7 +126,7 @@ private static boolean isTypeAnnotation(Attribute.Compound attribute) {
     }
     Set<String> targets = new HashSet<>();
     Optional<Attribute> value = MoreAnnotations.getValue(attribute, "value");
-    if (!value.isPresent()) {
+    if (value.isEmpty()) {
       return false;
     }
     new SimpleAnnotationValueVisitor8<Void, Void>() {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByUtils.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByUtils.java
@@ -119,7 +119,7 @@ public static GuardedByValidationResult isGuardedByValid(Tree tree, VisitorState
     for (String guard : guards) {
       Optional<GuardedByExpression> boundGuard =
           GuardedByBinder.bindString(guard, GuardedBySymbolResolver.from(tree, state));
-      if (!boundGuard.isPresent()) {
+      if (boundGuard.isEmpty()) {
         return GuardedByValidationResult.invalid("could not resolve guard");
       }
       boundGuards.add(boundGuard.get());
@@ -151,12 +151,9 @@ public static GuardedByValidationResult isGuardedByValid(Tree tree, VisitorState
 
   public static @Nullable Symbol bindGuardedByString(
       Tree tree, String guard, VisitorState visitorState) {
-    Optional<GuardedByExpression> bound =
-        GuardedByBinder.bindString(guard, GuardedBySymbolResolver.from(tree, visitorState));
-    if (!bound.isPresent()) {
-      return null;
-    }
-    return bound.get().sym();
+    return GuardedByBinder.bindString(guard, GuardedBySymbolResolver.from(tree, visitorState))
+        .map(bound -> bound.sym())
+        .orElse(null);
   }
 
   private GuardedByUtils() {}
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableRefactoring.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ImmutableRefactoring.java
diff --git a/core/src/main/java/com/google/errorprone/refaster/Template.java b/core/src/main/java/com/google/errorprone/refaster/Template.java
diff --git a/core/src/main/java/com/google/errorprone/refaster/Unifier.java b/core/src/main/java/com/google/errorprone/refaster/Unifier.java
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinderTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinderTest.java

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public static Optional<Nullness> getUpperBound(TypeVariable typeVar) {`
`211`	`211`
`212`	`212`	`// If the type variable doesn't have an explicit bound, see if its declaration is in the scope`
`213`	`213`	`// of a default and use that as the bound.`
`214`		`- return result.isPresent() ? result : fromDefaultAnnotations(typeVar.asElement());`
	`214`	`+ return result.or(() -> fromDefaultAnnotations(typeVar.asElement()));`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`private static Optional<Nullness> fromAnnotationStream(`
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ public static Matcher<ExpressionTree> compile(Iterable<Rule> rules) {`
`483`	`483`	`// First collect all the nodes that accept any token at all`
`484`	`484`	`for (Node node : curr) {`
`485`	`485`	`for (Map.Entry<Optional<Token>, Node> entry : nfa.row(node).entrySet()) {`
`486`		`- if (!entry.getKey().isPresent()) {`
	`486`	`+ if (entry.getKey().isEmpty()) {`
`487`	`487`	`acceptsAny.add(entry.getValue());`
`488`	`488`	`}`
`489`	`489`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private static ImmutableList<Commented<ExpressionTree>> findCommentsForArguments`
`111`	`111`
`112`	`112`	`CharSequence sourceCode = state.getSourceCode();`
`113`	`113`	`Optional<Integer> endPosition = computeEndPosition(tree, sourceCode, state);`
`114`		`- if (!endPosition.isPresent()) {`
	`114`	`+ if (endPosition.isEmpty()) {`
`115`	`115`	`return noComments(arguments);`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static class ComputeEndPosition extends BugChecker implements MethodInvoc`
`54`	`54`	`public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {`
`55`	`55`	`CharSequence sourceCode = state.getSourceCode();`
`56`	`56`	`Optional<Integer> endPosition = Comments.computeEndPosition(tree, sourceCode, state);`
`57`		`- if (!endPosition.isPresent()) {`
	`57`	`+ if (endPosition.isEmpty()) {`
`58`	`58`	`return Description.NO_MATCH;`
`59`	`59`	`}`
`60`	`60`	`int startPosition = endPosition.get();`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState`
`91`	`91`	`}`
`92`	`92`	`Optional<JCCatch> maybeCatchTree =`
`93`	`93`	`catchesType(tryStatement, state.getSymtab().assertionErrorType, state);`
`94`		`- if (!maybeCatchTree.isPresent()) {`
	`94`	`+ if (maybeCatchTree.isEmpty()) {`
`95`	`95`	`return NO_MATCH;`
`96`	`96`	`}`
`97`	`97`	`JCCatch catchTree = maybeCatchTree.get();`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {`
`229`	`229`	`Arrays.stream(CollectionTypes.values())`
`230`	`230`	`.filter(type -> type.constructorMatcher.matches(tree, state))`
`231`	`231`	`.findFirst();`
`232`		`- if (!collectionType.isPresent()) {`
	`232`	`+ if (collectionType.isEmpty()) {`
`233`	`233`	`return NO_MATCH;`
`234`	`234`	`}`
`235`	`235`	`Description.Builder description = buildDescription(tree);`