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

Author: svc-excavator-bot

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.68.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.9.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.35.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.36.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
     }
 }

errors/src/main/java/com/palantir/conjure/java/api/errors/QosException.java

@@ -43,7 +43,6 @@ private QosException(String message, QosReason reason) {
         this.reason = Preconditions.checkNotNull(reason, "QosReason is required");
     }
 
-    @SuppressWarnings("for-rollout:InconsistentOverloads")
     private QosException(String message, Throwable cause, QosReason reason) {
         super(message, cause);
         this.reason = Preconditions.checkNotNull(reason, "QosReason is required");
@@ -132,7 +131,6 @@ public static RetryOther retryOther(URL redirectTo) {
     /**
      * Like {@link #retryOther(URL)}, but includes a reason.
      */
-    @SuppressWarnings("for-rollout:InconsistentOverloads")
     public static RetryOther retryOther(QosReason reason, URL redirectTo) {
         return new RetryOther(redirectTo, reason);
     }
@@ -147,7 +145,6 @@ public static RetryOther retryOther(URL redirectTo, Throwable cause) {
     /**
      * Like {@link #retryOther(URL)}, but includes a reason, and a cause.
      */
-    @SuppressWarnings("for-rollout:InconsistentOverloads")
     public static RetryOther retryOther(QosReason reason, URL redirectTo, Throwable cause) {
         return new RetryOther(redirectTo, cause, reason);
     }

service-config/src/main/java/com/palantir/conjure/java/api/config/service/HostAndPort.java

@@ -57,7 +57,6 @@ boolean hasPort() {
         return port >= 0;
     }
 
-    @SuppressWarnings("for-rollout:UnusedException")
     public static HostAndPort fromString(String hostPortString) {
         Preconditions.checkNotNull(hostPortString, "hostPortString");
         String host;
@@ -99,9 +98,7 @@ public static HostAndPort fromString(String hostPortString) {
     }
 
     private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
-        @SuppressWarnings("for-rollout:InitializeInline")
         int colonIndex;
-        @SuppressWarnings("for-rollout:InitializeInline")
         int closeBracketIndex;
         Preconditions.checkArgument(
                 hostPortString.charAt(0) == '[',

service-config/src/main/java/com/palantir/conjure/java/api/config/service/HumanReadableDuration.java

@@ -165,7 +165,7 @@ public Duration toJavaDuration() {
      * @implNote This method can be removed in JDK9
      * @see <a href="https://bugs.openjdk.java.net/browse/JDK-8141452">JDK-8141452</a>
      */
-    @SuppressWarnings({"for-rollout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
+    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     private static ChronoUnit chronoUnit(TimeUnit unit) {
         switch (Preconditions.checkNotNull(unit, "unit")) {
             case NANOSECONDS:

service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java

@@ -95,7 +95,7 @@ public Type type() {
         return Type.HTTP;
     }
 
-    @SuppressWarnings({"for-rollout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
+    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     @Value.Check
     protected final void check() {
         switch (type()) {

service-config/src/test/java/com/palantir/conjure/java/api/config/service/ServiceConfigurationFactoryTests.java

@@ -240,7 +240,6 @@ public void serDe_optional() throws Exception {
                 .isEqualTo(deserialized);
     }
 
-    @SuppressWarnings("for-rollout:UnusedException")
     private ServicesConfigBlock deserialize(String file) {
         URL resource = Resources.getResource(file);
         try {

ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java

@@ -73,7 +73,6 @@ public StoreType keyStoreType() {
         }
     }
 
-    @SuppressWarnings("for-rollout:AnnotationPosition")
     @JsonAlias("key-store-key-alias")
     /** Alias of the key that should be used in the key store. If absent, first entry returned by key store is used. */
     public abstract Optional<String> keyStoreKeyAlias();