Share more code

Author: labkey-adam

src/org/labkey/remoteapi/query/BaseQueryCommand.java

@@ -211,4 +211,26 @@ public JSONObject getJsonObject()
 
         return json;
     }
+
+    protected void addOffsetAndMaxRows(JSONObject json, String offsetName, String maxRowsName)
+    {
+        if (getOffset() > 0)
+            json.put(offsetName, getOffset());
+
+        if (getMaxRows() >= 0)
+            json.put(maxRowsName, getMaxRows());
+    }
+
+    protected JSONObject addSortAndParams(JSONObject json)
+    {
+        if (null != getSorts() && !getSorts().isEmpty())
+            json.put("query.sort", Sort.getSortQueryStringParam(getSorts()));
+
+        for (Map.Entry<String, String> entry : getQueryParameters().entrySet())
+        {
+            json.put("query.param." + entry.getKey(), entry.getValue());
+        }
+
+        return json;
+    }
 }

src/org/labkey/remoteapi/query/BaseSelectRowsCommand.java

@@ -98,23 +98,12 @@ public JSONObject getJsonObject()
         JSONObject json = super.getJsonObject();
 
         // Note: SelectRows and ExecuteSql both support sort and param, but they differ in how they're conveyed (URL vs. JSON)
-
-        if (null != getSorts() && !getSorts().isEmpty())
-            json.put("query.sort", Sort.getSortQueryStringParam(getSorts()));
-
-        for (Map.Entry<String, String> entry : getQueryParameters().entrySet())
-        {
-            json.put("query.param." + entry.getKey(), entry.getValue());
-        }
+        addSortAndParams(json);
 
         // Note: SelectRows and ExecuteSql both support offset and maxRows, but the property names are different
+        addOffsetAndMaxRows(json,"query.offset", "query.maxRows");
 
-        if (getOffset() > 0)
-            json.put("query.offset", getOffset());
-
-        if (getMaxRows() >= 0)
-            json.put("query.maxRows", getMaxRows());
-        else
+        if (!json.has("query.maxRows"))
             json.put("query.showRows", "all");
 
         if (null != getFilters())

src/org/labkey/remoteapi/query/ExecuteSqlCommand.java

@@ -207,10 +207,7 @@ public JSONObject getJsonObject()
         JSONObject json = super.getJsonObject();
         json.put("schemaName", getSchemaName());
         json.put("sql", getWafEncoding() ? EncodeUtils.wafEncode(getSql()) : getSql());
-        if (getMaxRows() >= 0)
-            json.put("maxRows", getMaxRows());
-        if (getOffset() > 0)
-            json.put("offset", getOffset());
+        addOffsetAndMaxRows(json, "offset", "maxRows");
         json.put("includeDetailsColumn", isIncludeDetailsColumn());
         json.put("saveInSession", isSaveInSession());
 
@@ -221,13 +218,11 @@ public JSONObject getJsonObject()
     protected Map<String, Object> createParameterMap()
     {
         Map<String, Object> params = super.createParameterMap();
+        JSONObject sortAndParams = addSortAndParams(new JSONObject());
 
-        if (null != getSorts() && !getSorts().isEmpty())
-            params.put("query.sort", Sort.getSortQueryStringParam(getSorts()));
-
-        for (Map.Entry<String, String> entry : getQueryParameters().entrySet())
+        if (!sortAndParams.isEmpty())
         {
-            params.put("query.param." + entry.getKey(), entry.getValue());
+            params.putAll(sortAndParams.toMap());
         }
 
         return params;