From d25ff8b1c7ddd69ff8c54c38c35e06eed1099bc9 Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Fri, 17 Mar 2023 15:33:50 +0000
Subject: [PATCH 1/2] Excavator:  Upgrades Baseline to the latest version

---
 .baseline/checkstyle/checkstyle.xml                           | 2 +-
 .baseline/idea/intellij-java-palantir-style.xml               | 3 +++
 build.gradle                                                  | 2 +-
 .../metric/schema/gradle/CreateMetricsManifestTask.java       | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 0297c79f..fd1fa389 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -43,7 +43,7 @@
     </module>
     <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
         <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
     </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index f41e2b8a..6a5f83a6 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -44,8 +44,10 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <!-- Should be a superset of https://github.com/google/error-prone/blob/c481b3f9c2da112db36ccfcbf64e755261a127ab/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java#L63 -->
           <DO_NOT_IMPORT_INNER>
             <CLASS name="Builder" />
+            <CLASS name="BuilderFactory" />
             <CLASS name="Callback" />
             <CLASS name="Class" />
             <CLASS name="Entry" />
@@ -54,6 +56,7 @@
             <CLASS name="Type" />
             <CLASS name="Key" />
             <CLASS name="Id" />
+            <CLASS name="Identifier" />
             <CLASS name="Provider" />
           </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>
diff --git a/build.gradle b/build.gradle
index 2c982217..16a88e21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.28.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.1.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.0.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.35.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:2.0.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
diff --git a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java
index d548ce41..6224bc6b 100644
--- a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java
+++ b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java
@@ -137,7 +137,7 @@ public final void createManifest() throws IOException {
                 ImmutableMap.builder()
                         .putAll(getLocalMetrics())
                         .putAll(getDiscoveredMetrics())
-                        .build());
+                        .buildOrThrow());
     }
 
     private Map<String, List<MetricSchema>> getLocalMetrics() {
@@ -167,7 +167,7 @@ private Map<String, List<MetricSchema>> getDiscoveredMetrics() {
             }
         });
 
-        return discoveredMetrics.build();
+        return discoveredMetrics.buildOrThrow();
     }
 
     private static Optional<List<MetricSchema>> inferProjectDependencyMetrics(Project dependencyProject) {

From 2ea9a0e56034c5b5a336682a3afa1913bed5b801 Mon Sep 17 00:00:00 2001
From: David Schlosnagle <davids@palantir.com>
Date: Fri, 17 Mar 2023 12:54:53 -0400
Subject: [PATCH 2/2] Use logsafe

---
 .../test/java/com/palantir/metric/schema/JavaGeneratorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metric-schema-java/src/test/java/com/palantir/metric/schema/JavaGeneratorTest.java b/metric-schema-java/src/test/java/com/palantir/metric/schema/JavaGeneratorTest.java
index 8f436c81..7f6b5ec8 100644
--- a/metric-schema-java/src/test/java/com/palantir/metric/schema/JavaGeneratorTest.java
+++ b/metric-schema-java/src/test/java/com/palantir/metric/schema/JavaGeneratorTest.java
@@ -19,11 +19,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.palantir.conjure.java.serialization.ObjectMappers;
+import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import com.palantir.metric.schema.lang.MetricSchemaCompiler;