Skip to content

Commit 53fcd4e

Browse files
committed
local scope
1 parent a20f453 commit 53fcd4e

8 files changed

Lines changed: 5 additions & 7 deletions

File tree

libs/commons-codec-1.5.jar

-71.4 KB
Binary file not shown.

libs/commons-dbcp2-2.0.1.jar

-164 KB
Binary file not shown.

libs/commons-lang3-3.1.jar

-308 KB
Binary file not shown.

libs/commons-pool2-2.2.jar

-106 KB
Binary file not shown.

libs/gdata-2.2.1-alpha.jar

-187 KB
Binary file not shown.

src/main/java/org/mskcc/limsrest/controller/GetPickListValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ public class GetPickListValues {
2121
private static Log log = LogFactory.getLog(GetPickListValues.class);
2222
private final ConnectionPoolLIMS conn;
2323

24-
private final GetPickList task = new GetPickList();
25-
2624
public GetPickListValues(ConnectionPoolLIMS conn){
2725
this.conn = conn;
2826
}
@@ -35,7 +33,8 @@ public List<String> getContent(@RequestParam(value = "list", defaultValue = "Cou
3533
values.add("FAILURE: list is not using a valid format");
3634
return values;
3735
}
38-
task.init(list);
36+
GetPickList task = new GetPickList();
37+
task.setPicklist(list);
3938
log.info("Starting /getPickListValues query for " + list);
4039
Future<Object> result = conn.submitTask(task);
4140
try {

src/main/java/org/mskcc/limsrest/controller/GetRecentDeliveries.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
public class GetRecentDeliveries {
2424
private static Log log = LogFactory.getLog(GetRecentDeliveries.class);
2525
private final ConnectionPoolLIMS conn;
26-
private final GetDelivered task = new GetDelivered();
2726

2827
public GetRecentDeliveries(ConnectionPoolLIMS conn) {
2928
this.conn = conn;
@@ -34,8 +33,8 @@ public List<RequestSummary> getContent(@RequestParam(value = "time", defaultValu
3433
@RequestParam(value = "units", defaultValue = "NULL") String units,
3534
@RequestParam(value = "investigator", defaultValue = "NULL") String investigator,
3635
HttpServletRequest request) {
37-
log.info("/getRecentDeliveries client IP:" + request.getRemoteAddr());
38-
log.info("Starting /getRecentDeliveries?time=" + time + "&units="+units);
36+
log.info("Starting /getRecentDeliveries?time=" + time + "&units=" + units + " client IP:" + request.getRemoteAddr());
37+
GetDelivered task = new GetDelivered();
3938

4039
if (!time.equals("NULL") && !investigator.equals("NULL")) {
4140
task.init(investigator, Integer.parseInt(time), units);

src/main/java/org/mskcc/limsrest/service/GetPickList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public class GetPickList extends LimsTask {
1717
private String picklist;
1818

19-
public void init(String picklist) {
19+
public void setPicklist(String picklist) {
2020
this.picklist = picklist;
2121
}
2222

0 commit comments

Comments
 (0)