diff --git a/haruhi/src/main/java/com/ontology2/haruhi/flows/SpringFlow.java b/haruhi/src/main/java/com/ontology2/haruhi/flows/SpringFlow.java index e806614..fb7724a 100644 --- 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 springSteps) { this.springSteps = springSteps; } + + public SpringFlow(SpringStep... springSteps) { + this(Arrays.asList(springSteps)); + } @Override public List generateSteps(List 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 index ed21905..e5300a4 100644 --- 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 @@ - - - - - 'run' - 'freebaseRDFPrefilter' - pos[0]+'freebase-rdf-'+pos[1]+'/' - tmpDir+'preprocessed/'+pos[1]+'/' - - - - + + + + 'run' + 'freebaseRDFPrefilter' + pos[0]+'freebase-rdf-'+pos[1]+'/' + tmpDir+'preprocessed/'+pos[1]+'/' + + + diff --git a/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java b/haruhi/src/test/java/com/ontology2/haruhi/flows/TestFlowBeans.java index 66589a6..9940f8d 100644 --- 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 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++)); } }