#32 -- by making the constructor for SpringFlow varags I could get ri…

…d of one <list> but practically not the other, because I'd need to write something more complex than <value> to create string beans; this is good enough for now
paulhoule · Oct 10, 2013 · ddaa51d · ddaa51d
1 parent c2d27d8
commit ddaa51d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/haruhi/src/main/java/com/ontology2/haruhi/flows/SpringFlow.java b/haruhi/src/main/java/com/ontology2/haruhi/flows/SpringFlow.java
@@ -1,5 +1,6 @@
 package com.ontology2.haruhi.flows;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.google.common.collect.Lists;
@@ -24,6 +25,10 @@ public class SpringFlow extends Flow {
     public SpringFlow(List<SpringStep> springSteps) {
         this.springSteps = springSteps;
     }
+
+    public SpringFlow(SpringStep... springSteps) {
+        this(Arrays.asList(springSteps));
+    }
 
     @Override
     public List<FlowStep> generateSteps(List<String> flowArgs) {

diff --git a/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml b/haruhi/src/main/resources/com/ontology2/haruhi/shell/applicationContext.xml
@@ -50,18 +50,16 @@
 
   <bean name="basekbNowFlow" class="com.ontology2.haruhi.flows.SpringFlow">
     <constructor-arg>
-        <list>
-            <bean class="com.ontology2.haruhi.flows.JobStep">
-                <constructor-arg>
-                  <list>
-                     <value>'run'</value>
-                     <value>'freebaseRDFPrefilter'</value>
-                     <value>pos[0]+'freebase-rdf-'+pos[1]+'/'</value>
-                     <value>tmpDir+'preprocessed/'+pos[1]+'/'</value>
-                  </list>
-                </constructor-arg>
-            </bean>
-        </list>
+      <bean class="com.ontology2.haruhi.flows.JobStep">
+          <constructor-arg>
+            <list>
+              <value>'run'</value>
+              <value>'freebaseRDFPrefilter'</value>
+              <value>pos[0]+'freebase-rdf-'+pos[1]+'/'</value>
+              <value>tmpDir+'preprocessed/'+pos[1]+'/'</value>
+            </list>
+          </constructor-arg>
+      </bean>
     </constructor-arg>
   </bean>
 

diff --git a/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java b/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java
@@ -28,9 +28,12 @@ public class TestFlowBeans {
         SpringStep step0=(SpringStep) steps.get(0);
         List<String> args=step0.getStepArgs(flowArgs);
 
-        assertEquals(3,args.size());
-        assertEquals("freebaseRDFPrefilter",args.get(0));
-        assertEquals("s3n://freebase-dumps/freebase-rdf-1942-12-07-00-00/",args.get(1));
-        assertEquals("/preprocessed/1942-12-07-00-00/",args.get(2));
+        assertEquals(4,args.size());
+
+        int i=0;
+        assertEquals("run",args.get(i++));
+        assertEquals("freebaseRDFPrefilter",args.get(i++));
+        assertEquals("s3n://freebase-dumps/freebase-rdf-1942-12-07-00-00/",args.get(i++));
+        assertEquals("/preprocessed/1942-12-07-00-00/",args.get(i++));
     }
 }