Skip to content

Commit 30c1e4e

Browse files
labkey-ankurjlabkey-ankurj
committed
Item 6174: New ListDomainsCommand
SVN r64504 |2019-09-13 18:48:57 +0000
1 parent 0b30239 commit 30c1e4e

File tree

5 files changed

+146
-12
lines changed

5 files changed

+146
-12
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ java/src/org/labkey/remoteapi/assay/Material.java -text
3232
java/src/org/labkey/remoteapi/assay/Run.java -text
3333
java/src/org/labkey/remoteapi/assay/SaveAssayBatchCommand.java -text
3434
java/src/org/labkey/remoteapi/assay/SaveAssayBatchResponse.java -text
35-
java/src/org/labkey/remoteapi/assay/SaveAssayRunCommand.java -text
36-
java/src/org/labkey/remoteapi/assay/SaveAssayRunResponse.java -text
35+
java/src/org/labkey/remoteapi/assay/SaveAssayRunsCommand.java -text
36+
java/src/org/labkey/remoteapi/assay/SaveAssayRunsResponse.java -text
3737
java/src/org/labkey/remoteapi/assay/nab/NAbRunsCommand.java -text
3838
java/src/org/labkey/remoteapi/assay/nab/NAbRunsResponse.java -text
3939
java/src/org/labkey/remoteapi/assay/nab/model/NAbCurveParameters.java -text
@@ -59,6 +59,8 @@ java/src/org/labkey/remoteapi/domain/DomainCommand.java -text
5959
java/src/org/labkey/remoteapi/domain/DomainResponse.java -text
6060
java/src/org/labkey/remoteapi/domain/DropDomainCommand.java -text
6161
java/src/org/labkey/remoteapi/domain/GetDomainCommand.java -text
62+
java/src/org/labkey/remoteapi/domain/ListDomainsCommand.java -text
63+
java/src/org/labkey/remoteapi/domain/ListDomainsResponse.java -text
6264
java/src/org/labkey/remoteapi/domain/PropertyDescriptor.java -text
6365
java/src/org/labkey/remoteapi/domain/SaveDomainCommand.java -text
6466
java/src/org/labkey/remoteapi/experiment/LineageCommand.java -text

java/src/org/labkey/remoteapi/assay/SaveAssayRunCommand.java renamed to java/src/org/labkey/remoteapi/assay/SaveAssayRunsCommand.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,27 @@
55
import org.json.simple.JSONObject;
66
import org.labkey.remoteapi.PostCommand;
77

8-
import java.util.ArrayList;
98
import java.util.List;
109

