#ignite-1170: rename psz rest query parameter to pageSize
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b0552cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b0552cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b0552cd Branch: refs/heads/ignite-946 Commit: 6b0552cdedffbbd1855461fbcc988fb36f354ac4 Parents: 7ed4d15 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jul 31 14:35:37 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jul 31 14:35:37 2015 +0300 ---------------------------------------------------------------------- .../rest/JettyRestProcessorAbstractSelfTest.java | 14 +++++++------- .../rest/handlers/query/QueryCommandHandler.java | 6 +++--- .../protocols/http/jetty/GridJettyRestHandler.java | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b0552cd/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 8ce070f..090e030 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -1018,7 +1018,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Map<String, String> params = new HashMap<>(); params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key()); params.put("type", "Person"); - params.put("psz", "10"); + params.put("pageSize", "10"); params.put("cacheName", "person"); params.put("qry", URLEncoder.encode(qry)); params.put("arg1", "1000"); @@ -1049,7 +1049,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Map<String, String> params = new HashMap<>(); params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key()); params.put("type", "String"); - params.put("psz", "1"); + params.put("pageSize", "1"); params.put("qry", URLEncoder.encode("select * from String")); String ret = content(params); @@ -1064,7 +1064,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro assertNotNull(qryId); ret = content(F.asMap("cmd", GridRestCommand.FETCH_SQL_QUERY.key(), - "psz", "1", "qryId", String.valueOf(qryId))); + "pageSize", "1", "qryId", String.valueOf(qryId))); json = JSONObject.fromObject(ret); @@ -1076,7 +1076,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro assertFalse(last); ret = content(F.asMap("cmd", GridRestCommand.FETCH_SQL_QUERY.key(), - "psz", "1", "qryId", String.valueOf(qryId))); + "pageSize", "1", "qryId", String.valueOf(qryId))); json = JSONObject.fromObject(ret); @@ -1098,7 +1098,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Map<String, String> params = new HashMap<>(); params.put("cmd", GridRestCommand.EXECUTE_SQL_FIELDS_QUERY.key()); - params.put("psz", "10"); + params.put("pageSize", "10"); params.put("cacheName", "person"); params.put("qry", URLEncoder.encode(qry)); @@ -1124,7 +1124,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Map<String, String> params = new HashMap<>(); params.put("cmd", GridRestCommand.EXECUTE_SQL_FIELDS_QUERY.key()); - params.put("psz", "10"); + params.put("pageSize", "10"); params.put("cacheName", "person"); params.put("qry", URLEncoder.encode(qry)); @@ -1162,7 +1162,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro Map<String, String> params = new HashMap<>(); params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key()); params.put("type", "Person"); - params.put("psz", "1"); + params.put("pageSize", "1"); params.put("cacheName", "person"); params.put("qry", URLEncoder.encode(qry)); params.put("arg1", "1000"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b0552cd/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java index 59f95c9..1712dd4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java @@ -138,7 +138,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { if (cache == null) return new GridRestResponse(GridRestResponse.STATUS_FAILED, - "No cache with name [cacheName=" + req.cacheName() + "]"); + "Failed to find cache with name: " + req.cacheName()); QueryCursor qryCur = cache.query(qry); @@ -204,7 +204,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { if (cur == null) return new GridRestResponse(GridRestResponse.STATUS_FAILED, - "Cannot find query [qryId=" + req.queryId() + "]"); + "Failed to find query with ID: " + req.queryId()); cur.close(); @@ -247,7 +247,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { if (cur == null) return new GridRestResponse(GridRestResponse.STATUS_FAILED, - "Cannot find query [qryId=" + req.queryId() + "]"); + "Failed to find query with ID: " + req.queryId()); CacheQueryResult res = createQueryResult(qryCurs, cur, req, req.queryId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b0552cd/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index bf0f2c8..75e80ec 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -479,10 +479,10 @@ public class GridJettyRestHandler extends AbstractHandler { restReq0.typeName((String) params.get("type")); - String psz = (String) params.get("psz"); + String pageSize = (String) params.get("pageSize"); - if (psz != null) - restReq0.pageSize(Integer.parseInt(psz)); + if (pageSize != null) + restReq0.pageSize(Integer.parseInt(pageSize)); restReq0.cacheName((String)params.get("cacheName")); @@ -499,10 +499,10 @@ public class GridJettyRestHandler extends AbstractHandler { if (qryId != null) restReq0.queryId(Long.parseLong(qryId)); - String psz = (String) params.get("psz"); + String pageSize = (String) params.get("pageSize"); - if (psz != null) - restReq0.pageSize(Integer.parseInt(psz)); + if (pageSize != null) + restReq0.pageSize(Integer.parseInt(pageSize)); restReq0.cacheName((String)params.get("cacheName"));
