Item 6174: Code review updates-rename action name and controller

labkey-ankurj · labkey-ankurj · commit 0b30239a1af8 · 2019-09-12T00:43:56.000Z
SVN r64494 |2019-09-12 00:43:56 +0000
diff --git a/.gitattributes b/.gitattributes
@@ -22,12 +22,12 @@ java/src/org/labkey/remoteapi/assay/AssayListResponse.java -text
 java/src/org/labkey/remoteapi/assay/Batch.java -text
 java/src/org/labkey/remoteapi/assay/Data.java -text
 java/src/org/labkey/remoteapi/assay/ExpObject.java -text
+java/src/org/labkey/remoteapi/assay/GetAssayRunCommand.java -text
+java/src/org/labkey/remoteapi/assay/GetAssayRunResponse.java -text
 java/src/org/labkey/remoteapi/assay/ImportRunCommand.java -text
 java/src/org/labkey/remoteapi/assay/ImportRunResponse.java -text
 java/src/org/labkey/remoteapi/assay/LoadAssayBatchCommand.java -text
 java/src/org/labkey/remoteapi/assay/LoadAssayBatchResponse.java -text
-java/src/org/labkey/remoteapi/assay/LoadAssayRunCommand.java -text
-java/src/org/labkey/remoteapi/assay/LoadAssayRunResponse.java -text
 java/src/org/labkey/remoteapi/assay/Material.java -text
 java/src/org/labkey/remoteapi/assay/Run.java -text
 java/src/org/labkey/remoteapi/assay/SaveAssayBatchCommand.java -text
diff --git a/java/src/org/labkey/remoteapi/assay/GetAssayRunCommand.java b/java/src/org/labkey/remoteapi/assay/GetAssayRunCommand.java
@@ -7,19 +7,19 @@
 /**
  * Command for obtaining information about a run in a particular folder.
  */
-public class LoadAssayRunCommand extends PostCommand<LoadAssayRunResponse>
+public class GetAssayRunCommand extends PostCommand<GetAssayRunResponse>
 {
     private String _lsid;
 
-    public LoadAssayRunCommand(LoadAssayRunCommand source)
+    public GetAssayRunCommand(GetAssayRunCommand source)
     {
         super(source);
         _lsid = source.getLsid();
     }
 
-    public LoadAssayRunCommand(String lsid)
+    public GetAssayRunCommand(String lsid)
     {
-        super("experiment", "loadAssayRun");
+        super("assay", "getAssayRun");
         _lsid = lsid;
     }
 
@@ -34,9 +34,9 @@ public void setLsid(String lsid)
     }
 
     @Override
-    public LoadAssayRunCommand copy()
+    public GetAssayRunCommand copy()
     {
-        return new LoadAssayRunCommand(this);
+        return new GetAssayRunCommand(this);
     }
 
     @Override
@@ -49,8 +49,8 @@ public JSONObject getJsonObject()
     }
 
     @Override
-    protected LoadAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)
+    protected GetAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)
     {
-        return new LoadAssayRunResponse(text, status, contentType, json, this);
+        return new GetAssayRunResponse(text, status, contentType, json, this);
     }
 }
diff --git a/java/src/org/labkey/remoteapi/assay/GetAssayRunResponse.java b/java/src/org/labkey/remoteapi/assay/GetAssayRunResponse.java
@@ -4,7 +4,7 @@
 import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
-public class LoadAssayRunResponse extends CommandResponse
+public class GetAssayRunResponse extends CommandResponse
 {
     private Run _run;
 
@@ -28,13 +28,10 @@ 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 LoadAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)
+    public GetAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)
     {
         super(text, statusCode, contentType, json, sourceCommand);
         JSONObject runJson = (JSONObject) json.get("run");
-        _run = new Run();
-
-        _run.setName((String) runJson.get("name"));
-        _run.setLsid((String) runJson.get("lsid"));
+        _run = new Run(runJson);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,19 @@`
`7`	`7`	`/**`
`8`	`8`	`* Command for obtaining information about a run in a particular folder.`
`9`	`9`	`*/`
`10`		`-public class LoadAssayRunCommand extends PostCommand<LoadAssayRunResponse>`
	`10`	`+public class GetAssayRunCommand extends PostCommand<GetAssayRunResponse>`
`11`	`11`	`{`
`12`	`12`	`private String _lsid;`
`13`	`13`
`14`		`- public LoadAssayRunCommand(LoadAssayRunCommand source)`
	`14`	`+ public GetAssayRunCommand(GetAssayRunCommand source)`
`15`	`15`	`{`
`16`	`16`	`super(source);`
`17`	`17`	`_lsid = source.getLsid();`
`18`	`18`	`}`
`19`	`19`
`20`		`- public LoadAssayRunCommand(String lsid)`
	`20`	`+ public GetAssayRunCommand(String lsid)`
`21`	`21`	`{`
`22`		`- super("experiment", "loadAssayRun");`
	`22`	`+ super("assay", "getAssayRun");`
`23`	`23`	`_lsid = lsid;`
`24`	`24`	`}`
`25`	`25`
`@@ -34,9 +34,9 @@ public void setLsid(String lsid)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public LoadAssayRunCommand copy()`
	`37`	`+ public GetAssayRunCommand copy()`
`38`	`38`	`{`
`39`		`- return new LoadAssayRunCommand(this);`
	`39`	`+ return new GetAssayRunCommand(this);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`@@ -49,8 +49,8 @@ public JSONObject getJsonObject()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- protected LoadAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)`
	`52`	`+ protected GetAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)`
`53`	`53`	`{`
`54`		`- return new LoadAssayRunResponse(text, status, contentType, json, this);`
	`54`	`+ return new GetAssayRunResponse(text, status, contentType, json, this);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`import org.labkey.remoteapi.Command;`
`5`	`5`	`import org.labkey.remoteapi.CommandResponse;`
`6`	`6`
`7`		`-public class LoadAssayRunResponse extends CommandResponse`
	`7`	`+public class GetAssayRunResponse extends CommandResponse`
`8`	`8`	`{`
`9`	`9`	`private Run _run;`
`10`	`10`
`@@ -28,13 +28,10 @@ public void setRun(Run run)`
`28`	`28`	`* @param json The parsed JSONObject (or null if JSON was not returned).`
`29`	`29`	`* @param sourceCommand A copy of the command that created this response`
`30`	`30`	`*/`
`31`		`- public LoadAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)`
	`31`	`+ public GetAssayRunResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)`
`32`	`32`	`{`
`33`	`33`	`super(text, statusCode, contentType, json, sourceCommand);`
`34`	`34`	`JSONObject runJson = (JSONObject) json.get("run");`
`35`		`- _run = new Run();`
`36`		`-`
`37`		`- _run.setName((String) runJson.get("name"));`
`38`		`- _run.setLsid((String) runJson.get("lsid"));`
	`35`	`+ _run = new Run(runJson);`
`39`	`36`	`}`
`40`	`37`	`}`