From f49f2b6d1cd0095c9844c4cc765fe6343de36e92 Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Mon, 9 Sep 2019 18:10:34 +0000
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version

---
 .baseline/checkstyle/checkstyle.xml                         | 3 ++-
 build.gradle                                                | 2 +-
 .../conjure/java/dialogue/serde/ConjureBodySerDe.java       | 6 +++---
 .../com/palantir/conjure/java/dialogue/serde/Encodings.java | 2 +-
 .../src/main/java/com/palantir/dialogue/UrlBuilder.java     | 3 ++-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 792229cfc5..268ebe3fce 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -422,6 +422,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -435,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
diff --git a/build.gradle b/build.gradle
index 9187227e9c..1358524a7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.2.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.59.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.1.1'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.0.1'
     }
diff --git a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ConjureBodySerDe.java b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ConjureBodySerDe.java
index 7fc4b69bb2..5e117ad9d9 100644
--- a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ConjureBodySerDe.java
+++ b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ConjureBodySerDe.java
@@ -81,10 +81,10 @@ public Deserializer<Void> emptyBodyDeserializer() {
         return response -> {
             try {
                 if (response.body().read() != -1) {
-                    throw new RuntimeException("Expected empty response body");
+                    throw new SafeRuntimeException("Expected empty response body");
                 }
             } catch (IOException e) {
-                throw new RuntimeException("Failed to read from response body", e);
+                throw new SafeRuntimeException("Failed to read from response body", e);
             }
             return null;
         };
@@ -142,7 +142,7 @@ public RequestBody serialize(T value) {
                 bytes.flush();
                 bytes.close();
             } catch (IOException e) {
-                throw new RuntimeException("Failed to close or flush ByteStream. This is a bug.", e);
+                throw new SafeRuntimeException("Failed to close or flush ByteStream. This is a bug.", e);
             }
 
             return new RequestBody() {
diff --git a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/Encodings.java b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/Encodings.java
index a483a043b7..19a2dbc747 100644
--- a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/Encodings.java
+++ b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/Encodings.java
@@ -53,7 +53,7 @@ public <T> Serializer<T> serializer(TypeMarker<T> type) {
                 try {
                     writer.writeValue(output, value);
                 } catch (IOException e) {
-                    throw new RuntimeException("Failed to serialize payload, this is a bug", e);
+                    throw new SafeRuntimeException("Failed to serialize payload, this is a bug", e);
                 }
             };
         }
diff --git a/dialogue-target/src/main/java/com/palantir/dialogue/UrlBuilder.java b/dialogue-target/src/main/java/com/palantir/dialogue/UrlBuilder.java
index 217e96e6ed..5522b77ea4 100644
--- a/dialogue-target/src/main/java/com/palantir/dialogue/UrlBuilder.java
+++ b/dialogue-target/src/main/java/com/palantir/dialogue/UrlBuilder.java
@@ -25,6 +25,7 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.UnsafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.io.ByteArrayOutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -131,7 +132,7 @@ public URL build() {
 
             return new URL(protocol, host, port, file.toString());
         } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("Malformed URL", e);
+            throw new SafeIllegalArgumentException("Malformed URL", e);
         }
     }