Merge commit 'refs/pull/457/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6c08e29c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6c08e29c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6c08e29c Branch: refs/heads/master Commit: 6c08e29c87659477702d0c96d6a90607dc07a610 Parents: e7d2d92 f563a8d Author: Michael Russo <michaelaru...@gmail.com> Authored: Mon Jan 25 16:03:26 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Mon Jan 25 16:03:26 2016 -0800 ---------------------------------------------------------------------- .../org/apache/usergrid/rest/ApiResponse.java | 2 +- .../rest/applications/ApplicationResource.java | 3 +- .../exceptions/AbstractExceptionMapper.java | 8 ++- .../AwsPropertiesNotFoundExceptionMapper.java | 3 +- .../exceptions/NotAllowedExceptionMapper.java | 21 ++++++ .../UnsupportedOperationExceptionMapper.java | 19 +++++ .../UnsupportedRestOperationException.java | 25 +++++++ ...UnsupportedRestOperationExceptionMapper.java | 34 +++++++++ ...upportedServiceOperationExceptionMapper.java | 18 +++++ .../applications/ApplicationResource.java | 3 +- .../usergrid/rest/test/PropertiesResource.java | 3 +- .../rest/test/RefreshIndexResource.java | 3 +- .../usergrid/rest/ExceptionResourceIT.java | 75 ++++++++++++++++++++ .../endpoints/OrganizationResource.java | 3 +- .../rest/test/resource/model/Collection.java | 4 +- 15 files changed, 213 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6c08e29c/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6c08e29c/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java ---------------------------------------------------------------------- diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java index 26e2736,765e9fb..b4fad57 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java @@@ -105,9 -107,8 +107,9 @@@ public abstract class AbstractException // only log real errors as errors logger.error( "Server Error (" + status + "):\n" + jsonResponse ); } else if ( logger.isDebugEnabled() ) { - logger.debug( "Server Error (" + status + "):\n" + jsonResponse ); + logger.debug( "Client Error (" + status + "):\n" + jsonResponse ); } + String callback = httpServletRequest.getParameter( "callback" ); if ( isJSONP() && isNotBlank( callback ) ) { jsonResponse = wrapJSONPResponse( callback, jsonResponse ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/6c08e29c/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6c08e29c/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java ----------------------------------------------------------------------
