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

svc-excavator-bot · dansanduleac · commit 37d960318a48 · 2018-08-23T13:38:08.000+01:00
* Excavator: Upgrades Baseline to the latest version

* Be more checkstylish
diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -16,16 +16,10 @@
     <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
     <suppress files="package-info.java" checks="JavadocStyle" />
 
-    <!-- Copied Guava classes. -->
-    <suppress files="[/\\]src[/\\].*(Preconditions.java)" checks="." />
-    <suppress files="[/\\]src[/\\].*(HostAndPort.java)" checks="." />
-
     <!-- non-code classes -->
     <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="FileTabCharacter" />
     <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="NewlineAtEndOfFile" />
 
     <!-- Generated code should not be subjected to checkstyle. -->
-    <suppress files="[/\\].*[/\\]generated_src[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated_testSrc[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated[/\\]" checks="." />
+    <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="." />
 </suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -124,9 +124,17 @@
             <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
         </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
-            <property name="illegalPkgs" value="sun, org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <property name="illegalPkgs" value="org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava, com.clearspring.analytics.util, org.spark_project.guava"/>
             <message key="import.illegal" value="Must not import repackaged classes."/>
         </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="^org\.gradle\..*internal"/>
+            <message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="sun"/>
+            <message key="import.illegal" value="Must not use Oracle's Java implementation details. See http://www.oracle.com/technetwork/java/faq-sun-packages-142232.html ."/>
+        </module>
         <module name="IllegalImport">
             <property name="illegalPkgs" value="org.apache.commons.lang"/>
             <message key="import.illegal" value="lang is deprecated, use lang3 instead."/>
@@ -155,7 +163,7 @@
             <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
         </module>
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
-            <property name="illegalClassNames" value="java.util.HashSet, java.util.HashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+            <property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
         </module>
         <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
             <property name="groups" value="/.*/"/>
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
@@ -55,6 +55,7 @@
         <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
         <option name="METHOD_PARAMETERS_WRAP" value="1" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
         <option name="OTHER_INDENT_OPTIONS">
           <value>
             <option name="INDENT_SIZE" value="4" />
@@ -66,7 +67,7 @@
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
             <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
-         </option>
+        </option>
         <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
           <value />
         </option>
