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

Author: svc-excavator-bot

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.71.0'
         classpath 'org.revapi:gradle-revapi:1.8.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.24.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.44.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.0.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.5.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.33.0'

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

@@ -25,10 +25,8 @@
 import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
 import com.palantir.conjure.java.config.ssl.TrustContext;
-import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
-import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.palantir.logsafe.logger.SafeLogger;
 import com.palantir.logsafe.logger.SafeLoggerFactory;
 import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries;
@@ -164,25 +162,22 @@ private static ClientConfiguration of(
     }
 
     public static ProxySelector createProxySelector(ProxyConfiguration proxyConfig) {
-        switch (proxyConfig.type()) {
-            case DIRECT:
-                return fixedProxySelectorFor(Proxy.NO_PROXY);
-            case FROM_ENVIRONMENT:
+        return switch (proxyConfig.type()) {
+            case DIRECT -> fixedProxySelectorFor(Proxy.NO_PROXY);
+            case FROM_ENVIRONMENT -> {
                 String defaultEnvProxy = System.getenv(ENV_HTTPS_PROXY);
                 if (defaultEnvProxy == null) {
                     log.info("Proxy environment variable not set, using no proxy");
-                    return fixedProxySelectorFor(Proxy.NO_PROXY);
+                    yield fixedProxySelectorFor(Proxy.NO_PROXY);
                 }
                 log.info("Using proxy from environment variable", UnsafeArg.of("proxy", defaultEnvProxy));
                 InetSocketAddress address = createInetSocketAddress(defaultEnvProxy);
-                return fixedProxySelectorFor(new Proxy(Proxy.Type.HTTP, address));
-            case HTTP:
-                return getHttpProxySelector(proxyConfig, false);
-            case HTTPS:
-                return getHttpProxySelector(proxyConfig, true);
-            case MESH:
-                return ProxySelector.getDefault(); // MESH proxy is not a Java proxy
-            case SOCKS:
+                yield fixedProxySelectorFor(new Proxy(Proxy.Type.HTTP, address));
+            }
+            case HTTP -> getHttpProxySelector(proxyConfig, false);
+            case HTTPS -> getHttpProxySelector(proxyConfig, true);
+            case MESH -> ProxySelector.getDefault(); // MESH proxy is not a Java proxy
+            case SOCKS -> {
                 HostAndPort socksHostAndPort = HostAndPort.fromString(proxyConfig
                         .hostAndPort()
                         .orElseThrow(() -> new SafeIllegalArgumentException(
@@ -191,15 +186,9 @@ public static ProxySelector createProxySelector(ProxyConfiguration proxyConfig)
                         // Proxy address must not be resolved, otherwise DNS changes while the application
                         // is running are ignored by the application.
                         InetSocketAddress.createUnresolved(socksHostAndPort.getHost(), socksHostAndPort.getPort());
-                return fixedProxySelectorFor(new Proxy(Proxy.Type.SOCKS, socksAddress));
-            default:
-                // fall through
-        }
-
-        throw new SafeIllegalStateException(
-                "Failed to create ProxySelector for proxy configuration",
-                SafeArg.of("type", proxyConfig.type()),
-                UnsafeArg.of("hostAndPort", proxyConfig.hostAndPort()));
+                yield fixedProxySelectorFor(new Proxy(Proxy.Type.SOCKS, socksAddress));
+            }
+        };
     }
 
     @VisibleForTesting

conjure-java-client-verifier/src/test/java/com/palantir/verification/Cases.java

@@ -26,6 +26,7 @@
 import com.palantir.conjure.verification.server.TestCases;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.Set;
 import javax.annotation.Nullable;
 
@@ -45,7 +46,7 @@ private static ClientTestCases deserializeTestCases(File file) {
                     .readValue(file, TestCases.class)
                     .getClient();
         } catch (IOException e) {
-            throw new RuntimeException(
+            throw new UncheckedIOException(
                     String.format("Unable to read %s, you may need to run ./gradlew copyTestCases", file), e);
         }
     }
@@ -58,7 +59,7 @@ private static IgnoredClientTestCases deserializeIgnoredClientTestCases(File fil
                     .readValue(file, IgnoredTestCases.class)
                     .getClient();
         } catch (IOException e) {
-            throw new RuntimeException(String.format("Unable to read %s", file), e);
+            throw new UncheckedIOException(String.format("Unable to read %s", file), e);
         }
     }
 

conjure-java-client-verifier/src/test/java/com/palantir/verification/VerificationServerRule.java

@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.concurrent.CountDownLatch;
@@ -94,7 +95,7 @@ private static void blockUntilServerStarted(InputStream inputStream) throws Inte
                     System.out.println(line);
                 }
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new UncheckedIOException(e);
             }
         });
         thread.setDaemon(true);

