Excavator: Upgrades Baseline to the latest version (#1308)

Author: svc-excavator-bot

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.29.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.32.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java

@@ -39,6 +39,7 @@ public FormatterService serviceLoad() {
         return memoizedService.get();
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private FormatterService serviceLoadInternal() {
         URL[] jarUris = configuration.getFiles().stream()
                 .map(file -> {

palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java

@@ -50,13 +50,15 @@ public final class OpsBuilder {
     /** Return the actual size of the AST node at position, including comments. */
     public int actualSize(int position, int length) {
         Input.Token startToken = input.getPositionTokenMap().get(position);
+        @SuppressWarnings("for-rollout:NullAway")
         int start = startToken.getTok().getPosition();
         for (Input.Tok tok : startToken.getToksBefore()) {
             if (tok.isComment()) {
                 start = Math.min(start, tok.getPosition());
             }
         }
         Input.Token endToken = input.getPositionTokenMap().get(position + length - 1);
+        @SuppressWarnings("for-rollout:NullAway")
         int end = endToken.getTok().getPosition() + endToken.getTok().length();
         for (Input.Tok tok : endToken.getToksAfter()) {
             if (tok.isComment()) {
@@ -69,6 +71,7 @@ public int actualSize(int position, int length) {
     /** Return the start column of the token at {@code position}, including leading comments. */
     public Integer actualStartColumn(int position) {
         Input.Token startToken = input.getPositionTokenMap().get(position);
+        @SuppressWarnings("for-rollout:NullAway")
         int start = startToken.getTok().getPosition();
         int line0 = input.getLineNumber(start);
         for (Input.Tok tok : startToken.getToksBefore()) {

palantir-java-format/src/main/java/com/palantir/javaformat/doc/Comment.java

@@ -87,6 +87,7 @@ protected Range<Integer> computeRange() {
     public State computeBreaks(
             CommentsHelper commentsHelper, int maxWidth, State state, Obs.ExplorationNode observationNode) {
         String text = commentsHelper.rewrite(tok, maxWidth, state.column());
+        @SuppressWarnings("for-rollout:NullAway")
         int firstLineLength = text.length() - Iterators.getLast(Newlines.lineOffsetIterator(text));
         return state.withColumn(state.column() + firstLineLength)
                 .addNewLines(Iterators.size(Newlines.lineOffsetIterator(text)))

palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java

@@ -337,6 +337,7 @@ private Optional<State> tryInlinePrefixOntoCurrentLine(
                 commentsHelper, maxWidth, newState, memoizedSplitsBreaks.get(), explorationNode));
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private Optional<State> tryBreakLastLevel(
             CommentsHelper commentsHelper,
             int maxWidth,
@@ -351,6 +352,7 @@ private Optional<State> tryBreakLastLevel(
         return tryBreakInnerLevel(commentsHelper, maxWidth, state, explorationNode, innerLevel, isSimpleInliningSoFar);
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private Optional<State> tryInlineSuffix(
             CommentsHelper commentsHelper,
             int maxWidth,
@@ -470,6 +472,7 @@ private static Optional<State> tryBreakInnerLevel_acceptInlineChain(
                 .markAccepted());
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private static Optional<State> tryBreakInnerLevel_checkInner(
             CommentsHelper commentsHelper,
             int maxWidth,

palantir-java-format/src/main/java/com/palantir/javaformat/java/ImportOrderer.java

@@ -93,6 +93,7 @@ private String reorderImports() throws FormatterException {
         tail.add(CharMatcher.whitespace().trimLeadingFrom(tokString(afterLastImport, toks.size())));
         if (!toks.isEmpty()) {
             Tok lastTok = getLast(toks);
+            @SuppressWarnings("for-rollout:NullAway")
             int tailStart = lastTok.getPosition() + lastTok.length();
             tail.add(text.substring(tailStart));
         }

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java

@@ -331,6 +331,7 @@ public String getLineSeparator() {
     }
 
     /** Lex the input and build the list of toks. */
+    @SuppressWarnings("for-rollout:NullAway")
     private ImmutableList<Tok> buildToks(String text) throws FormatterException {
         ImmutableList<Tok> toks = buildToks(text, ImmutableSet.of());
         kN = getLast(toks).getIndex();
@@ -462,6 +463,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
         return ImmutableList.copyOf(toks);
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private static int updateColumn(int columnI, String originalTokText) {
         Integer last = Iterators.getLast(Newlines.lineOffsetIterator(originalTokText));
         if (last > 0) {
@@ -556,6 +558,7 @@ private static boolean isParamComment(Tok tok) {
      * @return the {@code 0}-based {@link Range} of tokens
      * @throws FormatterException on formatting errors
      */
+    @SuppressWarnings("for-rollout:NullAway")
     Range<Integer> characterRangeToTokenRange(int offset, int length) throws FormatterException {
         int requiredLength = offset + length;
         if (requiredLength > text.length()) {

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -997,6 +997,7 @@ private TypeWithDims variableFragmentDims(boolean first, int leadingDims, Tree t
                 null, leadingDims > 0 ? dims.dims.subList(0, dims.dims.size() - leadingDims) : dims.dims);
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     @Override
     public Void visitForLoop(ForLoopTree node, Void unused) {
         sync(node);
@@ -1622,6 +1623,7 @@ private static List<Long> handleStream(List<ExpressionTree> parts) {
                 .collect(toList());
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private static <T> Stream<Long> indexes(Stream<T> stream, Predicate<T> predicate) {
         return Streams.mapWithIndex(stream, (x, i) -> predicate.apply(x) ? i : -1)
                 .filter(x -> x != -1);
@@ -1802,6 +1804,7 @@ public Void visitReturn(ReturnTree node, Void unused) {
     }
 
     // TODO(cushon): is this worth special-casing?
+    @SuppressWarnings("for-rollout:NullAway")
     boolean visitSingleMemberAnnotation(AnnotationTree node) {
         if (node.getArguments().size() != 1) {
             return false;
@@ -2172,6 +2175,7 @@ private void visitStatement(
         }
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     protected void visitStatements(List<? extends StatementTree> statements, boolean inlineFirst) {
         boolean first = true;
         PeekingIterator<StatementTree> it = Iterators.peekingIterator(statements.iterator());
@@ -2186,6 +2190,7 @@ protected void visitStatements(List<? extends StatementTree> statements, boolean
             }
             markForPartialFormat();
             first = false;
+            @SuppressWarnings("for-rollout:NullAway")
             List<VariableTree> fragments = variableFragments(it, tree);
             if (!fragments.isEmpty()) {
                 visitVariables(
@@ -2820,6 +2825,7 @@ private void visitRegularDot(List<ExpressionTree> items, boolean needDot) {
     //             .happens())
     //     .thenReturn(result);
     //
+    @SuppressWarnings("for-rollout:NullAway")
     private boolean fillFirstArgument(ExpressionTree e, List<ExpressionTree> items, Indent indent) {
         // is there a trailing dereference?
         if (items.size() < 2) {
@@ -2860,6 +2866,7 @@ private boolean fillFirstArgument(ExpressionTree e, List<ExpressionTree> items,
     private void visitDotWithPrefix(
             List<ExpressionTree> items, boolean needDot, Collection<Integer> prefixes, FillMode prefixFillMode) {
         // Are there method invocations or field accesses after the prefix?
+        @SuppressWarnings("for-rollout:NullAway")
         boolean trailingDereferences = !prefixes.isEmpty() && getLast(prefixes) < items.size() - 1;
 
         boolean hasMethodInvocations = items.stream().anyMatch(expr -> expr.getKind() == METHOD_INVOCATION);
@@ -3253,12 +3260,14 @@ public void scan(JCTree tree) {
     }
 
     /** Returns the number of columns if the arguments arg laid out in a grid, or else {@code -1}. */
+    @SuppressWarnings("for-rollout:NullAway")
     private int argumentsAreTabular(List<? extends ExpressionTree> arguments) {
         if (arguments.isEmpty()) {
             return -1;
         }
         List<List<ExpressionTree>> rows = new ArrayList<>();
         PeekingIterator<ExpressionTree> it = Iterators.peekingIterator(arguments.iterator());
+        @SuppressWarnings("for-rollout:NullAway")
         int start0 = actualColumn(it.peek());
         {
             List<ExpressionTree> row = new ArrayList<>();
@@ -3276,6 +3285,7 @@ private int argumentsAreTabular(List<? extends ExpressionTree> arguments) {
         }
         while (it.hasNext()) {
             List<ExpressionTree> row = new ArrayList<>();
+            @SuppressWarnings("for-rollout:NullAway")
             int start = actualColumn(it.peek());
             if (start != start0) {
                 return -1;
@@ -3338,6 +3348,7 @@ private Integer actualColumn(ExpressionTree expression) {
     }
 
     /** How many lines does this node take up in the input. Returns at least 1. */
+    @SuppressWarnings("for-rollout:NullAway")
     int lineSpan(Tree node) {
         ImmutableRangeMap<Integer, ? extends Input.Token> positionTokenMap =
                 builder.getInput().getPositionTokenMap();
@@ -3646,6 +3657,7 @@ protected void addBodyDeclarations(
                 Tree bodyDeclaration = it.next();
                 dropEmptyDeclarations();
                 builder.forcedBreak();
+                @SuppressWarnings("for-rollout:NullAway")
                 boolean thisOneGetsBlankLineBefore =
                         bodyDeclaration.getKind() != VARIABLE || hasJavaDoc(bodyDeclaration);
                 if (first) {
@@ -3712,6 +3724,7 @@ private void classDeclarationTypeList(String token, List<? extends Tree> types)
      *
      * <p>e.g. {@code int x, y;} is parsed as {@code int x; int y;}.
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private List<VariableTree> variableFragments(PeekingIterator<? extends Tree> it, Tree first) {
         List<VariableTree> fragments = new ArrayList<>();
         if (first.getKind() == VARIABLE) {
@@ -3748,6 +3761,7 @@ private boolean hasTrailingToken(Input input, List<? extends Tree> nodes, String
             return false;
         }
         Tree lastNode = getLast(nodes);
+        @SuppressWarnings("for-rollout:NullAway")
         Optional<? extends Input.Token> nextToken = getNextToken(input, getEndPosition(lastNode, getCurrentPath()));
         return nextToken.isPresent() && nextToken.get().getTok().getText().equals(token);
     }

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaOutput.java

@@ -292,6 +292,7 @@ public ImmutableList<Replacement> getFormatReplacements(RangeSet<Integer> iRange
      * @param iRange the {@link Range} of tokens
      * @return the expanded token range
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private Range<Integer> expandToBreakableRegions(Range<Integer> iRange) {
         // The original line range.
         int loTok = iRange.lowerEndpoint();

palantir-java-format/src/main/java/com/palantir/javaformat/java/StringWrapper.java

@@ -113,6 +113,7 @@ private static ImmutableSet<Range<Integer>> rangesAfterAppliedReplacements(
         return outputRanges.build();
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private static TreeRangeMap<Integer, String> getReflowReplacements(int columnLimit, final String input)
             throws FormatterException {
         JCTree.JCCompilationUnit unit = parse(input, /* allowStringFolding= */ false);
@@ -173,6 +174,7 @@ public Void visitLiteral(LiteralTree literalTree, Void aVoid) {
 
             // Handling leaving trailing non-string tokens at the end of the literal,
             // e.g. the trailing `);` in `foo("...");`.
+            @SuppressWarnings("for-rollout:NullAway")
             int end = getEndPosition(unit, getLast(flat));
             int lineEnd = end;
             while (Newlines.hasNewlineAt(input, lineEnd) == -1) {

palantir-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java

@@ -252,6 +252,7 @@ public Void visitInstanceOf(InstanceOfTree node, Void unused) {
         return null;
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     @Override
     public Void visitCase(CaseTree node, Void unused) {
         sync(node);

palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocLexer.java

@@ -261,6 +261,7 @@ private void checkMatchingTags() throws LexException {
      *
      * <p>Note that we do <i>not</i> merge a literal token and a whitespace token together.
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private static ImmutableList<Token> joinAdjacentLiteralsAndAdjacentWhitespace(List<Token> input) {
         /*
          * Note: Our final token is always END_JAVADOC. This saves us some trouble:
@@ -275,6 +276,7 @@ private static ImmutableList<Token> joinAdjacentLiteralsAndAdjacentWhitespace(Li
         boolean lastTagWasInlineTagStart = false;
 
         for (PeekingIterator<Token> tokens = peekingIterator(input.iterator()); tokens.hasNext(); ) {
+            @SuppressWarnings("for-rollout:NullAway")
             Token.Type nextType = tokens.peek().getType();
             if (nextType == INLINE_TAG_OPEN) {
                 inlineTagDepth.increment();
@@ -345,6 +347,7 @@ private static ImmutableList<Token> joinAdjacentLiteralsAndAdjacentWhitespace(Li
      * <p>This method must be called after {@link #joinAdjacentLiteralsAndAdjacentWhitespace}, as it assumes that
      * adjacent whitespace tokens have already been joined.
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private static ImmutableList<Token> inferParagraphTags(List<Token> input) {
         ImmutableList.Builder<Token> output = ImmutableList.builder();
 
@@ -383,6 +386,7 @@ && hasMultipleNewlines(tokens.peek().getValue())) {
      * <p>This method must be called after {@link #joinAdjacentLiteralsAndAdjacentWhitespace}, as it assumes that
      * adjacent whitespace tokens have already been joined.
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private static ImmutableList<Token> optionalizeSpacesAfterLinks(List<Token> input) {
         ImmutableList.Builder<Token> output = ImmutableList.builder();
 
@@ -412,6 +416,7 @@ private static ImmutableList<Token> optionalizeSpacesAfterLinks(List<Token> inpu
      *
      * <p>Also trim leading and trailing blank lines, and move the trailing `}` to its own line.
      */
+    @SuppressWarnings("for-rollout:NullAway")
     private static ImmutableList<Token> deindentPreCodeBlocks(List<Token> input) {
         ImmutableList.Builder<Token> output = ImmutableList.builder();
         for (PeekingIterator<Token> tokens = peekingIterator(input.iterator()); tokens.hasNext(); ) {

palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocWriter.java

@@ -271,6 +271,7 @@ private void requestNewline() {
         requestWhitespace(NEWLINE);
     }
 
+    @SuppressWarnings("for-rollout:NullAway")
     private void requestWhitespace(RequestedWhitespace requestedWhitespace) {
         this.requestedWhitespace = Ordering.natural().max(requestedWhitespace, this.requestedWhitespace);
     }