@@ -100,7 +101,10 @@
           <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
           <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
           <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="LINE_COMMENT_ADD_SPACE" value="true" />
           <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
           <option name="RESOURCE_LIST_WRAP" value="5" />
           <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:5.0.6'
         classpath 'com.netflix.nebula:nebula-dependency-recommender:6.0.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.20.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.24.0'
         classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'
     }
 }
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    baseline 'com.palantir.baseline:gradle-baseline-java-config:0.20.1@zip'
+    baseline 'com.palantir.baseline:gradle-baseline-java-config:0.24.0@zip'
 }
 
 allprojects {
diff --git a/errors/src/main/java/com/palantir/remoting/api/errors/ServiceException.java b/errors/src/main/java/com/palantir/remoting/api/errors/ServiceException.java
@@ -121,7 +121,7 @@ private static String renderNoArgsMessage(ErrorType errorType) {
     }
 
     private static List<Arg<?>> collectArgs(ErrorType errorType, Arg<?>... args) {
-        ArrayList<Arg<?>> argList = new ArrayList<>(args.length + 1);
+        List<Arg<?>> argList = new ArrayList<>(args.length + 1);
         argList.add(SafeArg.of(ERROR_TYPE_ARG_NAME, errorType));
         Collections.addAll(argList, args);
         return Collections.unmodifiableList(argList);
diff --git a/service-config/src/main/java/com/palantir/remoting/api/config/service/HostAndPort.java b/service-config/src/main/java/com/palantir/remoting/api/config/service/HostAndPort.java
@@ -21,9 +21,6 @@
 
 package com.palantir.remoting.api.config.service;
 
-import static com.palantir.remoting.api.config.service.Preconditions.checkArgument;
-import static com.palantir.remoting.api.config.service.Preconditions.checkNotNull;
-
 /** See Guava's {@code HostAndPort}. */
 public final class HostAndPort {
     /** Magic value indicating the absence of a port number. */
@@ -32,7 +29,7 @@ public final class HostAndPort {
     /** Hostname, IPv4/IPv6 literal, or unvalidated nonsense. */
     private final String host;
 
-    /** Validated port number in the range [0..65535], or NO_PORT */
+    /** Validated port number in the range [0..65535], or NO_PORT. */
     private final int port;
 
     private HostAndPort(String host, int port) {
@@ -46,7 +43,7 @@ boolean hasPort() {
     }
 
     public static HostAndPort fromString(String hostPortString) {
-        checkNotNull(hostPortString, "hostPortString");
+        Preconditions.checkNotNull(hostPortString, "hostPortString");
         String host;
         String portString = null;
 
@@ -70,13 +67,13 @@ public static HostAndPort fromString(String hostPortString) {
         if (portString != null && portString.length() > 0) {
             // Try to parse the whole port string as a number.
             // JDK7 accepts leading plus signs. We don't want to.
-            checkArgument(!portString.startsWith("+"), "Unparseable port number: %s", hostPortString);
+            Preconditions.checkArgument(!portString.startsWith("+"), "Unparseable port number: %s", hostPortString);
             try {
                 port = Integer.parseInt(portString);
             } catch (NumberFormatException e) {
                 throw new IllegalArgumentException("Unparseable port number: " + hostPortString);
             }
-            checkArgument(isValidPort(port), "Port number out of range: %s", hostPortString);
+            Preconditions.checkArgument(isValidPort(port), "Port number out of range: %s", hostPortString);
         }
 
         return new HostAndPort(host, port);
@@ -85,21 +82,21 @@ public static HostAndPort fromString(String hostPortString) {
     private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
         int colonIndex = 0;
         int closeBracketIndex = 0;
-        checkArgument(hostPortString.charAt(0) == '[',
+        Preconditions.checkArgument(hostPortString.charAt(0) == '[',
                 "Bracketed host-port string must start with a bracket: %s", hostPortString);
         colonIndex = hostPortString.indexOf(':');
         closeBracketIndex = hostPortString.lastIndexOf(']');
-        checkArgument(colonIndex > -1 && closeBracketIndex > colonIndex,
+        Preconditions.checkArgument(colonIndex > -1 && closeBracketIndex > colonIndex,
                 "Invalid bracketed host/port: %s", hostPortString);
 
         String host = hostPortString.substring(1, closeBracketIndex);
         if (closeBracketIndex + 1 == hostPortString.length()) {
             return new String[] {host, ""};
         } else {
-            checkArgument(hostPortString.charAt(closeBracketIndex + 1) == ':',
+            Preconditions.checkArgument(hostPortString.charAt(closeBracketIndex + 1) == ':',
                     "Only a colon may follow a close bracket: %s", hostPortString);
             for (int i = closeBracketIndex + 2; i < hostPortString.length(); ++i) {
-                checkArgument(Character.isDigit(hostPortString.charAt(i)),
+                Preconditions.checkArgument(Character.isDigit(hostPortString.charAt(i)),
                         "Port must be numeric: %s", hostPortString);
             }
             return new String[] {host, hostPortString.substring(closeBracketIndex + 2)};
diff --git a/service-config/src/main/java/com/palantir/remoting/api/config/service/Preconditions.java b/service-config/src/main/java/com/palantir/remoting/api/config/service/Preconditions.java
@@ -62,31 +62,31 @@ static <T> T checkNotNull(T reference, String errorMessageTemplate, Object... er
         return reference;
     }
 
-    private static String format(String template, Object... args) {
-        template = String.valueOf(template); // null -> "null"
+    private static String format(String template0, Object... args) {
+        String template = String.valueOf(template0); // null -> "null"
 
         // start substituting the arguments into the '%s' placeholders
         StringBuilder builder = new StringBuilder(template.length() + 16 * args.length);
         int templateStart = 0;
-        int i = 0;
-        while (i < args.length) {
+        int index = 0;
+        while (index < args.length) {
             int placeholderStart = template.indexOf("%s", templateStart);
             if (placeholderStart == -1) {
                 break;
             }
             builder.append(template.substring(templateStart, placeholderStart));
-            builder.append(args[i++]);
+            builder.append(args[index++]);
             templateStart = placeholderStart + 2;
         }
         builder.append(template.substring(templateStart));
 
         // if we run out of placeholders, append the extra args in square braces
-        if (i < args.length) {
+        if (index < args.length) {
             builder.append(" [");
-            builder.append(args[i++]);
-            while (i < args.length) {
+            builder.append(args[index++]);
+            while (index < args.length) {
                 builder.append(", ");
-                builder.append(args[i++]);
+                builder.append(args[index++]);
             }
             builder.append(']');
         }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:5.0.6'`
`11`	`11`	`classpath 'com.netflix.nebula:nebula-dependency-recommender:6.0.0'`
`12`	`12`	`classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.4'`
`13`		`- classpath 'com.palantir.baseline:gradle-baseline-java:0.20.1'`
	`13`	`+ classpath 'com.palantir.baseline:gradle-baseline-java:0.24.0'`
`14`	`14`	`classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'`
`15`	`15`	`}`
`16`	`16`	`}`
`@@ -29,7 +29,7 @@ repositories {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
`32`		`- baseline 'com.palantir.baseline:gradle-baseline-java-config:0.20.1@zip'`
	`32`	`+ baseline 'com.palantir.baseline:gradle-baseline-java-config:0.24.0@zip'`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`allprojects {`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private static String renderNoArgsMessage(ErrorType errorType) {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`private static List<Arg<?>> collectArgs(ErrorType errorType, Arg<?>... args) {`
`124`		`- ArrayList<Arg<?>> argList = new ArrayList<>(args.length + 1);`
	`124`	`+ List<Arg<?>> argList = new ArrayList<>(args.length + 1);`
`125`	`125`	`argList.add(SafeArg.of(ERROR_TYPE_ARG_NAME, errorType));`
`126`	`126`	`Collections.addAll(argList, args);`
`127`	`127`	`return Collections.unmodifiableList(argList);`