Skip to content

Commit ccacae9

Browse files
meditativeapeRobert Fink
authored andcommitted
Include instance ID in remote exception message (#46)
1 parent 8d8b43b commit ccacae9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ public int getStatus() {
3737

3838
public RemoteException(SerializableError error, int status) {
3939
super(error.errorCode().equals(error.errorName())
40-
? String.format("RemoteException: %s", error.errorCode())
41-
: String.format("RemoteException: %s (%s)", error.errorCode(), error.errorName()));
40+
? String.format("RemoteException: %s with instance ID %s", error.errorCode(), error.errorInstanceId())
41+
: String.format("RemoteException: %s (%s) with instance ID %s",
42+
error.errorCode(), error.errorName(), error.errorInstanceId()));
4243

4344
this.error = error;
4445
this.status = status;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ public void testSuperMessage() {
5252
.errorName("errorName")
5353
.errorInstanceId("errorId")
5454
.build();
55-
assertThat(new RemoteException(error, 500).getMessage()).isEqualTo("RemoteException: errorCode (errorName)");
55+
assertThat(new RemoteException(error, 500).getMessage())
56+
.isEqualTo("RemoteException: errorCode (errorName) with instance ID errorId");
5657

5758
error = new SerializableError.Builder()
5859
.errorCode("errorCode")
5960
.errorName("errorCode")
6061
.errorInstanceId("errorId")
6162
.build();
62-
assertThat(new RemoteException(error, 500).getMessage()).isEqualTo("RemoteException: errorCode");
63+
assertThat(new RemoteException(error, 500).getMessage())
64+
.isEqualTo("RemoteException: errorCode with instance ID errorId");
6365
}
6466
}

0 commit comments

Comments
 (0)