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

Author: svc-excavator-bot

.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]$)"/>

.baseline/spotless/eclipse.xml

@@ -92,6 +92,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.0.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.7.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.25.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'

client-config/src/main/java/com/palantir/conjure/java/client/config/KeepAliveSslSocketFactory.java

@@ -48,6 +48,7 @@ Socket wrap(Socket socket) throws SocketException {
         return socket;
     }
 
+    @Override
     public String toString() {
         return "KeepAliveSslSocketFactory{delegate=" + delegate + '}';
     }

client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java

@@ -102,7 +102,7 @@ public void meshProxy_maxRetriesMustBe0() throws Exception {
 
         ClientConfiguration validConfig = ClientConfigurations.of(meshProxyServiceConfig(uris, 0));
         assertThat(validConfig.meshProxy()).isEqualTo(Optional.of(HostAndPort.fromParts("localhost", 1234)));
-        assertThat(validConfig.maxNumRetries()).isEqualTo(0);
+        assertThat(validConfig.maxNumRetries()).isZero();
     }
 
     @Test

conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java

@@ -66,7 +66,7 @@ public void deserializeJdk8ModulePresentOptional() throws IOException {
 
     @Test
     public void deserializeJdk8ModuleAbsentOptional() throws IOException {
-        assertThat(MAPPER.readValue("null", Optional.class)).isEqualTo(Optional.empty());
+        assertThat(MAPPER.readValue("null", Optional.class)).isNotPresent();
     }
 
     @Test

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/feignimpl/NeverRetryingBackoffStrategy.java

@@ -23,7 +23,7 @@ public enum NeverRetryingBackoffStrategy implements BackoffStrategy {
     INSTANCE;
 
     @Override
-    public boolean backoff(int numFailedAttempts) {
+    public boolean backoff(int _numFailedAttempts) {
         return false;
     }
 }

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/feignimpl/PathTemplateHeaderEnrichmentContract.java

@@ -28,7 +28,7 @@ public PathTemplateHeaderEnrichmentContract(Contract delegate) {
     }
 
     @Override
-    protected void processMetadata(Class<?> targetType, Method method, MethodMetadata metadata) {
+    protected void processMetadata(Class<?> _targetType, Method _method, MethodMetadata metadata) {
         metadata.template()
                 .header(OkhttpTraceInterceptor.PATH_TEMPLATE_HEADER,
                         metadata.template().method() + " "

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/feignimpl/PathTemplateHeaderRewriter.java

@@ -28,7 +28,7 @@ public enum PathTemplateHeaderRewriter implements RequestInterceptor {
     INSTANCE;
 
     @Override
-    public void apply(RequestTemplate template) {
+    public void apply(RequestTemplate _template) {
         // nop
     }
 }

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/feignimpl/SlashEncodingContract.java

@@ -30,7 +30,7 @@ public SlashEncodingContract(Contract delegate) {
     }
 
     @Override
-    protected void processMetadata(Class<?> targetType, Method method, MethodMetadata metadata) {
+    protected void processMetadata(Class<?> _targetType, Method _method, MethodMetadata metadata) {
         metadata.template().decodeSlash(false);
     }
 }