conjure-java-jackson-serialization/src/main/java/com/palantir/conjure/java/serialization/LenientLongModule.java

@@ -52,16 +52,12 @@ private LongAsStringDeserializer() {
 
         @Override
         public Long deserialize(JsonParser jsonParser, DeserializationContext _ctxt) throws IOException {
-            switch (jsonParser.currentToken()) {
-                case VALUE_NUMBER_INT:
-                    return jsonParser.getLongValue();
-                case VALUE_STRING:
-                    return parseLong(jsonParser);
-                case VALUE_NULL:
-                    return null;
-                default:
-                    throw new SafeIoException("Expected a long value");
-            }
+            return switch (jsonParser.currentToken()) {
+                case VALUE_NUMBER_INT -> jsonParser.getLongValue();
+                case VALUE_STRING -> parseLong(jsonParser);
+                case VALUE_NULL -> null;
+                default -> throw new SafeIoException("Expected a long value");
+            };
         }
 
         @Override

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/DialogueFeignClient.java

@@ -42,7 +42,7 @@
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
-import com.palantir.logsafe.exceptions.SafeRuntimeException;
+import com.palantir.logsafe.exceptions.SafeUncheckedIoException;
 import feign.Request;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -113,8 +113,8 @@ public feign.Response execute(Request request, Request.Options _options) throws
         } catch (UncheckedExecutionException e) {
             // Rethrow IOException to match standard feign behavior
             Throwable cause = e.getCause();
-            if (cause instanceof IOException) {
-                throw (IOException) cause;
+            if (cause instanceof IOException iOException) {
+                throw iOException;
             }
             throw e;
         }
@@ -146,7 +146,7 @@ private static String urlDecode(String input) {
         try {
             return URLDecoder.decode(input, "UTF-8");
         } catch (UnsupportedEncodingException e) {
-            throw new SafeRuntimeException("Failed to decode path segment", e, UnsafeArg.of("encoded", input));
+            throw new SafeUncheckedIoException("Failed to decode path segment", e, UnsafeArg.of("encoded", input));
         }
     }
 
@@ -290,7 +290,7 @@ public InputStream body() {
                 try {
                     return body.asInputStream();
                 } catch (IOException e) {
-                    throw new SafeRuntimeException("Failed to access the delegate response body", e);
+                    throw new SafeUncheckedIoException("Failed to access the delegate response body", e);
                 }
             }
             return new ByteArrayInputStream(new byte[0]);

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

@@ -24,6 +24,7 @@
 import feign.RequestTemplate;
 import feign.codec.EncodeException;
 import feign.codec.Encoder;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
@@ -66,7 +67,7 @@ public void encode(Object object, Type bodyType, RequestTemplate template) throw
             JavaType javaType = cborMapper.getTypeFactory().constructType(bodyType);
             template.body(cborMapper.writerFor(javaType).writeValueAsBytes(object), StandardCharsets.UTF_8);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+            throw new UncheckedIOException(e);
         }
     }
 }

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

@@ -26,6 +26,7 @@
 import feign.codec.Encoder;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
@@ -56,7 +57,7 @@ public void encode(Object object, Type bodyType, RequestTemplate template) throw
                 dangerousBufferingMeter.mark(Math.max(1, bytes.length));
                 template.body(bytes, StandardCharsets.UTF_8);
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new UncheckedIOException(e);
             }
         } else {
             delegate.encode(object, bodyType, template);

conjure-java-jaxrs-client/src/test/java/com/palantir/conjure/java/client/jaxrs/feignimpl/GuavaTestServer.java

@@ -32,6 +32,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;
 import org.assertj.core.util.Strings;
@@ -131,7 +132,7 @@ public String readInputStream(InputStream data) {
             try {
                 return new String(data.readAllBytes(), StandardCharsets.UTF_8);
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new UncheckedIOException(e);
             }
         }
 

conjure-java-jaxrs-client/src/test/java/com/palantir/conjure/java/client/jaxrs/feignimpl/Java8TestServer.java

@@ -33,6 +33,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
@@ -128,7 +129,7 @@ public String readInputStream(InputStream data) {
             try {
                 return new String(data.readAllBytes(), StandardCharsets.UTF_8);
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new UncheckedIOException(e);
             }
         }