Skip to content

Commit c79d3a8

Browse files
author
Robert Fink
committed
Change SerializableError json name from errorId to errorInstanceId
1 parent be740c3 commit c79d3a8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public String errorName() {
6565
* #errorName}, the {@link #errorInstanceId} identifies a specific occurrence of an error, not a class of errors. By
6666
* convention, this field is a UUID.
6767
*/
68-
@JsonProperty("errorId")
68+
@JsonProperty("errorInstanceId")
6969
@Value.Default
7070
@SuppressWarnings("checkstyle:designforextension")
7171
public String errorInstanceId() {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ public void testExceptionToError() {
5151
@Test
5252
public void testSerializationContainsRedundantParameters() throws Exception {
5353
assertThat(mapper.writeValueAsString(ERROR))
54-
.isEqualTo("{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorId\":\"\",\"parameters\":{},"
54+
.isEqualTo("{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorInstanceId\":\"\",\"parameters\":{},"
5555
+ "\"exceptionClass\":\"code\",\"message\":\"name\"}");
5656

5757
assertThat(mapper.writeValueAsString(
5858
SerializableError.builder().from(ERROR).errorInstanceId("errorId").build()))
59-
.isEqualTo("{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorId\":\"errorId\",\"parameters\":{},"
60-
+ "\"exceptionClass\":\"code\",\"message\":\"name\"}");
59+
.isEqualTo("{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorInstanceId\":\"errorId\""
60+
+ ",\"parameters\":{},\"exceptionClass\":\"code\",\"message\":\"name\"}");
6161
}
6262

6363
@Test
@@ -69,7 +69,7 @@ public void testDeserializesWhenRedundantParamerersAreGiven() throws Exception {
6969

7070
@Test
7171
public void testDeserializesWhenExplicitErrorIdIsGiven() throws Exception {
72-
String serialized = "{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorId\":\"errorId\"}";
72+
String serialized = "{\"errorCode\":\"code\",\"errorName\":\"name\",\"errorInstanceId\":\"errorId\"}";
7373
assertThat(deserialize(serialized))
7474
.isEqualTo(SerializableError.builder().from(ERROR).errorInstanceId("errorId").build());
7575
}

0 commit comments

Comments
 (0)