From 7d1d5cdf1338f86043b54dd1e00012495923a238 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Thu, 19 Jan 2023 00:45:38 +0000 Subject: [PATCH] GUACAMOLE-926: Success / Error handling in REST API. --- .../src/main/java/org/apache/guacamole/rest/APIError.java | 2 ++ .../apache/guacamole/rest/directory/DirectoryResource.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java index 846e2930e..0d925d04f 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java @@ -202,6 +202,8 @@ public class APIError { this.translatableMessage = translatable.getTranslatableMessage(); } + // TODO: Handle patch exceptions, need a bunch of JSON saying which things failed + // Use generic translation string if message is not translated else this.translatableMessage = new TranslatableMessage(UNTRANSLATED_MESSAGE_KEY, diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java index 412068a96..9ca71dba0 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java @@ -564,7 +564,9 @@ public abstract class DirectoryResource