Repository: usergrid Updated Branches: refs/heads/master fa01f84fc -> 5f62f8f04
Ensure the gcm exceptions are production valid json exceptions. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5f62f8f0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5f62f8f0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5f62f8f0 Branch: refs/heads/master Commit: 5f62f8f04425f6264bb7856729c9adf710b71718 Parents: fa01f84 Author: Michael Russo <[email protected]> Authored: Fri Jan 8 13:52:09 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Jan 8 13:52:09 2016 -0800 ---------------------------------------------------------------------- .../exceptions/GCMInvalidRequestExceptionMapper.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/5f62f8f0/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/GCMInvalidRequestExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/GCMInvalidRequestExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/GCMInvalidRequestExceptionMapper.java index 778ab85..1a0e3da 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/GCMInvalidRequestExceptionMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/GCMInvalidRequestExceptionMapper.java @@ -18,12 +18,13 @@ package org.apache.usergrid.rest.exceptions; import com.google.android.gcm.server.InvalidRequestException; +import org.apache.usergrid.rest.ApiResponse; -import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; import static javax.ws.rs.core.Response.Status.*; +import static org.apache.usergrid.utils.JsonUtils.mapToJsonString; @Provider @@ -50,6 +51,12 @@ public class GCMInvalidRequestExceptionMapper extends AbstractExceptionMapper<In message = "GCM Status Code: "+ e.getHttpStatusCode()+", Detail: "+e.getMessage(); } - return toResponse( status, message ); + // build a proper ApiResponse object + ApiResponse apiResponse = new ApiResponse(); + apiResponse.setError(status.toString()); + apiResponse.setErrorDescription(message); + + // give toResponse() the json string value of the ApiResponse + return toResponse( status, mapToJsonString(apiResponse) ); } }