1110
/**
1211
* Saves runs on the server.
1312
*/
14-
public class SaveAssayRunCommand extends PostCommand<SaveAssayRunResponse>
13+
public class SaveAssayRunsCommand extends PostCommand<SaveAssayRunsResponse>
1514
{
1615
private List<Run> _runs;
1716
private String _protocolName;
1817

1918
/**
2019
* @param runs the runs to be saved
2120
*/
22-
public SaveAssayRunCommand(String protocolName, List<Run> runs)
21+
public SaveAssayRunsCommand(String protocolName, List<Run> runs)
2322
{
24-
super("assay", "saveAssayRun");
23+
super("assay", "saveAssayRuns");
2524
_runs = runs;
2625
_protocolName = protocolName;
2726
}
2827

29-
public SaveAssayRunCommand(SaveAssayRunCommand source)
28+
public SaveAssayRunsCommand(SaveAssayRunsCommand source)
3029
{
3130
super(source);
3231
_runs = source._runs;
@@ -35,7 +34,7 @@ public SaveAssayRunCommand(SaveAssayRunCommand source)
3534
@Override
3635
public PostCommand copy()
3736
{
38-
return new SaveAssayRunCommand(this);
37+
return new SaveAssayRunsCommand(this);
3938
}
4039

4140
@Override
@@ -53,9 +52,9 @@ public JSONObject getJsonObject()
5352
}
5453

5554
@Override
56-
protected SaveAssayRunResponse createResponse(String text, int status, String contentType, JSONObject json)
55+
protected SaveAssayRunsResponse createResponse(String text, int status, String contentType, JSONObject json)
5756
{
58-
return new SaveAssayRunResponse(text, status, contentType, json, this);
57+
return new SaveAssayRunsResponse(text, status, contentType, json, this);
5958
}
6059

6160
public List<Run> getRuns()

java/src/org/labkey/remoteapi/assay/SaveAssayRunResponse.java renamed to java/src/org/labkey/remoteapi/assay/SaveAssayRunsResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
public class SaveAssayRunResponse extends CommandResponse
11+
public class SaveAssayRunsResponse extends CommandResponse
1212
{
1313
private List<Run> _runs = new ArrayList<>();
1414

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

‎java/src/org/labkey/remoteapi/domain/ListDomainsCommand.java‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package org.labkey.remoteapi.domain;
2+
3+
import org.json.simple.JSONArray;
4+
import org.json.simple.JSONObject;
5+
import org.labkey.remoteapi.PostCommand;
6+
7+
import java.util.Set;
8+
9+
public class ListDomainsCommand extends PostCommand<ListDomainsResponse>
10+
{
11+
private boolean _includeFields;
12+
private boolean _includeProjectAndShared;
13+
private Set<String> _domainKinds;
14+
private String _containerPath;
15+
16+
public ListDomainsCommand(boolean includeFields, boolean includeProjectAndShared, Set<String> domainKinds, String containerPath)
17+
{
18+
super("property", "listDomains");
19+
_includeFields = includeFields;
20+
_includeProjectAndShared = includeProjectAndShared;
21+
_domainKinds = domainKinds;
22+
_containerPath = containerPath;
23+
}
24+
25+
public boolean isIncludeFields()
26+
{
27+
return _includeFields;
28+
}
29+
30+
public void setIncludeFields(boolean includeFields)
31+
{
32+
_includeFields = includeFields;
33+
}
34+
35+
public boolean isIncludeProjectAndShared()
36+
{
37+
return _includeProjectAndShared;
38+
}
39+
40+
public void setIncludeProjectAndShared(boolean includeProjectAndShared)
41+
{
42+
_includeProjectAndShared = includeProjectAndShared;
43+
}
44+
45+
public Set<String> getDomainKinds()
46+
{
47+
return _domainKinds;
48+
}
49+
50+
public void setDomainKinds(Set<String> domainKinds)
51+
{
52+
_domainKinds = domainKinds;
53+
}
54+
55+
public String getContainerPath()
56+
{
57+
return _containerPath;
58+
}
59+
60+
public void setContainerPath(String containerPath)
61+
{
62+
_containerPath = containerPath;
63+
}
64+
65+
@Override
66+
protected ListDomainsResponse createResponse(String text, int status, String contentType, JSONObject json)
67+
{
68+
return new ListDomainsResponse(text, status, contentType, json, this);
69+
}
70+
71+
@Override
72+
public JSONObject getJsonObject()
73+
{
74+
JSONObject result = new JSONObject();
75+
JSONArray domainKinds = new JSONArray();
76+
77+
for(String domainKind: getDomainKinds())
78+
{
79+
domainKinds.add(domainKind);
80+
}
81+
82+
result.put("containerPath", _containerPath);
83+
result.put("domainKinds", domainKinds);
84+
result.put("includeFields", _includeFields);
85+
result.put("includeProjectAndShared", _includeProjectAndShared);
86+
87+
88+
return result;
89+
}
90+
}

‎java/src/org/labkey/remoteapi/domain/ListDomainsResponse.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package org.labkey.remoteapi.domain;
2+
3+
import org.json.simple.JSONArray;
4+
import org.json.simple.JSONObject;
5+
import org.labkey.remoteapi.Command;
6+
import org.labkey.remoteapi.CommandResponse;
7+
8+
import java.util.ArrayList;
9+
import java.util.List;
10+
11+
public class ListDomainsResponse extends CommandResponse
12+
{
13+
List<Domain> _domains = new ArrayList<>();
14+
/**
15+
* Constructs a new CommandResponse, initialized with the provided
16+
* response text and status code.
17+
*
18+
* @param text The response text
19+
* @param statusCode The HTTP status code
20+
* @param contentType The response content type
21+
* @param json The parsed JSONObject (or null if JSON was not returned).
22+
* @param sourceCommand A copy of the command that created this response
23+
*/
24+
public ListDomainsResponse(String text, int statusCode, String contentType, JSONObject json, Command sourceCommand)
25+
{
26+
super(text, statusCode, contentType, json, sourceCommand);
27+
JSONArray domains = (JSONArray) json.get("domains");
28+
for(Object domainJSON: domains)
29+
{
30+
_domains.add(new Domain((JSONObject) domainJSON));
31+
}
32+
}
33+
34+
public List<Domain> getDomains()
35+
{
36+
return _domains;
37+
}
38+
39+
public void setDomains(List<Domain> domains)
40+
{
41+
_domains = domains;
42+
}
43+
}

0 commit comments

Comments
 (0)