Return a list of runids for expandAndRunWorkflow - Will now wait for planning to finish to return

Author: IKCAP

portal/.settings/org.eclipse.wst.common.component

@@ -78,7 +78,7 @@
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-        <dependent-module archiveName="wings-planner-5.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wings-planner/wings-planner">
+        <dependent-module archiveName="wings-planner-5.3.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wings-planner/wings-planner">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="ontapi-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ontapi/ontapi">

portal/src/main/java/edu/isi/wings/portal/classes/util/PlanningAndExecutingThread.java

@@ -68,6 +68,7 @@ public class PlanningAndExecutingThread implements Runnable {
   ExecutorService executor;
   int max_number_of_executions;
   ServletContext context;
+  ArrayList<String> runids;
 
   public PlanningAndExecutingThread(
       String ex_prefix,
@@ -86,6 +87,7 @@ public PlanningAndExecutingThread(
     this.ex_prefix = ex_prefix;
     this.template_id = template_id;
     this.context = context;
+    this.runids = new ArrayList<String>();
   }
 
   private void addTemplateBindings(Template tpl, TemplateBindings tb) {
@@ -226,6 +228,7 @@ public void run() {
               rplan.setCallbackUrl(this.template_bindings.getCallbackUrl());
               rplan.setCallbackCookies(this.template_bindings.getCallbackCookies());
               this.runExecutionPlan(rplan);
+              this.runids.add(runid);
             }
           }
           if (i >= this.max_number_of_executions) {
@@ -238,4 +241,12 @@ public void run() {
       e.printStackTrace();
     }
   }
+
+  public ArrayList<String> getRunids() {
+    return runids;
+  }
+
+  public void setRunids(ArrayList<String> runids) {
+    this.runids = runids;
+  }
 }

portal/src/main/java/edu/isi/wings/portal/controllers/DataController.java

@@ -758,7 +758,10 @@ public String runSensorWorkflow(String dataid, HttpServletRequest request, Servl
       tbindings.setComponentBindings(new HashMap<String, String>());
       tbindings.setTemplateId(tplid);
 
-      return this.rc.expandAndRunTemplate(tbindings, context);
+      ArrayList<String> runids = this.rc.expandAndRunTemplate(tbindings, context);
+      if(runids != null && runids.size() > 0) {
+        return runids.get(0);
+      }
     }
     catch (Exception e) {
       e.printStackTrace();

portal/src/main/java/edu/isi/wings/portal/controllers/RunController.java

@@ -336,15 +336,11 @@ public boolean stopRun(String runid, ServletContext context) {
      - Immediately returns a run id
      - Puts the rest of the processing in a Queue to be processed sequentially
   */
-  public String expandAndRunTemplate(TemplateBindings template_bindings, ServletContext context) {
+  public ArrayList<String> expandAndRunTemplate(TemplateBindings template_bindings, ServletContext context) {
     // Create a runid
     String ex_prefix = props.getProperty("domain.executions.dir.url");
     String template_id = template_bindings.getTemplateId();
 
-    URIEntity tpluri = new URIEntity(template_id);
-    tpluri.setID(UuidGen.generateURIUuid(tpluri));
-    String runid = ex_prefix + "/" + tpluri.getName() + ".owl#" + tpluri.getName();
-    
     PlanningAPIBindings apis = null;
     if(apiBindings.containsKey(ex_prefix)) {
       apis = apiBindings.get(ex_prefix);
@@ -355,11 +351,18 @@ public String expandAndRunTemplate(TemplateBindings template_bindings, ServletCo
     }
 
     // Submit the planning and execution thread
-    executor.submit(new PlanningAndExecutingThread(ex_prefix, template_id, 
-        this.config, config.getPlannerConfig().getMaxQueueSize(), template_bindings, apis, executor, context));
-    
-    // Return the runid
-    return runid;
+    try {
+      PlanningAndExecutingThread thread = new PlanningAndExecutingThread(ex_prefix, template_id, 
+          this.config, config.getPlannerConfig().getMaxQueueSize(), template_bindings, apis, executor, context);
+      executor.submit(thread).get();
+      
+      // Return the runids
+      return thread.getRunids();
+    }
+    catch(Exception e) {
+      e.printStackTrace();
+      return null;
+    }
   }
 
   public Future<?> runComponent(String cid, HashMap<String, Binding> role_bindings, 

portal/src/main/java/edu/isi/wings/portal/resources/RunResource.java

@@ -1,5 +1,6 @@
 package edu.isi.wings.portal.resources;
 
+import java.util.ArrayList;
 import java.util.Date;
 
 import javax.annotation.PostConstruct;
@@ -112,7 +113,7 @@ public String getRunPlan(
   @POST
   @Path("expandAndRunWorkflow")
   @Produces(MediaType.APPLICATION_JSON)
-  public String expandAndRunWorkflow(
+  public ArrayList<String> expandAndRunWorkflow(
       @JsonProperty("template_bindings") final TemplateBindings tbindings) {
     if(this.rc != null) {
       return rc.expandAndRunTemplate(tbindings, this.context);