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

svc-excavator-bot · web-flow · commit acfd58244097 · 2025-06-11T17:56:07.000Z
diff --git a/build.gradle b/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.32.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.33.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
     }
 }
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/QosException.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/QosException.java
@@ -43,6 +43,7 @@ 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");
@@ -131,6 +132,7 @@ 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);
     }
@@ -145,6 +147,7 @@ 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);
     }
@@ -221,6 +224,7 @@ public String getLogMessage() {
             return "Suggested request throttling";
         }
 
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         @Override
         public List<Arg<?>> getArgs() {
             return List.of(
@@ -272,6 +276,7 @@ public String getLogMessage() {
             return this.getClass().getSimpleName() + ": Requesting retry";
         }
 
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         @Unsafe
         @Override
         public List<Arg<?>> getArgs() {
@@ -315,6 +320,7 @@ public String getLogMessage() {
             return SERVER_UNAVAILABLE;
         }
 
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         @Override
         public List<Arg<?>> getArgs() {
             return List.of(
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/QosReason.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/QosReason.java
@@ -53,7 +53,11 @@ private QosReason(@Safe String reason, Optional<RetryHint> retryHint, Optional<D
     }
 
     public static QosReason of(
-            @Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String reason) {
+            @SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
+                    @Safe
+                    @CompileTimeConstant
+                    @org.intellij.lang.annotations.Pattern(PATTERN_STRING)
+                    String reason) {
         return new QosReason(reason, Optional.empty(), Optional.empty());
     }
 
@@ -117,7 +121,11 @@ public Builder from(QosReason other) {
         }
 
         public Builder reason(
-                @Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String value) {
+                @SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
+                        @Safe
+                        @CompileTimeConstant
+                        @org.intellij.lang.annotations.Pattern(PATTERN_STRING)
+                        String value) {
             this.reason = Preconditions.checkNotNull(value, "reason");
             return this;
         }
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/QosReasons.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/QosReasons.java
@@ -42,6 +42,7 @@ public static <T> void encodeToResponse(
         }
     }
 
+    @SuppressWarnings("for-rollout:Java8ApiChecker")
     public static <T> QosReason parseFromResponse(T response, QosResponseDecodingAdapter<? super T> adapter) {
         Optional<String> maybeDueTo = adapter.getFirstHeader(response, DUE_TO_HEADER);
         Optional<String> maybeRetryHint = adapter.getFirstHeader(response, RETRY_HINT_HEADER);
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/RemoteException.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/RemoteException.java
@@ -63,6 +63,7 @@ public RemoteException(SerializableError error, int status) {
     @Override
     public String getMessage() {
         // This field is not used in most environments so the cost of computation may be avoided.
+        @SuppressWarnings("for-rollout:Var")
         String messageValue = unsafeMessage;
         if (messageValue == null) {
             messageValue = renderUnsafeMessage();
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/ServiceExceptionUtils.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/ServiceExceptionUtils.java
@@ -70,6 +70,7 @@ static String renderUnsafeMessage(String exceptionName, ErrorType errorType, Arg
 
         StringBuilder builder = new StringBuilder();
         builder.append(message).append(": {");
+        @SuppressWarnings("for-rollout:Var")
         boolean first = true;
         for (Arg<?> arg : args) {
             if (arg == null) {
@@ -116,14 +117,14 @@ private static String generateErrorInstanceId(
             // we don't need cryptographically secure random UUIDs
             return UniqueIds.pseudoRandomUuidV4().toString();
         }
-        if (cause instanceof ServiceException) {
-            return ((ServiceException) cause).getErrorInstanceId();
+        if (cause instanceof ServiceException serviceException) {
+            return serviceException.getErrorInstanceId();
         }
-        if (cause instanceof CheckedServiceException) {
-            return ((CheckedServiceException) cause).getErrorInstanceId();
+        if (cause instanceof CheckedServiceException checkedServiceException) {
+            return checkedServiceException.getErrorInstanceId();
         }
-        if (cause instanceof RemoteException) {
-            return ((RemoteException) cause).getError().errorInstanceId();
+        if (cause instanceof RemoteException remoteException) {
+            return remoteException.getError().errorInstanceId();
         }
         return generateErrorInstanceId(cause.getCause(), dejaVu);
     }
diff --git a/errors/src/main/java/com/palantir/conjure/java/api/errors/UnknownRemoteException.java b/errors/src/main/java/com/palantir/conjure/java/api/errors/UnknownRemoteException.java
@@ -52,6 +52,7 @@ public String getLogMessage() {
         return getMessage();
     }
 
+    @SuppressWarnings("for-rollout:Java8ApiChecker")
     @Unsafe
     @Override
     public List<Arg<?>> getArgs() {
diff --git a/errors/src/test/java/com/palantir/conjure/java/api/errors/ErrorTypeTest.java b/errors/src/test/java/com/palantir/conjure/java/api/errors/ErrorTypeTest.java
@@ -26,6 +26,7 @@
 
 public final class ErrorTypeTest {
 
+    @SuppressWarnings("for-rollout:DifferentNameButSame")
     @Test
     public void testNameMustBeCamelCaseWithOptionalNameSpace() throws Exception {
         String[] badNames = new String[] {":", "foo:Bar", ":Bar", "Bar:", "foo:bar", "Foo:bar", "Foo:2Bar"};
@@ -64,21 +65,26 @@ public void testDefaultErrorTypeHttpErrorCodes() throws Exception {
         assertThat(ErrorType.INTERNAL.httpErrorCode()).isEqualTo(500);
     }
 
+    @SuppressWarnings("for-rollout:DifferentNameButSame")
     @Test
     public void testCanCreateCustomClientAndServerErrors() throws Exception {
+        @SuppressWarnings("for-rollout:DifferentNameButSame")
         ErrorType customClient = ErrorType.create(ErrorType.Code.CUSTOM_CLIENT, "Namespace:MyDesc");
         assertThat(customClient.code()).isEqualTo(ErrorType.Code.CUSTOM_CLIENT);
         assertThat(customClient.httpErrorCode()).isEqualTo(400);
         assertThat(customClient.name()).isEqualTo("Namespace:MyDesc");
 
+        @SuppressWarnings("for-rollout:DifferentNameButSame")
         ErrorType customServer = ErrorType.create(ErrorType.Code.CUSTOM_SERVER, "Namespace:MyDesc");
         assertThat(customServer.code()).isEqualTo(ErrorType.Code.CUSTOM_SERVER);
         assertThat(customServer.httpErrorCode()).isEqualTo(500);
         assertThat(customServer.name()).isEqualTo("Namespace:MyDesc");
     }
 
+    @SuppressWarnings("for-rollout:DifferentNameButSame")
     @Test
     public void testCanCreateNewErrorTypes() throws Exception {
+        @SuppressWarnings("for-rollout:DifferentNameButSame")
         ErrorType error = ErrorType.create(ErrorType.Code.FAILED_PRECONDITION, "Namespace:MyDesc");
         assertThat(error.code()).isEqualTo(ErrorType.Code.FAILED_PRECONDITION);
         assertThat(error.httpErrorCode()).isEqualTo(500);
diff --git a/errors/src/test/java/com/palantir/conjure/java/api/errors/RemoteExceptionTest.java b/errors/src/test/java/com/palantir/conjure/java/api/errors/RemoteExceptionTest.java
@@ -27,12 +27,15 @@ public final class RemoteExceptionTest {
     @Test
     public void testJavaSerialization() {
         // With explicit error instance
+        @SuppressWarnings("for-rollout:Var")
         SerializableError error = new SerializableError.Builder()
                 .errorCode("errorCode")
                 .errorName("errorName")
                 .errorInstanceId("errorId")
                 .build();
+        @SuppressWarnings("for-rollout:Var")
         RemoteException expected = new RemoteException(error, 500);
+        @SuppressWarnings("for-rollout:Var")
         RemoteException actual = SerializationUtils.deserialize(SerializationUtils.serialize(expected));
         assertThat(actual).isEqualToComparingFieldByField(expected);
 
diff --git a/errors/src/test/java/com/palantir/conjure/java/api/errors/SerializableErrorTest.java b/errors/src/test/java/com/palantir/conjure/java/api/errors/SerializableErrorTest.java
@@ -75,6 +75,7 @@ public void forException_arg_key_collisions_just_use_the_last_one() {
     @Test
     public void forException_listArgValue_serializesWithToString() {
         ErrorType error = ErrorType.INTERNAL;
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         ServiceException exception = new ServiceException(
                 error, SafeArg.of("safe-list", List.of("1", "2")), UnsafeArg.of("unsafe-list", List.of("3", "4")));
 
@@ -91,6 +92,7 @@ public void forException_listArgValue_serializesWithToString() {
     @Test
     public void forException_mapArgValue_serializesWithToString() {
         ErrorType error = ErrorType.INTERNAL;
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         ServiceException exception = new ServiceException(
                 error, SafeArg.of("safe-map", Map.of("1", "2")), UnsafeArg.of("unsafe-map", Map.of("ABC", "DEF")));
 
diff --git a/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/PathDeserializer.java b/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/PathDeserializer.java
@@ -62,6 +62,7 @@ public String getLogMessage() {
             return logMessage;
         }
 
+        @SuppressWarnings("for-rollout:Java8ApiChecker")
         @Override
         public List<Arg<?>> getArgs() {
             return List.of();
diff --git a/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ShimJdk7Module.java b/extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ShimJdk7Module.java
@@ -27,6 +27,7 @@ public final class ShimJdk7Module extends SimpleModule {
     public ShimJdk7Module() {
         super(ShimJdk7Module.class.getCanonicalName());
 
+        @SuppressWarnings({"for-rollout:UnnecessaryFinal", "for-rollout:Var"})
         final JsonSerializer<Object> stringSer = ToStringSerializer.instance;
         addSerializer(Path.class, stringSer);
         addDeserializer(Path.class, new PathDeserializer());
diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/HostAndPort.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/HostAndPort.java
@@ -57,9 +57,11 @@ boolean hasPort() {
         return port >= 0;
     }
 
+    @SuppressWarnings("for-rollout:UnusedException")
     public static HostAndPort fromString(String hostPortString) {
         Preconditions.checkNotNull(hostPortString, "hostPortString");
         String host;
+        @SuppressWarnings("for-rollout:Var")
         String portString = null;
 
         if (hostPortString.startsWith("[")) {
@@ -78,6 +80,7 @@ public static HostAndPort fromString(String hostPortString) {
             }
         }
 
+        @SuppressWarnings("for-rollout:Var")
         int port = NO_PORT;
         if (portString != null && portString.length() > 0) {
             // Try to parse the whole port string as a number.
@@ -98,7 +101,9 @@ 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) == '[',
diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/HumanReadableDuration.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/HumanReadableDuration.java
@@ -95,10 +95,13 @@ public static HumanReadableDuration days(long count) {
 
     @JsonCreator
     public static HumanReadableDuration valueOf(String duration) {
+        @SuppressWarnings({"for-rollout:UnnecessaryFinal", "for-rollout:Var"})
         final Matcher matcher = DURATION_PATTERN.matcher(duration);
         Preconditions.checkArgument(matcher.matches(), "Invalid duration", SafeArg.of("duration", duration));
 
+        @SuppressWarnings({"for-rollout:UnnecessaryFinal", "for-rollout:Var"})
         final long count = Long.parseLong(matcher.group(1));
+        @SuppressWarnings({"for-rollout:UnnecessaryFinal", "for-rollout:Var"})
         final TimeUnit unit = SUFFIXES.get(matcher.group(2));
         if (unit == null) {
             throw new SafeIllegalArgumentException("Invalid duration", SafeArg.of("duration", duration));
@@ -165,6 +168,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"})
     private static ChronoUnit chronoUnit(TimeUnit unit) {
         switch (Preconditions.checkNotNull(unit, "unit")) {
             case NANOSECONDS:
@@ -194,6 +198,7 @@ public boolean equals(Object obj) {
         if ((obj == null) || (getClass() != obj.getClass())) {
             return false;
         }
+        @SuppressWarnings({"for-rollout:UnnecessaryFinal", "for-rollout:Var"})
         final HumanReadableDuration duration = (HumanReadableDuration) obj;
         return (count == duration.count) && (unit == duration.unit);
     }
@@ -206,6 +211,7 @@ public int hashCode() {
     @Override
     @JsonValue
     public String toString() {
+        @SuppressWarnings("for-rollout:Var")
         String units = unit.toString().toLowerCase(Locale.ENGLISH);
         if (count == 1) {
             units = units.substring(0, units.length() - 1);
diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java
@@ -95,6 +95,11 @@ public Type type() {
         return Type.HTTP;
     }
 
+    @SuppressWarnings({
+        "for-rollout:Java8ApiChecker",
+        "for-rollout:StatementSwitchToExpressionSwitch",
+        "for-rollout:UnnecessaryDefaultInEnumSwitch"
+    })
     @Value.Check
     protected final void check() {
         switch (type()) {
diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/UserAgents.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/UserAgents.java
@@ -125,6 +125,7 @@ public static String tryParsePrimaryName(@Safe String userAgent) {
         // it will possibly ignore leading characters (even non-whitespace) up until the "foo/1.2.3" part
         // so we further split primaryName into _just_ the set of characters immediately preceding
         // the "/" for which isValidCharForName() returns true.
+        @SuppressWarnings("for-rollout:Var")
         int lindex = split - 1;
         while (lindex >= 0) {
             if (!isValidCharForName(userAgent.charAt(lindex))) {
@@ -151,6 +152,7 @@ private static UserAgent parseInternal(@Safe String userAgent, boolean lenient)
         ImmutableUserAgent.Builder builder = ImmutableUserAgent.builder();
 
         Matcher matcher = SEGMENT_PATTERN.matcher(userAgent);
+        @SuppressWarnings("for-rollout:Var")
         boolean foundFirst = false;
         while (matcher.find()) {
             String name = matcher.group(1);
@@ -236,6 +238,7 @@ static boolean isValidName(String name) {
         if (name == null || name.isEmpty()) {
             return false;
         }
+        @SuppressWarnings("for-rollout:Var")
         char ch = name.charAt(0);
         if (!isAlpha(ch)) {
             return false;
diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/VersionParser.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/VersionParser.java
@@ -39,6 +39,7 @@ private VersionParser() {}
 
     /** Returns the count of version number groups parsed if a valid version string, or -1 otherwise. */
     public static int countNumericDotGroups(String string) {
+        @SuppressWarnings("for-rollout:Var")
         long state = 0;
         for (int i = 1; getIndex(state) < string.length(); i++) {
             state = number(string, getIndex(state));
@@ -63,6 +64,7 @@ public static int countNumericDotGroups(String string) {
     private static final int PARSE_FAILED = Integer.MIN_VALUE;
 
     static long number(String string, int startIndex) {
+        @SuppressWarnings("for-rollout:Var")
         int next = startIndex;
         int len = string.length();
         while (next < len) {
@@ -79,6 +81,7 @@ static long number(String string, int startIndex) {
             return ok(next, Character.digit(string.codePointAt(startIndex), 10));
         } else {
             try {
+                @SuppressWarnings("for-rollout:Java8ApiChecker")
                 int result = Integer.parseUnsignedInt(string, startIndex, next, 10);
                 if (result < 0) {
                     // i.e. we overflowed the int
diff --git a/service-config/src/test/java/com/palantir/conjure/java/api/config/service/ServiceConfigurationFactoryTests.java b/service-config/src/test/java/com/palantir/conjure/java/api/config/service/ServiceConfigurationFactoryTests.java
@@ -240,6 +240,7 @@ public void serDe_optional() throws Exception {
                 .isEqualTo(deserialized);
     }
 
+    @SuppressWarnings("for-rollout:UnusedException")
     private ServicesConfigBlock deserialize(String file) {
         URL resource = Resources.getResource(file);
         try {
diff --git a/service-config/src/test/java/com/palantir/conjure/java/api/config/service/UserAgentTest.java b/service-config/src/test/java/com/palantir/conjure/java/api/config/service/UserAgentTest.java
diff --git a/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java b/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ buildscript {`
`14`	`14`	`classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.68.0'`
`15`	`15`	`classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.9.0'`
`16`	`16`	`classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'`
`17`		`- classpath 'com.palantir.baseline:gradle-baseline-java:6.32.0'`
	`17`	`+ classpath 'com.palantir.baseline:gradle-baseline-java:6.33.0'`
`18`	`18`	`classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,11 @@ private QosReason(@Safe String reason, Optional<RetryHint> retryHint, Optional<D`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public static QosReason of(`
`56`		`- @Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String reason) {`
	`56`	`+ @SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")`
	`57`	`+ @Safe`
	`58`	`+ @CompileTimeConstant`
	`59`	`+ @org.intellij.lang.annotations.Pattern(PATTERN_STRING)`
	`60`	`+ String reason) {`
`57`	`61`	`return new QosReason(reason, Optional.empty(), Optional.empty());`
`58`	`62`	`}`
`59`	`63`
`@@ -117,7 +121,11 @@ public Builder from(QosReason other) {`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`public Builder reason(`
`120`		`- @Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String value) {`
	`124`	`+ @SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")`
	`125`	`+ @Safe`
	`126`	`+ @CompileTimeConstant`
	`127`	`+ @org.intellij.lang.annotations.Pattern(PATTERN_STRING)`
	`128`	`+ String value) {`
`121`	`129`	`this.reason = Preconditions.checkNotNull(value, "reason");`
`122`	`130`	`return this;`
`123`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public static <T> void encodeToResponse(`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @SuppressWarnings("for-rollout:Java8ApiChecker")`
`45`	`46`	`public static <T> QosReason parseFromResponse(T response, QosResponseDecodingAdapter<? super T> adapter) {`
`46`	`47`	`Optional<String> maybeDueTo = adapter.getFirstHeader(response, DUE_TO_HEADER);`
`47`	`48`	`Optional<String> maybeRetryHint = adapter.getFirstHeader(response, RETRY_HINT_HEADER);`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ static String renderUnsafeMessage(String exceptionName, ErrorType errorType, Arg`
`70`	`70`
`71`	`71`	`StringBuilder builder = new StringBuilder();`
`72`	`72`	`builder.append(message).append(": {");`
	`73`	`+ @SuppressWarnings("for-rollout:Var")`
`73`	`74`	`boolean first = true;`
`74`	`75`	`for (Arg<?> arg : args) {`
`75`	`76`	`if (arg == null) {`
`@@ -116,14 +117,14 @@ private static String generateErrorInstanceId(`
`116`	`117`	`// we don't need cryptographically secure random UUIDs`
`117`	`118`	`return UniqueIds.pseudoRandomUuidV4().toString();`
`118`	`119`	`}`
`119`		`- if (cause instanceof ServiceException) {`
`120`		`- return ((ServiceException) cause).getErrorInstanceId();`
	`120`	`+ if (cause instanceof ServiceException serviceException) {`
	`121`	`+ return serviceException.getErrorInstanceId();`
`121`	`122`	`}`
`122`		`- if (cause instanceof CheckedServiceException) {`
`123`		`- return ((CheckedServiceException) cause).getErrorInstanceId();`
	`123`	`+ if (cause instanceof CheckedServiceException checkedServiceException) {`
	`124`	`+ return checkedServiceException.getErrorInstanceId();`
`124`	`125`	`}`
`125`		`- if (cause instanceof RemoteException) {`
`126`		`- return ((RemoteException) cause).getError().errorInstanceId();`
	`126`	`+ if (cause instanceof RemoteException remoteException) {`
	`127`	`+ return remoteException.getError().errorInstanceId();`
`127`	`128`	`}`
`128`	`129`	`return generateErrorInstanceId(cause.getCause(), dejaVu);`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public String getLogMessage() {`
`52`	`52`	`return getMessage();`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ @SuppressWarnings("for-rollout:Java8ApiChecker")`
`55`	`56`	`@Unsafe`
`56`	`57`	`@Override`
`57`	`58`	`public List<Arg<?>> getArgs() {`