From 86841ebfe3071ec96b6e6e64ae692f85d346885c Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Wed, 9 Dec 2015 22:22:34 -0800 Subject: [PATCH] GUAC-1429: Return whole objects instead of identifiers to fix text/plain conversion error. --- .../rest/connection/ConnectionRESTService.java | 13 ++++++------- .../ConnectionGroupRESTService.java | 16 +++++++--------- .../net/basic/rest/user/UserRESTService.java | 9 ++++----- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java index 258d81962..fad3c4ef4 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java @@ -249,8 +249,8 @@ public class ConnectionRESTService { } /** - * Creates a new connection and returns the identifier of the new - * connection. + * Creates a new connection and returns the new connection, with identifier + * field populated. * * @param authToken * The authentication token that is used to authenticate the user @@ -264,14 +264,13 @@ public class ConnectionRESTService { * The connection to create. * * @return - * The identifier of the new connection. + * The new connection. * * @throws GuacamoleException * If an error occurs while creating the connection. */ @POST - @Produces(MediaType.TEXT_PLAIN) - public String createConnection(@QueryParam("token") String authToken, + public APIConnection createConnection(@QueryParam("token") String authToken, @PathParam("dataSource") String authProviderIdentifier, APIConnection connection) throws GuacamoleException { @@ -286,8 +285,8 @@ public class ConnectionRESTService { Directory connectionDirectory = userContext.getConnectionDirectory(); connectionDirectory.add(new APIConnectionWrapper(connection)); - // Return the new connection identifier - return connection.getIdentifier(); + // Return the new connection + return connection; } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java index 77bcbdfae..1a1bcadee 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java @@ -190,10 +190,8 @@ public class ConnectionGroupRESTService { } /** - * Creates a new connection group and returns the identifier of the new connection group. - * If a parentID is provided, the connection group will be created in the - * connection group with the parentID. Otherwise, the root connection group - * will be used. + * Creates a new connection group and returns the new connection group, + * with identifier field populated. * * @param authToken * The authentication token that is used to authenticate the user @@ -207,14 +205,14 @@ public class ConnectionGroupRESTService { * The connection group to create. * * @return - * The identifier of the new connection group. + * The new connection group. * * @throws GuacamoleException * If an error occurs while creating the connection group. */ @POST - @Produces(MediaType.TEXT_PLAIN) - public String createConnectionGroup(@QueryParam("token") String authToken, + public APIConnectionGroup createConnectionGroup( + @QueryParam("token") String authToken, @PathParam("dataSource") String authProviderIdentifier, APIConnectionGroup connectionGroup) throws GuacamoleException { @@ -229,8 +227,8 @@ public class ConnectionGroupRESTService { Directory connectionGroupDirectory = userContext.getConnectionGroupDirectory(); connectionGroupDirectory.add(new APIConnectionGroupWrapper(connectionGroup)); - // Return the new connection group identifier - return connectionGroup.getIdentifier(); + // Return the new connection group + return connectionGroup; } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java index 404757b86..0aa92446e 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java @@ -217,7 +217,7 @@ public class UserRESTService { } /** - * Creates a new user and returns the username. + * Creates a new user and returns the user that was created. * * @param authToken * The authentication token that is used to authenticate the user @@ -234,11 +234,10 @@ public class UserRESTService { * If a problem is encountered while creating the user. * * @return - * The username of the newly created user. + * The newly created user. */ @POST - @Produces(MediaType.TEXT_PLAIN) - public String createUser(@QueryParam("token") String authToken, + public APIUser createUser(@QueryParam("token") String authToken, @PathParam("dataSource") String authProviderIdentifier, APIUser user) throws GuacamoleException { @@ -255,7 +254,7 @@ public class UserRESTService { // Create the user userDirectory.add(new APIUserWrapper(user)); - return user.getUsername(); + return user; }