Skip to content

Commit 7669548

Browse files
author
Brian Laub
committed
pr feedback
1 parent c9c4ad6 commit 7669548

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

deadlines/src/main/java/com/palantir/deadlines/DeadlineExpiredReasons.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@ public static <T> Optional<DeadlineExpiredException> parseFromResponse(
4141
});
4242
}
4343

44-
public static int getHttpStatusCode(DeadlineExpiredException.External _exception) {
45-
// external deadline expiration is considered a client error
46-
return 400;
47-
}
48-
49-
public static int getHttpStatusCode(DeadlineExpiredException.Internal _exception) {
50-
// internal deadline expiration is considered a server error
51-
return 500;
44+
public static int getHttpStatusCode(DeadlineExpiredException exception) {
45+
if (exception instanceof DeadlineExpiredException.External) {
46+
// external deadline expiration is considered a client error
47+
return 400;
48+
} else if (exception instanceof DeadlineExpiredException.Internal) {
49+
// internal deadline expiration is considered a server error
50+
return 500;
51+
} else {
52+
// anything else is considered a server error
53+
return 500;
54+
}
5255
}
5356

5457
public interface ResponseEncodingAdapter<RESPONSE> {

deadlines/src/test/java/com/palantir/deadlines/DeadlineExpiredReasonsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DeadlineExpiredReasonsTest {
2828

2929
@Test
3030
public void encodes_external_to_response() {
31-
DeadlineExpiredException.External exception = DeadlineExpiredException.external();
31+
DeadlineExpiredException exception = DeadlineExpiredException.external();
3232
TestResponse response = new TestResponse();
3333
response.status = DeadlineExpiredReasons.getHttpStatusCode(exception);
3434
DeadlineExpiredReasons.encodeToResponse(exception, response, Encoder.INSTANCE);
@@ -38,10 +38,10 @@ public void encodes_external_to_response() {
3838

3939
@Test
4040
public void encodes_internal_to_response() {
41-
DeadlineExpiredException.Internal exception = DeadlineExpiredException.internal();
41+
DeadlineExpiredException exception = DeadlineExpiredException.internal();
4242
TestResponse response = new TestResponse();
4343
response.status = DeadlineExpiredReasons.getHttpStatusCode(exception);
44-
DeadlineExpiredReasons.encodeToResponse(DeadlineExpiredException.internal(), response, Encoder.INSTANCE);
44+
DeadlineExpiredReasons.encodeToResponse(exception, response, Encoder.INSTANCE);
4545
assertThat(response.status).isEqualTo(500);
4646
assertThat(response.headers).contains(entry(DeadlinesHttpHeaders.DEADLINE_EXPIRED_REASON, "internal"));
4747
}

0 commit comments

Comments
 (0)