implement interfaces and factory pattern

Author: David Baum

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/Generator.java

@@ -2,64 +2,18 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.getaviz.generator.city.m2m.City2City;
-import org.getaviz.generator.city.m2t.City2AFrame;
-import org.getaviz.generator.city.m2t.City2X3D;
-import org.getaviz.generator.jqa.DatabaseBuilder;
-import org.getaviz.generator.jqa.JQA2JSON;
-import org.getaviz.generator.rd.m2m.RD2RD;
-import org.getaviz.generator.rd.m2t.RD2AFrame;
-import org.getaviz.generator.rd.m2t.RD2X3D;
-import org.getaviz.generator.city.s2m.JQA2City;
-import org.getaviz.generator.rd.s2m.JQA2RD;
 
-public class Generator {
-	private static SettingsConfiguration config = SettingsConfiguration.getInstance();
-	private static Log log = LogFactory.getLog(Generator.class);
+class Generator {
+	private Log log = LogFactory.getLog(this.getClass());
+	private Metaphor metaphor;
 
-	public static void main(String[] args) {
-		run();
+	Generator(SettingsConfiguration config) {
+		metaphor = MetaphorFactory.createMetaphor(config);
 	}
 
-	public static void run() {
+	void run() {
 		log.info("Generator started");
-		try {
-			if(!config.isSkipScan()) {
-				new DatabaseBuilder();
-			}
-			switch (config.getMetaphor()) {
-			case CITY: {
-				new JQA2City();
-				new JQA2JSON();
-				new City2City();
-				switch (config.getOutputFormat()) {
-				case X3D:
-					new City2X3D(); break;
-				case AFrame:
-					new City2AFrame(); break;
-				}
-				break;
-			}
-			case RD: {
-				new JQA2RD();
-				new JQA2JSON();
-				new RD2RD();
-				switch (config.getOutputFormat()) {
-				case X3D: {
-					new RD2X3D();
-					break;
-				}
-				case AFrame: {
-					new RD2AFrame();
-					break;
-				}
-				}
-				break;
-			}
-			}
-
-		} catch (Exception e) {
-			log.error(e);
-		}
+		metaphor.generate();
+		log.info("Generator finished");
 	}
 }

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/GeneratorServlet.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,19 +12,21 @@
 
 public class GeneratorServlet extends HttpServlet {
 	private static final long serialVersionUID = -5343549433924172589L;
-	private static Log log = LogFactory.getLog(GeneratorServlet.class);
+	private static final Log log = LogFactory.getLog(GeneratorServlet.class);
 
-	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		log.info("GET request generator");
 		SettingsConfiguration config = SettingsConfiguration.getInstance("/opt/config/settings.properties");
-		Generator.run();
+		Generator generator = new Generator(config);
+		generator.run();
 		writeResponse(response, config);
 	}
 
-	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		log.info("POST request generator");
 		SettingsConfiguration config = SettingsConfiguration.getInstance(request);
-		Generator.run();
+		Generator generator = new Generator(config);
+		generator.run();
 		writeResponse(response, config);
 	}
 
@@ -39,7 +40,7 @@ private void writeResponse(HttpServletResponse response, SettingsConfiguration c
 		String url = "http://" + addr.getHostAddress() + "/ui/index.php";
 		String name = config.getName();
 		boolean aframe = config.getOutputFormat() == OutputFormat.AFrame;
-		response.setHeader("Location", url + "?aframe=" + Boolean.toString(aframe) + "&model=" + name
+		response.setHeader("Location", url + "?aframe=" + aframe + "&model=" + name
 				+ "&setup=web_a-frame/default" + "&srcDir=data-gen");
 	}
 }

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/Metaphor.java

@@ -0,0 +1,7 @@
+package org.getaviz.generator;
+
+public interface Metaphor {
+
+    void generate();
+
+}

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/MetaphorFactory.java

@@ -0,0 +1,15 @@
+package org.getaviz.generator;
+
+import org.getaviz.generator.city.CityMetaphor;
+import org.getaviz.generator.rd.RDMetaphor;
+
+public class MetaphorFactory {
+
+    public static Metaphor createMetaphor(SettingsConfiguration config) {
+        if( config.getMetaphor() == SettingsConfiguration.Metaphor.RD) {
+            return new RDMetaphor(config);
+        } else {
+            return new CityMetaphor(config);
+        }
+    }
+}