Tidy up response parameters

Author: labkey-tchad

labkey-client-api/src/org/labkey/remoteapi/assay/AssayListResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.assay;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 import java.util.List;
@@ -36,7 +37,7 @@ public class AssayListResponse extends CommandResponse
      * @param json The parsed JSONObject (or null if JSON was not returned)
      * @param sourceCommand A copy of the command that created this response
      */
-    public AssayListResponse(String text, int statusCode, String contentType, JSONObject json, AssayListCommand sourceCommand)
+    public AssayListResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends AssayListResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/assay/GetAssayRunCommand.java

@@ -51,6 +51,6 @@ public JSONObject getJsonObject()
     @Override
     protected GetAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)
     {
-        return new GetAssayRunResponse(text, status, contentType, json, this);
+        return new GetAssayRunResponse(text, status, contentType, json, this.copy());
     }
 }

labkey-client-api/src/org/labkey/remoteapi/assay/GetAssayRunResponse.java

@@ -28,7 +28,7 @@ public void setRun(Run run)
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public GetAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public GetAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetAssayRunResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         JSONObject runJson = (JSONObject) json.get("run");

labkey-client-api/src/org/labkey/remoteapi/assay/ImportRunCommand.java

@@ -135,7 +135,7 @@ public ImportRunCommand copy()
     @Override
     protected ImportRunResponse createResponse(String text, int status, String contentType, JSONObject json)
     {
-        return new ImportRunResponse(text, status, contentType, json, this);
+        return new ImportRunResponse(text, status, contentType, json, this.copy());
     }
 
     @Override

labkey-client-api/src/org/labkey/remoteapi/assay/ImportRunResponse.java

@@ -26,7 +26,7 @@ public class ImportRunResponse extends CommandResponse
     private final int _batchId;
     private final int _runId;
 
-    public ImportRunResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public ImportRunResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends ImportRunResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _successURL = (String)json.get("successurl");

labkey-client-api/src/org/labkey/remoteapi/assay/LoadAssayBatchCommand.java

@@ -35,6 +35,7 @@ public LoadAssayBatchCommand(LoadAssayBatchCommand source)
         super(source);
         _protocolName = source.getProtocolName();
         _batchId = source.getBatchId();
+        _batch = new Batch(source._batch.toJSONObject());
     }
 
     public String getProtocolName()
@@ -76,6 +77,6 @@ public LoadAssayBatchCommand copy()
     @Override
     protected LoadAssayBatchResponse createResponse(String text, int status, String contentType, JSONObject json)
     {
-        return new LoadAssayBatchResponse(text, status, contentType, json, this);
+        return new LoadAssayBatchResponse(text, status, contentType, json, this.copy());
     }
 }

labkey-client-api/src/org/labkey/remoteapi/assay/LoadAssayBatchResponse.java

@@ -18,7 +18,7 @@ public class LoadAssayBatchResponse extends CommandResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public LoadAssayBatchResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public LoadAssayBatchResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends LoadAssayBatchResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _batch = new Batch((JSONObject) json.get("batch"));

labkey-client-api/src/org/labkey/remoteapi/assay/ProtocolResponse.java

