From 6f73a458c78f36779a41fd047c1db27141edc191 Mon Sep 17 00:00:00 2001 From: Deniz Kilic Date: Sun, 19 Jan 2020 13:04:38 +0100 Subject: [PATCH 1/3] added message field --- .../com/messagebird/objects/ErrorReport.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/com/messagebird/objects/ErrorReport.java b/api/src/main/java/com/messagebird/objects/ErrorReport.java index 00c74aa9..e5665dbe 100644 --- a/api/src/main/java/com/messagebird/objects/ErrorReport.java +++ b/api/src/main/java/com/messagebird/objects/ErrorReport.java @@ -1,32 +1,40 @@ package com.messagebird.objects; +import com.fasterxml.jackson.annotation.JsonInclude; /** * When MessageBird returns a 4xx, you will find a list of any error codes in your return dataset. * you will receive a list of errors from the API in such case. * * Created by rvt on 1/5/15. */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) public class ErrorReport { private Integer code; private String description; private String parameter; + private String message; public ErrorReport() { } - public ErrorReport(Integer code, String description, String parameter) { + public ErrorReport(Integer code, String description, String parameter, String message) { this.code = code; this.description = description; this.parameter = parameter; + this.message = message; } @Override public String toString() { - return "ErrorReport{" + - "code=" + code + - ", description='" + description + '\'' + - ", parameter='" + parameter + '\'' + - '}'; + String str = "ErrorReport{code=" + code; + if (message != null) { + str = str.concat(", message='" + message + "'"); + } else { + str = str.concat(", description=''" + description + "'"); + str = str.concat(", parameter='" + parameter + "'"); + } + str = str.concat("}"); + return str; } /** @@ -53,4 +61,11 @@ public String getParameter() { return parameter; } + /** + * message not null for only voice API response + * @return + */ + public String getMessage() { + return message; + } } From 9f01d3d767890510a0768480e97ab7f55663e74f Mon Sep 17 00:00:00 2001 From: Deniz Kilic Date: Sun, 19 Jan 2020 13:12:06 +0100 Subject: [PATCH 2/3] fixing typo --- api/src/main/java/com/messagebird/objects/ErrorReport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/com/messagebird/objects/ErrorReport.java b/api/src/main/java/com/messagebird/objects/ErrorReport.java index e5665dbe..d538dd5d 100644 --- a/api/src/main/java/com/messagebird/objects/ErrorReport.java +++ b/api/src/main/java/com/messagebird/objects/ErrorReport.java @@ -30,7 +30,7 @@ public String toString() { if (message != null) { str = str.concat(", message='" + message + "'"); } else { - str = str.concat(", description=''" + description + "'"); + str = str.concat(", description='" + description + "'"); str = str.concat(", parameter='" + parameter + "'"); } str = str.concat("}"); From 768fe954ac7677d078891e6834f98804f933b82a Mon Sep 17 00:00:00 2001 From: Deniz Kilic Date: Sun, 19 Jan 2020 13:21:38 +0100 Subject: [PATCH 3/3] fixed after review --- api/src/main/java/com/messagebird/objects/ErrorReport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/com/messagebird/objects/ErrorReport.java b/api/src/main/java/com/messagebird/objects/ErrorReport.java index d538dd5d..d0d63d5a 100644 --- a/api/src/main/java/com/messagebird/objects/ErrorReport.java +++ b/api/src/main/java/com/messagebird/objects/ErrorReport.java @@ -27,7 +27,7 @@ public ErrorReport(Integer code, String description, String parameter, String me @Override public String toString() { String str = "ErrorReport{code=" + code; - if (message != null) { + if (message != null && !message.isEmpty()) { str = str.concat(", message='" + message + "'"); } else { str = str.concat(", description='" + description + "'");