use string constants wherever possible in @Produces annotations.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3749e741 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3749e741 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3749e741 Branch: refs/heads/two-dot-o-dev Commit: 3749e7415197863b8fd0f8af3bbcdec59ba137fc Parents: ed3ba7c Author: Dave Johnson <[email protected]> Authored: Tue Sep 8 16:38:43 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Sep 8 16:38:43 2015 -0400 ---------------------------------------------------------------------- .../org/apache/usergrid/rest/IndexResource.java | 18 ++++++------- .../apache/usergrid/rest/MigrateResource.java | 10 +++---- .../org/apache/usergrid/rest/RootResource.java | 8 +++--- .../apache/usergrid/rest/SwaggerServlet.java | 5 ++-- .../apache/usergrid/rest/SystemResource.java | 4 +-- .../usergrid/rest/TextToJsonSwapWriter.java | 2 +- .../rest/applications/ApplicationResource.java | 6 ++--- .../rest/applications/ServiceResource.java | 12 ++++----- .../applications/assets/AssetsResource.java | 4 +-- .../applications/events/EventsResource.java | 2 +- .../notifiers/NotifierResource.java | 2 +- .../notifiers/NotifiersResource.java | 2 +- .../rest/applications/queues/QueueResource.java | 12 ++++----- .../queues/QueueSubscriberResource.java | 8 +++--- .../queues/QueueSubscriptionResource.java | 8 +++--- .../queues/QueueTransactionsResource.java | 4 +-- .../rest/applications/users/UserResource.java | 28 ++++++++++---------- .../rest/applications/users/UsersResource.java | 4 +-- .../exceptions/SecurityExceptionMapper.java | 3 ++- .../organizations/OrganizationResource.java | 12 ++++----- .../organizations/OrganizationsResource.java | 6 ++--- .../applications/ApplicationResource.java | 12 ++++----- .../applications/ApplicationsResource.java | 6 ++--- .../imports/FileErrorsResource.java | 4 +-- .../imports/FileIncludesResource.java | 4 +-- .../applications/imports/ImportsResource.java | 6 ++--- .../organizations/users/UsersResource.java | 16 +++++------ .../rest/management/users/UserResource.java | 20 +++++++------- .../organizations/OrganizationsResource.java | 14 +++++----- .../ShiroAuthenticationExceptionMapper.java | 3 ++- 30 files changed, 124 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java index a785c0b..adeb06b 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java @@ -83,7 +83,7 @@ public class IndexResource extends AbstractContextResource { @GET @Path( "rebuild/{jobId}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({ MediaType.APPLICATION_JSON, "application/javascript" }) public ApiResponse rebuildIndexesGet( @PathParam( "jobId" ) String jobId, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) @@ -114,7 +114,7 @@ public class IndexResource extends AbstractContextResource { @PUT @Path( "rebuild" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildIndexesPut( final Map<String, Object> payload, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -131,7 +131,7 @@ public class IndexResource extends AbstractContextResource { @POST @Path( "rebuild/" + RootResource.APPLICATION_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildIndexesPut( @PathParam( "applicationId" ) String applicationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, @QueryParam( "delay" ) @DefaultValue( "10" ) final long delay ) @@ -154,7 +154,7 @@ public class IndexResource extends AbstractContextResource { @PUT @Path( "rebuild/" + RootResource.APPLICATION_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildIndexesPut( final Map<String, Object> payload, @PathParam( "applicationId" ) String applicationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, @@ -176,7 +176,7 @@ public class IndexResource extends AbstractContextResource { @POST @Path( "rebuild/" + RootResource.APPLICATION_ID_PATH + "/{collectionName}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildIndexesPost( @PathParam( "applicationId" ) final String applicationIdStr, @PathParam( "collectionName" ) final String collectionName, @QueryParam( "reverse" ) @DefaultValue( "false" ) final Boolean reverse, @@ -199,7 +199,7 @@ public class IndexResource extends AbstractContextResource { @PUT @Path( "rebuild/" + RootResource.APPLICATION_ID_PATH + "/{collectionName}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildIndexesPut( final Map<String, Object> payload, @PathParam( "applicationId" ) final String applicationIdStr, @PathParam( "collectionName" ) final String collectionName, @@ -222,7 +222,7 @@ public class IndexResource extends AbstractContextResource { @POST @Path( "rebuild/management" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildInternalIndexesPost( @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -240,7 +240,7 @@ public class IndexResource extends AbstractContextResource { @PUT @Path( "rebuild/management" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse rebuildInternalIndexesPut( final Map<String, Object> payload, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -259,7 +259,7 @@ public class IndexResource extends AbstractContextResource { @POST @Path(RootResource.APPLICATION_ID_PATH) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addIndex( @Context UriInfo ui, @PathParam( "applicationId" ) final String applicationIdStr, Map<String, Object> config, http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java index 168a3b7..800ded8 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java @@ -66,7 +66,7 @@ public class MigrateResource extends AbstractContextResource { @PUT @Path( "run" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse migrateData( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -114,7 +114,7 @@ public class MigrateResource extends AbstractContextResource { @PUT @Path( "run/{pluginName}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse migrateData(@PathParam("pluginName") String pluginName , @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -159,7 +159,7 @@ public class MigrateResource extends AbstractContextResource { @PUT @Path( "set" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setMigrationVersion( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "" ) String callback ) @@ -208,7 +208,7 @@ public class MigrateResource extends AbstractContextResource { @GET @Path( "status" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse migrateStatus( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) @@ -241,7 +241,7 @@ public class MigrateResource extends AbstractContextResource { @GET @Path( "count" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse migrateCount( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java index 8875295..4afccf9 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java @@ -96,7 +96,7 @@ public class RootResource extends AbstractContextResource implements MetricProce @GET @Path("applications") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getAllApplications( @Context UriInfo ui, @QueryParam("deleted") @DefaultValue("false") Boolean deleted, @@ -130,7 +130,7 @@ public class RootResource extends AbstractContextResource implements MetricProce @GET @Path("apps") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getAllApplications2( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws URISyntaxException { @@ -165,7 +165,7 @@ public class RootResource extends AbstractContextResource implements MetricProce @GET @Path("status") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getStatus( @QueryParam("ignore_error") @DefaultValue("true") Boolean ignoreError, @QueryParam("callback") @DefaultValue("callback") String callback ) { @@ -212,7 +212,7 @@ public class RootResource extends AbstractContextResource implements MetricProce @GET @Path("lb-status") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Response getLbStatus() { ResponseBuilder response; if ( usergridSystemMonitor.getIsCassandraAlive() ) { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java b/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java index 9db6ff4..e3a655b 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java @@ -33,6 +33,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +86,7 @@ public class SwaggerServlet extends HttpServlet implements Filter { if ( sc == null ) { return null; } - ApplicationContext appContext = + ApplicationContext appContext = WebApplicationContextUtils.getRequiredWebApplicationContext( sc ); return appContext.getBean( beanName ); } @@ -162,7 +163,7 @@ public class SwaggerServlet extends HttpServlet implements Filter { if ( json != null ) { allowAllOrigins( request, response ); if ( "get".equalsIgnoreCase( request.getMethod() ) ) { - response.setContentType( "application/json" ); + response.setContentType( MediaType.APPLICATION_JSON ); response.getWriter().print( json ); return true; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java index 0a09eba..bf2882c 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java @@ -51,7 +51,7 @@ public class SystemResource extends AbstractContextResource { @GET @Path( "database/setup" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getSetup( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -77,7 +77,7 @@ public class SystemResource extends AbstractContextResource { @GET @Path( "superuser/setup" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getSetupSuperuser( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java index f4067df..7a9b2d5 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java @@ -40,7 +40,7 @@ import org.glassfish.jersey.server.mvc.Viewable; // TODO: text to JSON swapping for Jersey 2 /** - * A writer that will redirect requests for "text/html" to "application/json" if the value + * A writer that will redirect requests for "text/html" to MediaType.APPLICATION_JSON if the value * returned by the resource is an instance of JSONWithPadding * * @author tnine http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java index f2bd8fc..7dc6717 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java @@ -355,7 +355,7 @@ public class ApplicationResource extends ServiceResource { @Path("credentials") @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getKeys( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -378,7 +378,7 @@ public class ApplicationResource extends ServiceResource { @Path("credentials") @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse generateKeys( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -599,7 +599,7 @@ public class ApplicationResource extends ServiceResource { @GET @Path("apm/apigeeMobileConfig") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Object getAPMConfig( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java index 6e10a9f..b0f1d51 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java @@ -375,7 +375,7 @@ public class ServiceResource extends AbstractContextResource { @RequireApplicationAccess @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePost( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -408,7 +408,7 @@ public class ServiceResource extends AbstractContextResource { @RequireApplicationAccess @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -425,7 +425,7 @@ public class ServiceResource extends AbstractContextResource { @DELETE @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeDelete( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, @@ -544,7 +544,7 @@ public class ServiceResource extends AbstractContextResource { @RequireApplicationAccess @Consumes(MediaType.MULTIPART_FORM_DATA) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeMultiPartPost( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, FormDataMultiPart multiPart ) throws Exception { @@ -558,7 +558,7 @@ public class ServiceResource extends AbstractContextResource { @RequireApplicationAccess @Consumes(MediaType.MULTIPART_FORM_DATA) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeMultiPartPut( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, FormDataMultiPart multiPart ) throws Exception { @@ -569,7 +569,7 @@ public class ServiceResource extends AbstractContextResource { @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) private ApiResponse executeMultiPart( UriInfo ui, String callback, FormDataMultiPart multiPart, ServiceAction serviceAction ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java index 4e2e6bb..a8a106e 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java @@ -82,7 +82,7 @@ public class AssetsResource extends ServiceResource { @RequireApplicationAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeGet( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -96,7 +96,7 @@ public class AssetsResource extends ServiceResource { @RequireApplicationAccess @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java index 5c528bd..d5709d7 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java @@ -55,7 +55,7 @@ public class EventsResource extends ServiceResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueResults executeQueueGet( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java index 1997601..c01f6a9 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java @@ -57,7 +57,7 @@ public class NotifierResource extends ServiceResource { @RequireApplicationAccess @Consumes(MediaType.MULTIPART_FORM_DATA) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) @Override public ApiResponse executeMultiPartPut(@Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java index b72a857..48493ce 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java @@ -104,7 +104,7 @@ public class NotifiersResource extends ServiceResource { @Consumes(MediaType.MULTIPART_FORM_DATA) @Override @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeMultiPartPost( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java index 9b9207b..98edf1c 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java @@ -91,7 +91,7 @@ public class QueueResource extends AbstractContextResource { @Path("properties") @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Queue getProperties( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -106,7 +106,7 @@ public class QueueResource extends AbstractContextResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Queue putProperties( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -119,7 +119,7 @@ public class QueueResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Object executeGet( @Context UriInfo ui, @QueryParam("start") String firstQueuePath, @QueryParam("limit") @DefaultValue("10") int limit, @QueryParam("callback") @DefaultValue("callback") String callback ) @@ -143,7 +143,7 @@ public class QueueResource extends AbstractContextResource { @POST @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueResults executePost( @Context UriInfo ui, Object body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -165,7 +165,7 @@ public class QueueResource extends AbstractContextResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Map<String, Object> executePut( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -180,7 +180,7 @@ public class QueueResource extends AbstractContextResource { @DELETE @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Queue executeDelete( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { throw new NotImplementedException( "Queue delete is not implemented yet" ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java index 5e6b57d..baa9535 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java @@ -81,7 +81,7 @@ public class QueueSubscriberResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriberQueuePath, @QueryParam("limit") @DefaultValue("10") int limit, @QueryParam("callback") @DefaultValue("callback") String callback ) @@ -98,7 +98,7 @@ public class QueueSubscriberResource extends AbstractContextResource { @POST @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executePost( @Context UriInfo ui, Map<String, Object> body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -112,7 +112,7 @@ public class QueueSubscriberResource extends AbstractContextResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executePut( @Context UriInfo ui, Map<String, Object> body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -138,7 +138,7 @@ public class QueueSubscriberResource extends AbstractContextResource { @DELETE @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executeDelete( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java index b99ecad..a21cd66 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java @@ -83,7 +83,7 @@ public class QueueSubscriptionResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriptionQueuePath, @QueryParam("limit") @DefaultValue("10") int limit, @QueryParam("callback") @DefaultValue("callback") String callback ) @@ -100,7 +100,7 @@ public class QueueSubscriptionResource extends AbstractContextResource { @POST @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executePost( @Context UriInfo ui, Map<String, Object> body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -114,7 +114,7 @@ public class QueueSubscriptionResource extends AbstractContextResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executePut( @Context UriInfo ui, Map<String, Object> body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -140,7 +140,7 @@ public class QueueSubscriptionResource extends AbstractContextResource { @DELETE @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public QueueSet executeDelete( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java index 1e7e304..199e7f8 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java @@ -65,7 +65,7 @@ public class QueueTransactionsResource extends AbstractContextResource { @Path("{id}") @PUT @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Results updateTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -81,7 +81,7 @@ public class QueueTransactionsResource extends AbstractContextResource { @Path("{id}") @DELETE @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Results removeTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java index 95adfc4..b84fc08 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java @@ -84,7 +84,7 @@ public class UserResource extends ServiceResource { @RequireApplicationAccess @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -104,7 +104,7 @@ public class UserResource extends ServiceResource { @PUT @Path("password") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -150,7 +150,7 @@ public class UserResource extends ServiceResource { @POST @Path("password") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -161,7 +161,7 @@ public class UserResource extends ServiceResource { @POST @Path("deactivate") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse deactivate( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("") String callback ) throws Exception { @@ -179,7 +179,7 @@ public class UserResource extends ServiceResource { @GET @Path("sendpin") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse sendPin( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -203,7 +203,7 @@ public class UserResource extends ServiceResource { @POST @Path("sendpin") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse postSendPin( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -215,7 +215,7 @@ public class UserResource extends ServiceResource { @Path("setpin") @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setPin( @Context UriInfo ui, @QueryParam("pin") String pin, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -241,7 +241,7 @@ public class UserResource extends ServiceResource { @Consumes("application/x-www-form-urlencoded") @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse postPin( @Context UriInfo ui, @FormParam("pin") String pin, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -267,7 +267,7 @@ public class UserResource extends ServiceResource { @Consumes(MediaType.APPLICATION_JSON) @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse jsonPin( @Context UriInfo ui, JsonNode json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -457,7 +457,7 @@ public class UserResource extends ServiceResource { @GET @Path("reactivate") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse reactivate( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -476,7 +476,7 @@ public class UserResource extends ServiceResource { @POST @Path("revoketokens") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokensPost( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -495,7 +495,7 @@ public class UserResource extends ServiceResource { @PUT @Path("revoketokens") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokensPut( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -506,7 +506,7 @@ public class UserResource extends ServiceResource { @POST @Path("revoketoken") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokenPost( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, @QueryParam("token") String token ) throws Exception { @@ -525,7 +525,7 @@ public class UserResource extends ServiceResource { @PUT @Path("revoketoken") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokenPut( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, @QueryParam("token") String token ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java index e39a311..3769449 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java @@ -180,7 +180,7 @@ public class UsersResource extends ServiceResource { @Override @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -204,7 +204,7 @@ public class UsersResource extends ServiceResource { @Override @RequireApplicationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePost( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityExceptionMapper.java index dc069e7..dcd59ce 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityExceptionMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityExceptionMapper.java @@ -17,6 +17,7 @@ package org.apache.usergrid.rest.exceptions; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.Provider; @@ -37,7 +38,7 @@ public class SecurityExceptionMapper extends AbstractExceptionMapper<SecurityExc if ( e.getRealm() != null ) { return Response.status( Status.UNAUTHORIZED ) .header( "WWW-Authenticate", "Basic realm=\"" + e.getRealm() + "\"" ) - .type( "application/json" ).entity( e.getJsonResponse() ).build(); + .type( MediaType.APPLICATION_JSON ).entity( e.getJsonResponse() ).build(); } else { return toResponse( UNAUTHORIZED, e.getJsonResponse() ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java index c43b463..2e17cfb 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java @@ -108,7 +108,7 @@ public class OrganizationResource extends AbstractContextResource { @GET @JSONP @RequireOrganizationAccess - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getOrganizationDetails( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -170,7 +170,7 @@ public class OrganizationResource extends AbstractContextResource { @GET @Path("reactivate") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse reactivate( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -190,7 +190,7 @@ public class OrganizationResource extends AbstractContextResource { @GET @Path("feed") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFeed( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -210,7 +210,7 @@ public class OrganizationResource extends AbstractContextResource { @GET @Path("credentials") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getCredentials( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -231,7 +231,7 @@ public class OrganizationResource extends AbstractContextResource { @POST @Path("credentials") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse generateCredentials( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -257,7 +257,7 @@ public class OrganizationResource extends AbstractContextResource { @Consumes(MediaType.APPLICATION_JSON) @PUT @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java index 660e93d..daa7264 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java @@ -100,7 +100,7 @@ public class OrganizationsResource extends AbstractContextResource { @POST @Consumes( MediaType.APPLICATION_JSON ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newOrganization( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "" ) String callback ) throws Exception { @@ -127,7 +127,7 @@ public class OrganizationsResource extends AbstractContextResource { @POST @Consumes( MediaType.APPLICATION_FORM_URLENCODED ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newOrganizationFromForm( @Context UriInfo ui, @FormParam( "organization" ) String organizationNameForm, @QueryParam( "organization" ) String organizationNameQuery, @@ -156,7 +156,7 @@ public class OrganizationsResource extends AbstractContextResource { /** Create a new organization */ @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) private ApiResponse newOrganization( @Context UriInfo ui, String organizationName, String username, String name, String email, String password, Map<String, Object> userProperties, Map<String, Object> orgProperties, String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java index ae60123..5c83bbc 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java @@ -107,7 +107,7 @@ public class ApplicationResource extends AbstractContextResource { @RequireOrganizationAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getApplication( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -126,7 +126,7 @@ public class ApplicationResource extends AbstractContextResource { @GET @Path("credentials") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getCredentials( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -147,7 +147,7 @@ public class ApplicationResource extends AbstractContextResource { @POST @Path("credentials") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse generateCredentials( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -169,7 +169,7 @@ public class ApplicationResource extends AbstractContextResource { @Consumes(APPLICATION_JSON) @RequireOrganizationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse configureProvider( @Context UriInfo ui, @QueryParam("provider_key") String siaProvider, @@ -396,7 +396,7 @@ public class ApplicationResource extends AbstractContextResource { @PUT @RequireOrganizationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePut( @Context UriInfo ui, String body, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -418,7 +418,7 @@ public class ApplicationResource extends AbstractContextResource { @DELETE @RequireOrganizationAccess @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executeDelete( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback, @QueryParam("app_delete_confirm") String confirmDelete) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java index ef9a5f4..3b609b8 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java @@ -69,7 +69,7 @@ public class ApplicationsResource extends AbstractContextResource { @RequireOrganizationAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getOrganizationApplications( @Context UriInfo ui, @QueryParam( "deleted" ) @DefaultValue( "false" ) Boolean deleted, // only return deleted apps if true @@ -89,7 +89,7 @@ public class ApplicationsResource extends AbstractContextResource { @POST @Consumes( MediaType.APPLICATION_JSON ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newApplicationForOrganization( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -102,7 +102,7 @@ public class ApplicationsResource extends AbstractContextResource { @POST @Consumes( MediaType.APPLICATION_FORM_URLENCODED ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newApplicationForOrganizationFromForm( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java index d9fc009..d9bc81b 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java @@ -76,7 +76,7 @@ public class FileErrorsResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor ) throws Exception { @@ -105,7 +105,7 @@ public class FileErrorsResource extends AbstractContextResource { @GET @Path( RootResource.ENTITY_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java index 708aa80..41ae84c 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java @@ -80,7 +80,7 @@ public class FileIncludesResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor ) throws Exception { @@ -108,7 +108,7 @@ public class FileIncludesResource extends AbstractContextResource { @GET @Path( RootResource.ENTITY_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java index d829f80..6f89f9e 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java @@ -83,7 +83,7 @@ public class ImportsResource extends AbstractContextResource { @RequireOrganizationAccess @Consumes( MediaType.APPLICATION_JSON ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse executePost( @Context UriInfo ui, String body, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -139,7 +139,7 @@ public class ImportsResource extends AbstractContextResource { @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getImports( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor ) throws Exception { final Results importResults = importService.getImports( application.getId(), query, cursor ); @@ -161,7 +161,7 @@ public class ImportsResource extends AbstractContextResource { @GET @Path( RootResource.ENTITY_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getImportById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java index a4e3f40..d0dfbdb 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java @@ -72,7 +72,7 @@ public class UsersResource extends AbstractContextResource { @RequireOrganizationAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getOrganizationUsers( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -90,7 +90,7 @@ public class UsersResource extends AbstractContextResource { @POST @Consumes(MediaType.APPLICATION_JSON) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newUserForOrganization( @Context UriInfo ui, Map<String, Object> json, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -109,7 +109,7 @@ public class UsersResource extends AbstractContextResource { @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newUserForOrganizationFromForm( @Context UriInfo ui, @FormParam("username") String username, @FormParam("name") String name, @FormParam("email") String email, @@ -176,7 +176,7 @@ public class UsersResource extends AbstractContextResource { @PUT @Path(RootResource.USER_ID_PATH) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addUserToOrganization( @Context UriInfo ui, @PathParam("userId") String userIdStr, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -203,7 +203,7 @@ public class UsersResource extends AbstractContextResource { @PUT @Path(RootResource.EMAIL_PATH) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addUserToOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -230,7 +230,7 @@ public class UsersResource extends AbstractContextResource { @PUT @Path("{username}") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addUserToOrganizationByUsername( @Context UriInfo ui, @PathParam("username") String username, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -291,7 +291,7 @@ public class UsersResource extends AbstractContextResource { @DELETE @Path("{username}") @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse removeUserFromOrganizationByUsername( @Context UriInfo ui, @PathParam("username") String username, @QueryParam("callback") @DefaultValue("callback") @@ -327,7 +327,7 @@ public class UsersResource extends AbstractContextResource { @DELETE @Path(RootResource.EMAIL_PATH) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse removeUserFromOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java index 1741db6..037121b 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java @@ -92,7 +92,7 @@ public class UserResource extends AbstractContextResource { @PUT @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setUserInfo( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -122,7 +122,7 @@ public class UserResource extends AbstractContextResource { @PUT @Path( "password" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -151,7 +151,7 @@ public class UserResource extends AbstractContextResource { @POST @Path( "password" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -163,7 +163,7 @@ public class UserResource extends AbstractContextResource { @GET @Path( "feed" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getFeed( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -182,7 +182,7 @@ public class UserResource extends AbstractContextResource { @RequireAdminUserAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getUserData( @Context UriInfo ui, @QueryParam( "ttl" ) long ttl, @QueryParam( "shallow" ) boolean shallow, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) @@ -387,7 +387,7 @@ public class UserResource extends AbstractContextResource { @GET @Path( "reactivate" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse reactivate( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -414,7 +414,7 @@ public class UserResource extends AbstractContextResource { @POST @Path( "revoketokens" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokensPost( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -435,7 +435,7 @@ public class UserResource extends AbstractContextResource { @PUT @Path( "revoketokens" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokensPut( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -446,7 +446,7 @@ public class UserResource extends AbstractContextResource { @POST @Path( "revoketoken" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokenPost( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, @QueryParam( "token" ) String token ) throws Exception { @@ -468,7 +468,7 @@ public class UserResource extends AbstractContextResource { @PUT @Path( "revoketoken" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse revokeTokenPut( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, @QueryParam( "token" ) String token ) throws Exception { http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java index 186ccd3..e55969c 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java @@ -63,7 +63,7 @@ public class OrganizationsResource extends AbstractContextResource { @RequireAdminUserAccess @GET @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse getUserOrganizations( @Context UriInfo ui, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -81,7 +81,7 @@ public class OrganizationsResource extends AbstractContextResource { @RequireAdminUserAccess @POST @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newOrganizationForUser( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -103,7 +103,7 @@ public class OrganizationsResource extends AbstractContextResource { @POST @Consumes( MediaType.APPLICATION_FORM_URLENCODED ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse newOrganizationForUserFromForm( @Context UriInfo ui, Map<String, Object> json, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback, @@ -130,7 +130,7 @@ public class OrganizationsResource extends AbstractContextResource { @PUT @Path( "{organizationName}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addUserToOrganizationByOrganizationName( @Context UriInfo ui, @PathParam( "organizationName" ) String organizationName, @QueryParam( "callback" ) @@ -151,7 +151,7 @@ public class OrganizationsResource extends AbstractContextResource { @PUT @Path(RootResource.ORGANIZATION_ID_PATH) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse addUserToOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" ) String organizationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception { @@ -169,7 +169,7 @@ public class OrganizationsResource extends AbstractContextResource { @DELETE @Path( RootResource.ORGANIZATION_ID_PATH ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse removeUserFromOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" ) String organizationIdStr, @@ -191,7 +191,7 @@ public class OrganizationsResource extends AbstractContextResource { @DELETE @Path( "{organizationName}" ) @JSONP - @Produces({"application/json", "application/javascript"}) + @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public ApiResponse removeUserFromOrganizationByOrganizationName( @Context UriInfo ui, @PathParam( "organizationName" ) String organizationName, http://git-wip-us.apache.org/repos/asf/usergrid/blob/3749e741/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java index 4b11fd9..9135ff2 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java @@ -17,6 +17,7 @@ package org.apache.usergrid.rest.security.shiro; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; @@ -55,6 +56,6 @@ public class ShiroAuthenticationExceptionMapper implements ExceptionMapper<Authe type = BAD_ACCESS_TOKEN_ERROR.getType(); } response.withError( type, message, e ); - return Response.status( Status.UNAUTHORIZED ).type( "application/json" ).entity( response ).build(); + return Response.status( Status.UNAUTHORIZED ).type( MediaType.APPLICATION_JSON ).entity( response ).build(); } }
