Fix sorts, params, and includeMetadata

Author: labkey-adam

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

@@ -37,6 +37,7 @@ public abstract class BaseQueryCommand<ResponseType extends CommandResponse> ext
     public BaseQueryCommand(String controllerName, String actionName)
     {
         super(controllerName, actionName);
+        setRequiredVersion(9.1); // Need >= 9.1 to support includeMetadata
     }
 
     /**
@@ -200,14 +201,6 @@ public JSONObject getJsonObject()
     {
         JSONObject json = new JSONObject();
 
-        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());
-        }
-
         if (getContainerFilter() != null)
             json.put("containerFilter", getContainerFilter().name());
 

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

@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class BaseSelectRowsCommand<ResponseType extends CommandResponse> extends BaseQueryCommand<ResponseType>
 {
@@ -96,7 +97,18 @@ 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());
+        }
+
         // Note: SelectRows and ExecuteSql both support offset and maxRows, but the property names are different
+
         if (getOffset() > 0)
             json.put("query.offset", getOffset());
 

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

@@ -19,6 +19,7 @@
 import org.labkey.remoteapi.internal.EncodeUtils;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Command for executing arbitrary LabKey SQL.
@@ -215,4 +216,20 @@ public JSONObject getJsonObject()
 
         return json;
     }
+
+    @Override
+    protected Map<String, Object> createParameterMap()
+    {
+        Map<String, Object> params = super.createParameterMap();
+
+        if (null != getSorts() && !getSorts().isEmpty())
+            params.put("query.sort", Sort.getSortQueryStringParam(getSorts()));
+
+        for (Map.Entry<String, String> entry : getQueryParameters().entrySet())
+        {
+            params.put("query.param." + entry.getKey(), entry.getValue());
+        }
+
+        return params;
+    }
 }

src/org/labkey/remoteapi/test/Test.java

@@ -24,22 +24,7 @@
 import org.labkey.remoteapi.assay.nab.model.NAbNeutralizationResult;
 import org.labkey.remoteapi.assay.nab.model.NAbRun;
 import org.labkey.remoteapi.assay.nab.model.NAbSample;
-import org.labkey.remoteapi.query.ContainerFilter;
-import org.labkey.remoteapi.query.DeleteRowsCommand;
-import org.labkey.remoteapi.query.ExecuteSqlCommand;
-import org.labkey.remoteapi.query.Filter;
-import org.labkey.remoteapi.query.GetQueriesCommand;
-import org.labkey.remoteapi.query.GetQueriesResponse;
-import org.labkey.remoteapi.query.GetSchemasCommand;
-import org.labkey.remoteapi.query.GetSchemasResponse;
-import org.labkey.remoteapi.query.InsertRowsCommand;
-import org.labkey.remoteapi.query.RowsResponse;
-import org.labkey.remoteapi.query.SelectRowsCommand;
-import org.labkey.remoteapi.query.SelectRowsResponse;
-import org.labkey.remoteapi.query.Sort;
-import org.labkey.remoteapi.query.TruncateTableCommand;
-import org.labkey.remoteapi.query.TruncateTableResponse;
-import org.labkey.remoteapi.query.UpdateRowsCommand;
+import org.labkey.remoteapi.query.*;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -55,7 +40,7 @@ public class Test
 
     public static void main(String[] args) throws Exception
     {
-        String baseUrl = "http://localhost:8080/labkey";
+        String baseUrl = "http://localhost:8080";
         Connection cn = args.length < 2 ? new Connection(baseUrl) : new Connection(baseUrl, args[0], args[1]);
         //Connection cn = new Connection(baseUrl, new ApiKeyCredentialsProvider("session:d7c3a4aeb283e3e54c4126a707908420"));
         //Connection cn = new Connection(baseUrl, new NetRcCredentialsProvider(baseUrl));