Skip to content

Commit fbd3163

Browse files
Excavator: Upgrades Baseline to the latest version (#1351)
1 parent e8a3ee2 commit fbd3163

18 files changed

Lines changed: 4 additions & 59 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.68.0'
1515
classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.9.0'
1616
classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'
17-
classpath 'com.palantir.baseline:gradle-baseline-java:6.34.0'
17+
classpath 'com.palantir.baseline:gradle-baseline-java:6.35.0'
1818
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
1919
}
2020
}

errors/src/main/java/com/palantir/conjure/java/api/errors/QosException.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ public String getLogMessage() {
224224
return "Suggested request throttling";
225225
}
226226

227-
@SuppressWarnings("for-rollout:Java8ApiChecker")
228227
@Override
229228
public List<Arg<?>> getArgs() {
230229
return List.of(
@@ -276,7 +275,6 @@ public String getLogMessage() {
276275
return this.getClass().getSimpleName() + ": Requesting retry";
277276
}
278277

279-
@SuppressWarnings("for-rollout:Java8ApiChecker")
280278
@Unsafe
281279
@Override
282280
public List<Arg<?>> getArgs() {
@@ -320,7 +318,6 @@ public String getLogMessage() {
320318
return SERVER_UNAVAILABLE;
321319
}
322320

323-
@SuppressWarnings("for-rollout:Java8ApiChecker")
324321
@Override
325322
public List<Arg<?>> getArgs() {
326323
return List.of(

errors/src/main/java/com/palantir/conjure/java/api/errors/QosReason.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ private QosReason(@Safe String reason, Optional<RetryHint> retryHint, Optional<D
5353
}
5454

5555
public static QosReason of(
56-
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
57-
@Safe
58-
@CompileTimeConstant
59-
@org.intellij.lang.annotations.Pattern(PATTERN_STRING)
60-
String reason) {
56+
@Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String reason) {
6157
return new QosReason(reason, Optional.empty(), Optional.empty());
6258
}
6359

@@ -121,11 +117,7 @@ public Builder from(QosReason other) {
121117
}
122118

123119
public Builder reason(
124-
@SuppressWarnings("for-rollout:UnnecessarilyFullyQualified")
125-
@Safe
126-
@CompileTimeConstant
127-
@org.intellij.lang.annotations.Pattern(PATTERN_STRING)
128-
String value) {
120+
@Safe @CompileTimeConstant @org.intellij.lang.annotations.Pattern(PATTERN_STRING) String value) {
129121
this.reason = Preconditions.checkNotNull(value, "reason");
130122
return this;
131123
}

errors/src/main/java/com/palantir/conjure/java/api/errors/QosReasons.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public static <T> void encodeToResponse(
4242
}
4343
}
4444

45-
@SuppressWarnings("for-rollout:Java8ApiChecker")
4645
public static <T> QosReason parseFromResponse(T response, QosResponseDecodingAdapter<? super T> adapter) {
4746
Optional<String> maybeDueTo = adapter.getFirstHeader(response, DUE_TO_HEADER);
4847
Optional<String> maybeRetryHint = adapter.getFirstHeader(response, RETRY_HINT_HEADER);

errors/src/main/java/com/palantir/conjure/java/api/errors/RemoteException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public RemoteException(SerializableError error, int status) {
6363
@Override
6464
public String getMessage() {
6565
// This field is not used in most environments so the cost of computation may be avoided.
66-
@SuppressWarnings("for-rollout:Var")
6766
String messageValue = unsafeMessage;
6867
if (messageValue == null) {
6968
messageValue = renderUnsafeMessage();

errors/src/main/java/com/palantir/conjure/java/api/errors/ServiceExceptionUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ static String renderUnsafeMessage(String exceptionName, ErrorType errorType, Arg
7070

7171
StringBuilder builder = new StringBuilder();
7272
builder.append(message).append(": {");
73-
@SuppressWarnings("for-rollout:Var")
7473
boolean first = true;
7574
for (Arg<?> arg : args) {
7675
if (arg == null) {

errors/src/main/java/com/palantir/conjure/java/api/errors/UnknownRemoteException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public String getLogMessage() {
5252
return getMessage();
5353
}
5454

55-
@SuppressWarnings("for-rollout:Java8ApiChecker")
5655
@Unsafe
5756
@Override
5857
public List<Arg<?>> getArgs() {

errors/src/test/java/com/palantir/conjure/java/api/errors/ErrorTypeTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
public final class ErrorTypeTest {
2828

29-
@SuppressWarnings("for-rollout:DifferentNameButSame")
3029
@Test
3130
public void testNameMustBeCamelCaseWithOptionalNameSpace() throws Exception {
3231
String[] badNames = new String[] {":", "foo:Bar", ":Bar", "Bar:", "foo:bar", "Foo:bar", "Foo:2Bar"};
@@ -65,26 +64,21 @@ public void testDefaultErrorTypeHttpErrorCodes() throws Exception {
6564
assertThat(ErrorType.INTERNAL.httpErrorCode()).isEqualTo(500);
6665
}
6766

68-
@SuppressWarnings("for-rollout:DifferentNameButSame")
6967
@Test
7068
public void testCanCreateCustomClientAndServerErrors() throws Exception {
71-
@SuppressWarnings("for-rollout:DifferentNameButSame")
7269
ErrorType customClient = ErrorType.create(ErrorType.Code.CUSTOM_CLIENT, "Namespace:MyDesc");
7370
assertThat(customClient.code()).isEqualTo(ErrorType.Code.CUSTOM_CLIENT);
7471
assertThat(customClient.httpErrorCode()).isEqualTo(400);
7572
assertThat(customClient.name()).isEqualTo("Namespace:MyDesc");
7673

77-
@SuppressWarnings("for-rollout:DifferentNameButSame")
7874
ErrorType customServer = ErrorType.create(ErrorType.Code.CUSTOM_SERVER, "Namespace:MyDesc");
7975
assertThat(customServer.code()).isEqualTo(ErrorType.Code.CUSTOM_SERVER);
8076
assertThat(customServer.httpErrorCode()).isEqualTo(500);
8177
assertThat(customServer.name()).isEqualTo("Namespace:MyDesc");
8278
}
8379

84-
@SuppressWarnings("for-rollout:DifferentNameButSame")
8580
@Test
8681
public void testCanCreateNewErrorTypes() throws Exception {
87-
@SuppressWarnings("for-rollout:DifferentNameButSame")
8882
ErrorType error = ErrorType.create(ErrorType.Code.FAILED_PRECONDITION, "Namespace:MyDesc");
8983
assertThat(error.code()).isEqualTo(ErrorType.Code.FAILED_PRECONDITION);
9084
assertThat(error.httpErrorCode()).isEqualTo(500);

errors/src/test/java/com/palantir/conjure/java/api/errors/RemoteExceptionTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ public final class RemoteExceptionTest {
2727
@Test
2828
public void testJavaSerialization() {
2929
// With explicit error instance
30-
@SuppressWarnings("for-rollout:Var")
3130
SerializableError error = new SerializableError.Builder()
3231
.errorCode("errorCode")
3332
.errorName("errorName")
3433
.errorInstanceId("errorId")
3534
.build();
36-
@SuppressWarnings("for-rollout:Var")
3735
RemoteException expected = new RemoteException(error, 500);
38-
@SuppressWarnings("for-rollout:Var")
3936
RemoteException actual = SerializationUtils.deserialize(SerializationUtils.serialize(expected));
4037
assertThat(actual).isEqualToComparingFieldByField(expected);
4138

errors/src/test/java/com/palantir/conjure/java/api/errors/SerializableErrorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public void forException_arg_key_collisions_just_use_the_last_one() {
7575
@Test
7676
public void forException_listArgValue_serializesWithToString() {
7777
ErrorType error = ErrorType.INTERNAL;
78-
@SuppressWarnings("for-rollout:Java8ApiChecker")
7978
ServiceException exception = new ServiceException(
8079
error, SafeArg.of("safe-list", List.of("1", "2")), UnsafeArg.of("unsafe-list", List.of("3", "4")));
8180

@@ -92,7 +91,6 @@ public void forException_listArgValue_serializesWithToString() {
9291
@Test
9392
public void forException_mapArgValue_serializesWithToString() {
9493
ErrorType error = ErrorType.INTERNAL;
95-
@SuppressWarnings("for-rollout:Java8ApiChecker")
9694
ServiceException exception = new ServiceException(
9795
error, SafeArg.of("safe-map", Map.of("1", "2")), UnsafeArg.of("unsafe-map", Map.of("ABC", "DEF")));
9896

0 commit comments

Comments
 (0)