@@ -1,13 +1,14 @@
 package org.labkey.remoteapi.assay;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 public class ProtocolResponse extends CommandResponse
 {
     private final Protocol _protocol;
 
-    public ProtocolResponse(String text, int statusCode, String contentType, JSONObject json, GetProtocolCommand sourceCommand)
+    public ProtocolResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends ProtocolResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _protocol = new Protocol((JSONObject) json.get("data"));

labkey-client-api/src/org/labkey/remoteapi/assay/SaveAssayBatchResponse.java

@@ -24,7 +24,7 @@ public class SaveAssayBatchResponse extends CommandResponse
     private final Batch _batch;
     private final int _assayId;
 
-    public SaveAssayBatchResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public SaveAssayBatchResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends SaveAssayBatchResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _batch = new Batch((JSONObject)json.get("batch"));

labkey-client-api/src/org/labkey/remoteapi/assay/SaveAssayRunsResponse.java

@@ -22,7 +22,7 @@ public class SaveAssayRunsResponse extends CommandResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public SaveAssayRunsResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public SaveAssayRunsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends SaveAssayRunsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         JSONArray array = json.getJSONArray("runs");

labkey-client-api/src/org/labkey/remoteapi/assay/nab/NAbRunsResponse.java

@@ -82,7 +82,7 @@ public class NAbRunsResponse extends CommandResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public NAbRunsResponse(String text, int statusCode, String contentType, JSONObject json, Command<NAbRunsResponse> sourceCommand)
+    public NAbRunsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends NAbRunsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/di/BaseTransformResponse.java

@@ -31,7 +31,7 @@ public class BaseTransformResponse extends CommandResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public BaseTransformResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public BaseTransformResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends BaseTransformResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/di/ResetTransformStateResponse.java

@@ -30,7 +30,7 @@ public class ResetTransformStateResponse extends BaseTransformResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public ResetTransformStateResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public ResetTransformStateResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends ResetTransformStateResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/di/RunTransformResponse.java

@@ -30,7 +30,7 @@ public class RunTransformResponse extends BaseTransformResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public RunTransformResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public RunTransformResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends RunTransformResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/di/UpdateTransformConfigurationResponse.java

@@ -33,7 +33,7 @@ public class UpdateTransformConfigurationResponse extends BaseTransformResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public UpdateTransformConfigurationResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public UpdateTransformConfigurationResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends UpdateTransformConfigurationResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/domain/DomainResponse.java

@@ -8,7 +8,7 @@ public class DomainResponse extends CommandResponse
 {
     private final Domain _domain;
 
-    public DomainResponse(String text, int statusCode, String contentType, JSONObject json, Command<DomainResponse> sourceCommand)
+    public DomainResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends DomainResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _domain = new Domain(json);

labkey-client-api/src/org/labkey/remoteapi/domain/ListDomainsResponse.java

@@ -21,7 +21,7 @@ public class ListDomainsResponse extends CommandResponse
      * @param json          The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public ListDomainsResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public ListDomainsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends ListDomainsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         JSONArray domains = json.getJSONArray("data");

labkey-client-api/src/org/labkey/remoteapi/experiment/LineageResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.experiment;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 import java.util.ArrayList;
@@ -31,7 +32,7 @@ public class LineageResponse extends CommandResponse
     List<LineageNode> _seeds;
     Map<String, LineageNode> _nodes;
 
-    public LineageResponse(String text, int statusCode, String contentType, JSONObject json, LineageCommand sourceCommand)
+    public LineageResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends LineageResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
 

labkey-client-api/src/org/labkey/remoteapi/ms2/StartSearchResponse.java

@@ -21,7 +21,7 @@
 
 public class StartSearchResponse extends CommandResponse
 {
-    public StartSearchResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public StartSearchResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends StartSearchResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/pipeline/FileNotificationResponse.java

@@ -24,7 +24,7 @@
  */
 public class FileNotificationResponse  extends CommandResponse
 {
-    public FileNotificationResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public FileNotificationResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends FileNotificationResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/GetQueriesResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 import java.util.ArrayList;
@@ -28,7 +29,7 @@
  */
 public class GetQueriesResponse extends CommandResponse
 {
-    public GetQueriesResponse(String text, int statusCode, String contentType, JSONObject json, GetQueriesCommand sourceCommand)
+    public GetQueriesResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetQueriesResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/GetQueryDetailsResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 import org.labkey.remoteapi.ResponseObject;
 
@@ -28,7 +29,7 @@
  */
 public class GetQueryDetailsResponse extends CommandResponse
 {
-    public GetQueryDetailsResponse(String text, int statusCode, String contentType, JSONObject json, GetQueryDetailsCommand sourceCommand)
+    public GetQueryDetailsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetQueryDetailsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/GetSchemasResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 import java.util.List;
@@ -25,7 +26,7 @@
  */
 public class GetSchemasResponse extends CommandResponse
 {
-    public GetSchemasResponse(String text, int statusCode, String contentType, JSONObject json, GetSchemasCommand sourceCommand)
+    public GetSchemasResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetSchemasResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/ImportDataResponse.java

@@ -25,7 +25,7 @@ public class ImportDataResponse extends CommandResponse
     private final int _rowCount;
     private final String _jobId;
 
-    public ImportDataResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public ImportDataResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends ImportDataResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         _success = json.optBoolean("success");

labkey-client-api/src/org/labkey/remoteapi/query/SaveRowsResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 
 /**
  * Response object used for commands that derive from SaveRowsCommand.
@@ -32,7 +33,7 @@ public class SaveRowsResponse extends RowsResponse
      * @param json The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public SaveRowsResponse(String text, int statusCode, String contentType, JSONObject json, SaveRowsCommand sourceCommand)
+    public SaveRowsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends SaveRowsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/SelectRowsResponse.java

@@ -66,7 +66,7 @@ else if("date".equalsIgnoreCase(type))
      * @param json The parsed JSONObject (or null if no JSON was returned
      * @param sourceCommand A copy of the command that created this response
      */
-    public SelectRowsResponse(String text, int statusCode, String contentType, JSONObject json, Command<SelectRowsResponse> sourceCommand)
+    public SelectRowsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends SelectRowsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/query/TruncateTableResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 /**
@@ -33,7 +34,7 @@ public class TruncateTableResponse extends CommandResponse
      * @param json The parsed JSONObject (or null if JSON was not returned).
      * @param sourceCommand A copy of the command that created this response
      */
-    public TruncateTableResponse(String text, int statusCode, String contentType, JSONObject json, TruncateTableCommand sourceCommand)
+    public TruncateTableResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends TruncateTableResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/CreateContainerResponse.java

@@ -21,7 +21,7 @@
 
 public class CreateContainerResponse extends CommandResponse
 {
-    public CreateContainerResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public CreateContainerResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends CreateContainerResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/CreateGroupResponse.java

@@ -21,7 +21,7 @@
 
 public class CreateGroupResponse extends CommandResponse
 {
-    public CreateGroupResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public CreateGroupResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends CreateGroupResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/CreateUserResponse.java

@@ -21,7 +21,7 @@
 
 public class CreateUserResponse extends CommandResponse
 {
-    public CreateUserResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public CreateUserResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends CreateUserResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/DeleteContainerResponse.java

@@ -24,7 +24,7 @@
  */
 public class DeleteContainerResponse extends CommandResponse
 {
-    public DeleteContainerResponse(String text, int statusCode, String contentType, JSONObject json, Command<?> sourceCommand)
+    public DeleteContainerResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends DeleteContainerResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/GetContainersResponse.java

@@ -16,14 +16,15 @@
 package org.labkey.remoteapi.security;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 import java.util.List;
 import java.util.Map;
 
 public class GetContainersResponse extends CommandResponse
 {
-    public GetContainersResponse(String text, int statusCode, String contentType, JSONObject json, GetContainersCommand sourceCommand)
+    public GetContainersResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetContainersResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/GetGroupPermsResponse.java

@@ -16,11 +16,12 @@
 package org.labkey.remoteapi.security;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
 public class GetGroupPermsResponse extends CommandResponse
 {
-    public GetGroupPermsResponse(String text, int statusCode, String contentType, JSONObject json, GetGroupPermsCommand sourceCommand)
+    public GetGroupPermsResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetGroupPermsResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }

labkey-client-api/src/org/labkey/remoteapi/security/GetUsersResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.security;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 import org.labkey.remoteapi.ResponseObject;
 
@@ -28,7 +29,7 @@
  */
 public class GetUsersResponse extends CommandResponse
 {
-    public GetUsersResponse(String text, int statusCode, String contentType, JSONObject json, GetUsersCommand sourceCommand)
+    public GetUsersResponse(String text, int statusCode, String contentType, JSONObject json, Command<? extends GetUsersResponse> sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
     }