Repository: lens Updated Branches: refs/heads/current-release-line e93f96a4a -> 1bcdfd1ae
LENS-983 : Make default response type as XML on all resources Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/1bcdfd1a Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/1bcdfd1a Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/1bcdfd1a Branch: refs/heads/current-release-line Commit: 1bcdfd1aeedd49a657b84753d8461357fe1dadca Parents: e93f96a Author: Amareshwari Sriramadasu <[email protected]> Authored: Wed Mar 9 15:32:03 2016 +0530 Committer: Deepak Kumar Barr <[email protected]> Committed: Wed Mar 9 16:16:52 2016 +0530 ---------------------------------------------------------------------- .../lens/ml/server/MLServiceResource.java | 6 ++-- .../server/metastore/MetastoreResource.java | 2 +- .../lens/server/query/QueryServiceResource.java | 32 ++++++++++---------- .../server/query/save/SavedQueryResource.java | 12 ++------ .../lens/server/session/SessionResource.java | 14 ++++----- .../lens/server/ui/MetastoreUIResource.java | 6 ++-- .../lens/server/ui/QueryServiceUIResource.java | 10 +++--- .../lens/server/ui/SessionUIResource.java | 4 +-- .../server/session/TestSessionResource.java | 22 ++++++++++++++ 9 files changed, 62 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java ---------------------------------------------------------------------- diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java index 53bac7d..ea29d24 100644 --- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java +++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java @@ -51,7 +51,7 @@ import lombok.extern.slf4j.Slf4j; * Machine Learning service. */ @Path("/ml") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) +@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Slf4j public class MLServiceResource { @@ -209,7 +209,7 @@ public class MLServiceResource { * @throws LensException the lens exception */ @DELETE - @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) @Path("models/{algorithm}/{modelID}") public String deleteModel(@PathParam("algorithm") String algorithm, @PathParam("modelID") String modelID) throws LensException { @@ -373,7 +373,7 @@ public class MLServiceResource { */ @DELETE @Path("reports/{algorithm}/{reportID}") - @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public String deleteTestReport(@PathParam("algorithm") String algorithm, @PathParam("reportID") String reportID) throws LensException { getMlService().deleteTestReport(algorithm, reportID); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java index e7d545c..684e2ed 100644 --- a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java @@ -49,7 +49,7 @@ import lombok.extern.slf4j.Slf4j; * This provides api for all things metastore. */ @Path("metastore") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) +@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Slf4j public class MetastoreResource { public static final ObjectFactory X_CUBE_OBJECT_FACTORY = new ObjectFactory(); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java index 6e1a709..a043550 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java @@ -152,7 +152,7 @@ public class QueryServiceResource { */ @GET @Path("queries") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public List<QueryHandle> getAllQueries(@QueryParam("sessionid") LensSessionHandle sessionid, @DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("queryName") String queryName, @DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("driver") String driver, @@ -205,7 +205,7 @@ public class QueryServiceResource { @POST @Path("queries") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) @MultiPurposeResource(formParamName = "operation") public LensAPIResult<QuerySubmitResult> query(@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("query") String query, @FormDataParam("operation") String operation, @@ -267,7 +267,7 @@ public class QueryServiceResource { */ @DELETE @Path("queries") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult cancelAllQueries(@QueryParam("sessionid") LensSessionHandle sessionid, @DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("queryName") String queryName, @DefaultValue("") @QueryParam("driver") String driver, @@ -315,7 +315,7 @@ public class QueryServiceResource { */ @GET @Path("preparedqueries") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public List<QueryPrepareHandle> getAllPreparedQueries(@QueryParam("sessionid") LensSessionHandle sessionid, @DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("queryName") String queryName, @DefaultValue("-1") @QueryParam("fromDate") long fromDate, @DefaultValue("-1") @QueryParam("toDate") long toDate) { @@ -349,7 +349,7 @@ public class QueryServiceResource { @POST @Path("preparedqueries") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) @MultiPurposeResource(formParamName = "operation") public LensAPIResult<QuerySubmitResult> prepareQuery( @FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("query") String query, @@ -402,7 +402,7 @@ public class QueryServiceResource { */ @DELETE @Path("preparedqueries") - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN }) public APIResult destroyPreparedQueries(@QueryParam("sessionid") LensSessionHandle sessionid, @DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("queryName") String queryName, @DefaultValue("-1") @QueryParam("fromDate") long fromDate, @@ -472,7 +472,7 @@ public class QueryServiceResource { */ @GET @Path("preparedqueries/{prepareHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public LensPreparedQuery getPreparedQuery(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("prepareHandle") String prepareHandle) { checkSessionId(sessionid); @@ -494,7 +494,7 @@ public class QueryServiceResource { */ @DELETE @Path("preparedqueries/{prepareHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult destroyPrepared(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("prepareHandle") String prepareHandle) { checkSessionId(sessionid); @@ -515,7 +515,7 @@ public class QueryServiceResource { */ @GET @Path("queries/{queryHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public LensQuery getStatus(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle) { checkSessionId(sessionid); @@ -537,7 +537,7 @@ public class QueryServiceResource { */ @DELETE @Path("queries/{queryHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult cancelQuery(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle) { checkSessionId(sessionid); @@ -591,7 +591,7 @@ public class QueryServiceResource { @PUT @Path("queries/{queryHandle}") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult updateConf(@FormDataParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle, @FormDataParam("conf") LensConf conf) { checkSessionId(sessionid); @@ -620,7 +620,7 @@ public class QueryServiceResource { @PUT @Path("preparedqueries/{prepareHandle}") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult updatePreparedConf(@FormDataParam("sessionid") LensSessionHandle sessionid, @PathParam("prepareHandle") String prepareHandle, @FormDataParam("conf") LensConf conf) { checkSessionId(sessionid); @@ -656,7 +656,7 @@ public class QueryServiceResource { @POST @Path("preparedqueries/{prepareHandle}") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) @MultiPurposeResource(formParamName = "operation") public QuerySubmitResult executePrepared(@FormDataParam("sessionid") LensSessionHandle sessionid, @PathParam("prepareHandle") String prepareHandle, @@ -696,7 +696,7 @@ public class QueryServiceResource { */ @GET @Path("queries/{queryHandle}/resultsetmetadata") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public QueryResultSetMetadata getResultSetMetadata(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle) { checkSessionId(sessionid); @@ -718,7 +718,7 @@ public class QueryServiceResource { */ @GET @Path("queries/{queryHandle}/resultset") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public QueryResult getResultSet(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle, @QueryParam("fromindex") long startIndex, @QueryParam("fetchsize") int fetchSize) { @@ -759,7 +759,7 @@ public class QueryServiceResource { */ @DELETE @Path("queries/{queryHandle}/resultset") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult closeResultSet(@QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("queryHandle") String queryHandle) { checkSessionId(sessionid); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java index 02541c5..e568184 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java @@ -64,6 +64,7 @@ import lombok.NonNull; * <p></p> * CRUD on saved query */ +@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public class SavedQueryResource { final SavedQueryService savedQueryService; @@ -107,7 +108,6 @@ public class SavedQueryResource { @GET @Path("/savedqueries") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ListResponse getList( @QueryParam("sessionid") LensSessionHandle sessionid, @Context UriInfo info, @@ -131,7 +131,6 @@ public class SavedQueryResource { */ @GET @Path("/savedqueries/{id}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public SavedQuery getByID( @QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("id") long id) throws LensException { @@ -152,7 +151,6 @@ public class SavedQueryResource { */ @DELETE @Path("/savedqueries/{id}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ResourceModifiedResponse deleteById( @QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("id") long id) throws LensException { @@ -176,8 +174,7 @@ public class SavedQueryResource { */ @POST @Path(("/savedqueries")) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public ResourceModifiedResponse create( @QueryParam("sessionid") LensSessionHandle sessionid, SavedQuery savedQuery, @@ -206,8 +203,7 @@ public class SavedQueryResource { */ @PUT @Path("/savedqueries/{id}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public ResourceModifiedResponse update( @QueryParam("sessionid") LensSessionHandle sessionid, @PathParam("id") long id, @@ -233,7 +229,6 @@ public class SavedQueryResource { */ @POST @Path("/savedqueries/parameters") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ParameterParserResponse getParameters( @QueryParam("sessionid") LensSessionHandle sessionid, @FormDataParam("query") String query) { @@ -252,7 +247,6 @@ public class SavedQueryResource { */ @POST @Path("/savedqueries/{id}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) public LensAPIResult<QueryHandle> run( @PathParam("id") long id, @Context UriInfo info, http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java index ac77418..a36c552 100644 --- a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java @@ -83,7 +83,7 @@ public class SessionResource { */ @POST @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public LensSessionHandle openSession(@FormDataParam("username") String username, @FormDataParam("password") String password, @FormDataParam("database") @DefaultValue("") String database, @@ -108,7 +108,7 @@ public class SessionResource { * @return APIResult object indicating if the operation was successful (check result.getStatus()) */ @DELETE - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult closeSession(@QueryParam("sessionid") LensSessionHandle sessionid) { try { sessionService.closeSession(sessionid); @@ -136,7 +136,7 @@ public class SessionResource { @PUT @Path("resources/add") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult addResource(@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("type") String type, @FormDataParam("path") String path) { ScannedPaths scannedPaths = new ScannedPaths(path, type); @@ -169,7 +169,7 @@ public class SessionResource { */ @GET @Path("resources/list") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public StringList listResources(@QueryParam("sessionid") LensSessionHandle sessionid, @QueryParam("type") String type) { List<String> resources = sessionService.listAllResources(sessionid, type); @@ -193,7 +193,7 @@ public class SessionResource { @Path("resources/delete") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult deleteResource(@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("type") String type, @FormDataParam("path") String path) { ScannedPaths scannedPaths = new ScannedPaths(path, type); @@ -232,7 +232,7 @@ public class SessionResource { */ @GET @Path("params") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public StringList getParams(@QueryParam("sessionid") LensSessionHandle sessionid, @DefaultValue("false") @QueryParam("verbose") boolean verbose, @DefaultValue("") @QueryParam("key") String key) { try { @@ -257,7 +257,7 @@ public class SessionResource { */ @PUT @Path("params") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult setParam(@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("key") String key, @FormDataParam("value") String value) { sessionService.setSessionParameter(sessionid, key, value); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java index faaf172..27388a7 100644 --- a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java @@ -76,7 +76,7 @@ public class MetastoreUIResource { */ @GET @Path("tables") - @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public String getAllTables(@QueryParam("publicId") UUID publicId) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); checkSessionHandle(sessionHandle); @@ -139,7 +139,7 @@ public class MetastoreUIResource { */ @GET @Path("tables/{name}") - @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public String getDescription(@QueryParam("publicId") UUID publicId, @QueryParam("type") String type, @PathParam("name") String name) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); @@ -211,7 +211,7 @@ public class MetastoreUIResource { */ @GET @Path("searchablefields") - @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) public String getFilterResults(@QueryParam("publicId") UUID publicId, @QueryParam("keyword") String keyword) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); checkSessionHandle(sessionHandle); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java index 424bd87..304dc8e 100644 --- a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java @@ -114,7 +114,7 @@ public class QueryServiceUIResource { */ @GET @Path("queries") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public List<QueryHandle> getAllQueries(@QueryParam("publicId") UUID publicId, @DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("driver") String driver, @DefaultValue("") @QueryParam("queryName") String queryName, @@ -141,7 +141,7 @@ public class QueryServiceUIResource { @POST @Path("queries") @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public QuerySubmitResult query(@FormDataParam("publicId") UUID publicId, @FormDataParam("query") String query, @DefaultValue("") @FormDataParam("queryName") String queryName) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); @@ -165,7 +165,7 @@ public class QueryServiceUIResource { */ @GET @Path("queries/{queryHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public LensQuery getStatus(@QueryParam("publicId") UUID publicId, @PathParam("queryHandle") String queryHandle) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); checkSessionHandle(sessionHandle); @@ -187,7 +187,7 @@ public class QueryServiceUIResource { */ @GET @Path("queries/{queryHandle}/resultset") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public ResultRow getResultSet(@QueryParam("publicId") UUID publicId, @PathParam("queryHandle") String queryHandle, @QueryParam("pageNumber") int pageNumber, @QueryParam("fetchsize") int fetchSize) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); @@ -230,7 +230,7 @@ public class QueryServiceUIResource { */ @DELETE @Path("queries/{queryHandle}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult cancelQuery(@QueryParam("sessionid") UUID publicId, @PathParam("queryHandle") String queryHandle) { LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId); checkSessionHandle(sessionHandle); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java index f38e70d..37bf094 100644 --- a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java +++ b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java @@ -104,7 +104,7 @@ public class SessionUIResource { */ @POST @Consumes({MediaType.MULTIPART_FORM_DATA}) - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public LensSessionHandle openSession(@FormDataParam("username") String username, @FormDataParam("password") String password, @FormDataParam("database") @DefaultValue("") String database, @@ -132,7 +132,7 @@ public class SessionUIResource { */ @DELETE @Path("{publicId}") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN}) + @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public APIResult closeSession(@PathParam("publicId") UUID publicId) { log.info("Closing session with id: {}", publicId); LensSessionHandle sessionHandle = getOpenSession(publicId); http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java index bde7b9b..011aa5b 100644 --- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java +++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java @@ -105,6 +105,28 @@ public class TestSessionResource extends LensJerseyTest { return new SessionApp(); } + @Test + public void testDefaultResponseType() { + final WebTarget target = target().path("session"); + final FormDataMultiPart mp = new FormDataMultiPart(); + mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("username").build(), "foo")); + mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("password").build(), "bar")); + mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("sessionconf").fileName("sessionconf").build(), + new LensConf(), defaultMT)); + + final String handle = target.request().post(Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE), + String.class); + Assert.assertNotNull(handle); + Assert.assertTrue(handle.contains("xml"), "Handle is " + handle); + Assert.assertTrue(handle.contains("publicId"), "Handle is " + handle); + Assert.assertTrue(handle.contains("secretId"), "Handle is " + handle); + + String result = target.queryParam("sessionid", handle).request().delete(String.class); + Assert.assertNotNull(result); + Assert.assertTrue(result.contains("xml"), "Result is " + result); + Assert.assertTrue(result.contains("succeeded"), "Result is " + result); + } + /** * Test session. */
