local scope

mskcc · Aug 23, 2019 · 53fcd4e · 53fcd4e
1 parent a20f453
commit 53fcd4e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 7 deletions.
diff --git a/libs/commons-codec-1.5.jar b/libs/commons-codec-1.5.jar
diff --git a/libs/commons-dbcp2-2.0.1.jar b/libs/commons-dbcp2-2.0.1.jar
diff --git a/libs/commons-lang3-3.1.jar b/libs/commons-lang3-3.1.jar
diff --git a/libs/commons-pool2-2.2.jar b/libs/commons-pool2-2.2.jar
diff --git a/libs/gdata-2.2.1-alpha.jar b/libs/gdata-2.2.1-alpha.jar
diff --git a/src/main/java/org/mskcc/limsrest/controller/GetPickListValues.java b/src/main/java/org/mskcc/limsrest/controller/GetPickListValues.java
@@ -21,8 +21,6 @@ public class GetPickListValues {
     private static Log log = LogFactory.getLog(GetPickListValues.class);
     private final ConnectionPoolLIMS conn;
 
-    private final GetPickList task = new GetPickList();
-
     public GetPickListValues(ConnectionPoolLIMS conn){
         this.conn = conn;
     }
@@ -35,7 +33,8 @@ public List<String> getContent(@RequestParam(value = "list", defaultValue = "Cou
             values.add("FAILURE: list is not using a valid format");
             return values;
         }
-        task.init(list);
+        GetPickList task = new GetPickList();
+        task.setPicklist(list);
         log.info("Starting /getPickListValues query for " + list);
         Future<Object> result = conn.submitTask(task);
         try {

diff --git a/src/main/java/org/mskcc/limsrest/controller/GetRecentDeliveries.java b/src/main/java/org/mskcc/limsrest/controller/GetRecentDeliveries.java
@@ -23,7 +23,6 @@
 public class GetRecentDeliveries {
     private static Log log = LogFactory.getLog(GetRecentDeliveries.class);
     private final ConnectionPoolLIMS conn;
-    private final GetDelivered task = new GetDelivered();
 
     public GetRecentDeliveries(ConnectionPoolLIMS conn) {
         this.conn = conn;
@@ -34,8 +33,8 @@ public List<RequestSummary> getContent(@RequestParam(value = "time", defaultValu
                                            @RequestParam(value = "units", defaultValue = "NULL") String units,
                                            @RequestParam(value = "investigator", defaultValue = "NULL") String investigator,
                                            HttpServletRequest request) {
-        log.info("/getRecentDeliveries client IP:" + request.getRemoteAddr());
-        log.info("Starting /getRecentDeliveries?time=" + time + "&units="+units);
+        log.info("Starting /getRecentDeliveries?time=" + time + "&units=" + units + " client IP:" + request.getRemoteAddr());
+        GetDelivered task = new GetDelivered();
 
         if (!time.equals("NULL") && !investigator.equals("NULL")) {
             task.init(investigator, Integer.parseInt(time), units);

diff --git a/src/main/java/org/mskcc/limsrest/service/GetPickList.java b/src/main/java/org/mskcc/limsrest/service/GetPickList.java
@@ -16,7 +16,7 @@
 public class GetPickList extends LimsTask {
     private String picklist;
 
-    public void init(String picklist) {
+    public void setPicklist(String picklist) {
         this.picklist = picklist;
     }