refactored Flux

moved ANTLR specifics to FluxCompiler

Author: mgeipel

src/main/java/org/culturegraph/mf/Flux.java

@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.HashMap;
@@ -28,14 +27,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.antlr.runtime.ANTLRInputStream;
-import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
 import org.culturegraph.mf.flux.Flow;
-import org.culturegraph.mf.flux.parser.FlowBuilder;
-import org.culturegraph.mf.flux.parser.FluxLexer;
-import org.culturegraph.mf.flux.parser.FluxParser;
+import org.culturegraph.mf.flux.FluxCompiler;
 import org.culturegraph.mf.util.ResourceUtil;
 
 /**
@@ -101,21 +95,10 @@ public boolean accept(final File dir, final String name) {
 			}
 
 			// run parser and builder
-			final Flow flow = compileFlow(compileAst(ResourceUtil.getStream(fluxFile)), vars);
-			flow.start();
+			FluxCompiler.compile(ResourceUtil.getStream(fluxFile), vars).start();
+			//flow.start();
 		}
 	}
 
-	public static CommonTreeNodeStream compileAst(final InputStream flowDef) throws IOException, RecognitionException {
-		final FluxParser parser = new FluxParser(new CommonTokenStream(new FluxLexer(new ANTLRInputStream(flowDef))));
-		return new CommonTreeNodeStream(parser.flux().getTree());
-	}
 
-	public static Flow compileFlow(final CommonTreeNodeStream treeNodes, final Map<String, String> vars)
-			throws RecognitionException {
-		final FlowBuilder flowBuilder = new FlowBuilder(treeNodes);
-		flowBuilder.addVaribleAssignements(vars);
-		final Flow flow = flowBuilder.flux();
-		return flow;
-	}
 }

src/main/java/org/culturegraph/mf/flux/FluxCompiler.java

@@ -0,0 +1,58 @@
+/*
+ *  Copyright 2013 Deutsche Nationalbibliothek
+ *
+ *  Licensed under the Apache License, Version 2.0 the "License";
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.culturegraph.mf.flux;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import org.antlr.runtime.ANTLRInputStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.tree.CommonTreeNodeStream;
+import org.culturegraph.mf.flux.parser.FlowBuilder;
+import org.culturegraph.mf.flux.parser.FluxLexer;
+import org.culturegraph.mf.flux.parser.FluxParser;
+
+/**
+ * Creates a {@link Flow} based on a flux script
+ * 
+ * @author markus geipel
+ *
+ */
+public final class FluxCompiler {
+	private FluxCompiler() {
+		// no instances
+	}
+	
+	public static Flow compile(final InputStream flux, final Map<String,String> vars ) throws RecognitionException, IOException{
+		return compileFlow(compileAst(flux), vars);
+	}
+	
+	private static CommonTreeNodeStream compileAst(final InputStream flowDef) throws IOException, RecognitionException {
+		final FluxParser parser = new FluxParser(new CommonTokenStream(new FluxLexer(new ANTLRInputStream(flowDef))));
+		return new CommonTreeNodeStream(parser.flux().getTree());
+	}
+
+	private static Flow compileFlow(final CommonTreeNodeStream treeNodes, final Map<String, String> vars)
+			throws RecognitionException {
+		final FlowBuilder flowBuilder = new FlowBuilder(treeNodes);
+		flowBuilder.addVaribleAssignements(vars);
+		final Flow flow = flowBuilder.flux();
+		return flow;
+	}
+}