From 8f29c86ae684fdd5ef99b862ee1a82f27553f3c1 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Tue, 22 Jun 2021 15:49:48 -0700 Subject: [PATCH 1/2] Clarify UnknownRemoteException message --- .../conjure/java/api/errors/UnknownRemoteException.java | 4 ++-- .../conjure/java/api/errors/UnknownRemoteExceptionTest.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) 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 index c2515ee22..b300ca91d 100644 --- 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 @@ -42,14 +42,14 @@ public String getBody() { } public UnknownRemoteException(int status, String body) { - super(String.format("Error %s. (Failed to parse response body as SerializableError.)", status)); + super(String.format("UnknownRemoteException: %s", status)); this.status = status; this.body = body; } @Override public String getLogMessage() { - return "Failed to parse response body as SerializableError."; + return getMessage(); } @Override diff --git a/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java b/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java index 328f8c411..8bf66b584 100644 --- a/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java +++ b/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java @@ -27,9 +27,8 @@ class UnknownRemoteExceptionTest { @Test public void testMessage() { UnknownRemoteException exception = new UnknownRemoteException(404, "not found"); - assertThat(exception.getMessage()) - .isEqualTo("Error 404. (Failed to parse response body as SerializableError.)"); - assertThat(exception.getLogMessage()).isEqualTo("Failed to parse response body as SerializableError."); + assertThat(exception.getMessage()).isEqualTo("UnknownRemoteException: 404"); + assertThat(exception.getLogMessage()).isEqualTo("UnknownRemoteException: 404"); } @Test From 62984b14155ae1ce1f31643f3017cadd061a07e2 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Tue, 22 Jun 2021 20:24:18 -0700 Subject: [PATCH 2/2] Comments --- .../conjure/java/api/errors/UnknownRemoteException.java | 2 +- .../conjure/java/api/errors/UnknownRemoteExceptionTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index b300ca91d..fa8a539e6 100644 --- 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 @@ -42,7 +42,7 @@ public String getBody() { } public UnknownRemoteException(int status, String body) { - super(String.format("UnknownRemoteException: %s", status)); + super(String.format("Response status: %s", status)); this.status = status; this.body = body; } diff --git a/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java b/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java index 8bf66b584..cfc42c2df 100644 --- a/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java +++ b/errors/src/test/java/com/palantir/conjure/java/api/errors/UnknownRemoteExceptionTest.java @@ -27,8 +27,8 @@ class UnknownRemoteExceptionTest { @Test public void testMessage() { UnknownRemoteException exception = new UnknownRemoteException(404, "not found"); - assertThat(exception.getMessage()).isEqualTo("UnknownRemoteException: 404"); - assertThat(exception.getLogMessage()).isEqualTo("UnknownRemoteException: 404"); + assertThat(exception.getMessage()).isEqualTo("Response status: 404"); + assertThat(exception.getLogMessage()).isEqualTo("Response status: 404"); } @Test