Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master 5d7e35748 -> 4a03c826f
Improved error message a bit more... Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/4a03c826 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/4a03c826 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/4a03c826 Branch: refs/heads/master Commit: 4a03c826f9e705fb4117974b308896335fc842ad Parents: 5d7e357 Author: ddekany <[email protected]> Authored: Tue Nov 14 23:50:06 2017 +0100 Committer: ddekany <[email protected]> Committed: Tue Nov 14 23:50:06 2017 +0100 ---------------------------------------------------------------------- .../onlinetester/model/ErrorResponse.java | 19 +++++++++++++++++++ src/main/resources/assets/js/script.js | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/4a03c826/src/main/java/org/apache/freemarker/onlinetester/model/ErrorResponse.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/onlinetester/model/ErrorResponse.java b/src/main/java/org/apache/freemarker/onlinetester/model/ErrorResponse.java index 68ddf69..d8a91cf 100644 --- a/src/main/java/org/apache/freemarker/onlinetester/model/ErrorResponse.java +++ b/src/main/java/org/apache/freemarker/onlinetester/model/ErrorResponse.java @@ -27,4 +27,23 @@ public class ErrorResponse { this.errorCode = errorCode; this.errorDescription = errorDescription; } + + // Keep setters/getters to allow conversion to/from JSON! + + public ErrorCode getErrorCode() { + return errorCode; + } + + public void setErrorCode(ErrorCode errorCode) { + this.errorCode = errorCode; + } + + public String getErrorDescription() { + return errorDescription; + } + + public void setErrorDescription(String errorDescription) { + this.errorDescription = errorDescription; + } + } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/4a03c826/src/main/resources/assets/js/script.js ---------------------------------------------------------------------- diff --git a/src/main/resources/assets/js/script.js b/src/main/resources/assets/js/script.js index a088437..776d90a 100644 --- a/src/main/resources/assets/js/script.js +++ b/src/main/resources/assets/js/script.js @@ -69,7 +69,10 @@ function execute() { if (typeof data.responseJSON.errorCode != 'undefined') { showResult(data.responseJSON.errorCode + ": " + data.responseJSON.errorDescription, true); } else { - showResult("The service has responded with error (HTTP " + data.status + "; no details available)", true); + showResult("The service has responded with error:\n" + + "HTTP " + data.status + + (data.responseJSON.message ? ":\n" + data.responseJSON.message : " (No more details available)"), + true); } } else { showResult("The service was unavailable or had returned an invalid response.", true);
