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

svc-excavator-bot · bulldozer-bot[bot] · commit 16bb99f2b0a0 · 2019-10-17T22:18:39.000Z
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -84,11 +84,13 @@
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
             <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
                 java.util.Collections.*,
                 java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.0.0'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.1.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.21.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.24.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java
@@ -96,9 +96,8 @@ static class State {
         public JavaFormatterOptions.Style style = JavaFormatterOptions.Style.PALANTIR;
 
         public void setImplementationClassPath(@Nullable List<String> value) {
-            implementationClassPath =
-                    Optional.ofNullable(value)
-                            .map(strings -> strings.stream().map(URI::create).collect(Collectors.toList()));
+            implementationClassPath = Optional.ofNullable(value)
+                    .map(strings -> strings.stream().map(URI::create).collect(Collectors.toList()));
         }
 
         public List<String> getImplementationClassPath() {
diff --git a/palantir-java-format-api/src/main/java/com/palantir/javaformat/java/FormatterDiagnostic.java b/palantir-java-format-api/src/main/java/com/palantir/javaformat/java/FormatterDiagnostic.java
@@ -60,6 +60,7 @@ public String message() {
         return message;
     }
 
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (lineNumber >= 0) {
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java b/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java
@@ -161,7 +161,7 @@ private void add(Op op) {
         } else if (op instanceof CloseOp) {
             depth--;
             if (depth < 0) {
-                throw new AssertionError();
+                throw new IllegalStateException();
             }
         }
         ops.add(op);
@@ -508,9 +508,8 @@ public final ImmutableList<Op> build() {
                             if (tokBefore.isJavadocComment()) {
                                 tokOps.put(j, Break.makeForced());
                             }
-                            allowBlankAfterLastComment =
-                                    tokBefore.isSlashSlashComment()
-                                            || (tokBefore.isSlashStarComment() && !tokBefore.isJavadocComment());
+                            allowBlankAfterLastComment = tokBefore.isSlashSlashComment()
+                                    || (tokBefore.isSlashStarComment() && !tokBefore.isJavadocComment());
                         }
                     }
                     if (allowBlankAfterLastComment && newlines > 1) {
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java b/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java
@@ -356,15 +356,13 @@ private State computeBroken(CommentsHelper commentsHelper, int maxWidth, State s
             state = state.withBrokenLevel();
         }
 
-        state =
-                computeBreakAndSplit(
-                        commentsHelper, maxWidth, state, /* optBreakDoc= */ Optional.empty(), splits.get(0));
+        state = computeBreakAndSplit(
+                commentsHelper, maxWidth, state, /* optBreakDoc= */ Optional.empty(), splits.get(0));
 
         // Handle following breaks and split.
         for (int i = 0; i < breaks.size(); i++) {
-            state =
-                    computeBreakAndSplit(
-                            commentsHelper, maxWidth, state, Optional.of(breaks.get(i)), splits.get(i + 1));
+            state = computeBreakAndSplit(
+                    commentsHelper, maxWidth, state, Optional.of(breaks.get(i)), splits.get(i + 1));
         }
         return state;
     }
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java
@@ -53,6 +53,7 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.PeekingIterator;
 import com.google.common.collect.Streams;
@@ -483,7 +484,7 @@ public boolean visitArrayInitializer(List<? extends ExpressionTree> expressions)
             token("{");
             builder.forcedBreak();
             boolean first = true;
-            for (Iterable<? extends ExpressionTree> row : Iterables.partition(expressions, cols)) {
+            for (Iterable<? extends ExpressionTree> row : Lists.partition(expressions, cols)) {
                 if (!first) {
                     builder.forcedBreak();
                 }
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java
@@ -105,10 +105,8 @@ public ImmutableList<Replacement> format(
         ranges = offsetRanges(ranges, wrapper.offset);
 
         String replacement = formatter.formatSource(wrapper.contents.toString(), ranges);
-        replacement =
-                replacement.substring(
-                        wrapper.offset,
-                        replacement.length() - (wrapper.contents.length() - wrapper.offset - source.length()));
+        replacement = replacement.substring(
+                wrapper.offset, replacement.length() - (wrapper.contents.length() - wrapper.offset - source.length()));
 
         return toReplacements(source, replacement).stream().filter(r -> rangeSet.encloses(r.getReplaceRange())).collect(
                 toImmutableList());
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/Trees.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/Trees.java
@@ -105,7 +105,7 @@ static ClassTree getEnclosingTypeDeclaration(TreePath path) {
                     break;
             }
         }
-        throw new AssertionError();
+        throw new IllegalStateException();
     }
 
     /** Skips a single parenthesized tree. */
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/TypeNameClassifier.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/TypeNameClassifier.java
@@ -43,7 +43,7 @@ public TyParseState next(JavaCaseFormat n) {
                     case UPPER_CAMEL:
                         return TyParseState.TYPE;
                 }
-                throw new AssertionError();
+                throw new IllegalStateException();
             }
         },
 
@@ -59,7 +59,7 @@ public TyParseState next(JavaCaseFormat n) {
                     case UPPER_CAMEL:
                         return TyParseState.TYPE;
                 }
-                throw new AssertionError();
+                throw new IllegalStateException();
             }
         },
 
@@ -92,7 +92,7 @@ public TyParseState next(JavaCaseFormat n) {
                     case UPPER_CAMEL:
                         return TyParseState.TYPE;
                 }
-                throw new AssertionError();
+                throw new IllegalStateException();
             }
         };
 
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocFormatter.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocFormatter.java
@@ -138,7 +138,7 @@ private String render(List<Token> input, int blockIndent) {
                     throw new AssertionError(token.getType());
             }
         }
-        throw new AssertionError();
+        throw new IllegalStateException();
     }
 
     /*
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocLexer.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocLexer.java
@@ -235,7 +235,7 @@ private Type consumeToken() throws LexException {
         } else if (input.tryConsumeRegex(LITERAL_PATTERN)) {
             return LITERAL;
         }
-        throw new AssertionError();
+        throw new IllegalStateException();
     }
 
     private boolean preserveExistingFormatting() {
diff --git a/palantir-java-format/src/test/java/com/palantir/javaformat/java/ArrayDimensionTest.java b/palantir-java-format/src/test/java/com/palantir/javaformat/java/ArrayDimensionTest.java
@@ -18,7 +18,7 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.palantir.javaformat.jupiter.ParameterizedClass;
 import java.util.Arrays;
 import org.junit.jupiter.api.TestTemplate;
@@ -77,7 +77,7 @@ public static Iterable<Object[]> parameters() {
             "List<int @A [] @B []> xs;",
             "List<int[] @A [][] @B []> xs;",
         };
-        return Iterables.transform(Arrays.asList(inputs), input -> new Object[] {input});
+        return Lists.transform(Arrays.asList(inputs), input -> new Object[] {input});
     }
 
     private final String input;

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public String message() {`
`60`	`60`	`return message;`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ @Override`
`63`	`64`	`public String toString() {`
`64`	`65`	`StringBuilder sb = new StringBuilder();`
`65`	`66`	`if (lineNumber >= 0) {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private void add(Op op) {`
`161`	`161`	`} else if (op instanceof CloseOp) {`
`162`	`162`	`depth--;`
`163`	`163`	`if (depth < 0) {`
`164`		`- throw new AssertionError();`
	`164`	`+ throw new IllegalStateException();`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`ops.add(op);`
`@@ -508,9 +508,8 @@ public final ImmutableList<Op> build() {`
`508`	`508`	`if (tokBefore.isJavadocComment()) {`
`509`	`509`	`tokOps.put(j, Break.makeForced());`
`510`	`510`	`}`
`511`		`- allowBlankAfterLastComment =`
`512`		`- tokBefore.isSlashSlashComment()`
`513`		`- \|\| (tokBefore.isSlashStarComment() && !tokBefore.isJavadocComment());`
	`511`	`+ allowBlankAfterLastComment = tokBefore.isSlashSlashComment()`
	`512`	`+ \|\| (tokBefore.isSlashStarComment() && !tokBefore.isJavadocComment());`
`514`	`513`	`}`
`515`	`514`	`}`
`516`	`515`	`if (allowBlankAfterLastComment && newlines > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -356,15 +356,13 @@ private State computeBroken(CommentsHelper commentsHelper, int maxWidth, State s`
`356`	`356`	`state = state.withBrokenLevel();`
`357`	`357`	`}`
`358`	`358`
`359`		`- state =`
`360`		`- computeBreakAndSplit(`
`361`		`- commentsHelper, maxWidth, state, /* optBreakDoc= */ Optional.empty(), splits.get(0));`
	`359`	`+ state = computeBreakAndSplit(`
	`360`	`+ commentsHelper, maxWidth, state, /* optBreakDoc= */ Optional.empty(), splits.get(0));`
`362`	`361`
`363`	`362`	`// Handle following breaks and split.`
`364`	`363`	`for (int i = 0; i < breaks.size(); i++) {`
`365`		`- state =`
`366`		`- computeBreakAndSplit(`
`367`		`- commentsHelper, maxWidth, state, Optional.of(breaks.get(i)), splits.get(i + 1));`
	`364`	`+ state = computeBreakAndSplit(`
	`365`	`+ commentsHelper, maxWidth, state, Optional.of(breaks.get(i)), splits.get(i + 1));`
`368`	`366`	`}`
`369`	`367`	`return state;`
`370`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static ClassTree getEnclosingTypeDeclaration(TreePath path) {`
`105`	`105`	`break;`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`- throw new AssertionError();`
	`108`	`+ throw new IllegalStateException();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/** Skips a single parenthesized tree. */`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public TyParseState next(JavaCaseFormat n) {`
`43`	`43`	`case UPPER_CAMEL:`
`44`	`44`	`return TyParseState.TYPE;`
`45`	`45`	`}`
`46`		`- throw new AssertionError();`
	`46`	`+ throw new IllegalStateException();`
`47`	`47`	`}`
`48`	`48`	`},`
`49`	`49`
`@@ -59,7 +59,7 @@ public TyParseState next(JavaCaseFormat n) {`
`59`	`59`	`case UPPER_CAMEL:`
`60`	`60`	`return TyParseState.TYPE;`
`61`	`61`	`}`
`62`		`- throw new AssertionError();`
	`62`	`+ throw new IllegalStateException();`
`63`	`63`	`}`
`64`	`64`	`},`
`65`	`65`
`@@ -92,7 +92,7 @@ public TyParseState next(JavaCaseFormat n) {`
`92`	`92`	`case UPPER_CAMEL:`
`93`	`93`	`return TyParseState.TYPE;`
`94`	`94`	`}`
`95`		`- throw new AssertionError();`
	`95`	`+ throw new IllegalStateException();`
`96`	`96`	`}`
`97`	`97`	`};`
`98`	`98`