Revised and optimised Codejudge compilation server

Author: ngsankha

codejudge-compiler/src/codejudge/compiler/RequestThread.java

@@ -10,6 +10,12 @@
 import java.io.PrintWriter;
 import java.net.Socket;
 
+import codejudge.compiler.languages.C;
+import codejudge.compiler.languages.Cpp;
+import codejudge.compiler.languages.Java;
+import codejudge.compiler.languages.Language;
+import codejudge.compiler.languages.Python;
+
 public class RequestThread extends Thread {
 
 	Socket s;
@@ -35,57 +41,24 @@ public void run() {
 			PrintWriter writer = new PrintWriter(new FileOutputStream("stage/" + n +"/in.txt"));
 			writer.println(input);
 			writer.close();
-			if(lang.equals("c")) {
-				C c = new C(file, contents, dir.getAbsolutePath());
-				c.compile();
-				String errors = compileErrors();
-				if(errors.equals("")) {
-					c.execute();
-					String output = execMsg();
-					out.println("1");
-					out.println(output);
-				} else {
-					out.println("0");
-					out.println(errors);
-				}
-			} else if(lang.equals("cpp")) {
-				Cpp cpp = new Cpp(file, contents, dir.getAbsolutePath());
-				cpp.compile();
-				String errors = compileErrors();
-				if(errors.equals("")) {
-					cpp.execute();
-					String output = execMsg();
-					out.println("1");
-					out.println(output);
-				} else {
-					out.println("0");
-					out.println(errors);
-				}
-			} else if(lang.equals("java")) {
-				Java java = new Java(file, contents, dir.getAbsolutePath());
-				java.compile();
-				String errors = compileErrors();
-				if(errors.equals("")) {
-					java.execute();
-					String output = execMsg();
-					out.println("1");
-					out.println(output);
-				} else {
-					out.println("0");
-					out.println(errors);
-				}
-			} else if(lang.equals("python")) {
-				Python py = new Python(file, contents, dir.getAbsolutePath());
-				py.execute();
-				String errors = compileErrors();
-				if(errors.equals("")) {
-					String output = execMsg();
-					out.println("1");
-					out.println(output);
-				} else {
-					out.println("0");
-					out.println(errors);
-				}
+			Language l = null;
+			if(lang.equals("c"))
+				l = new C(file, contents, dir.getAbsolutePath());
+			else if(lang.equals("cpp"))
+				l = new Cpp(file, contents, dir.getAbsolutePath());
+			else if(lang.equals("java"))
+				l = new Java(file, contents, dir.getAbsolutePath());
+			else if(lang.equals("python"))
+				l = new Python(file, contents, dir.getAbsolutePath());
+			l.compile();
+			String errors = compileErrors();
+			if(!errors.equals("")) {
+				out.println("0");
+				out.println(errors);
+			} else {
+				l.execute();
+				out.println("1");
+				out.println(execMsg());
 			}
 			s.close();
 		} catch (IOException e) {

codejudge-compiler/src/codejudge/compiler/C.java renamed to codejudge-compiler/src/codejudge/compiler/languages/C.java

@@ -1,12 +1,12 @@
-package codejudge.compiler;
+package codejudge.compiler.languages;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-public class C {
+public class C implements Language {
 
 	String file, contents, dir;
 

codejudge-compiler/src/codejudge/compiler/Cpp.java renamed to codejudge-compiler/src/codejudge/compiler/languages/Cpp.java

@@ -1,12 +1,12 @@
-package codejudge.compiler;
+package codejudge.compiler.languages;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-public class Cpp {
+public class Cpp implements Language {
 
 	String file, contents, dir;
 

codejudge-compiler/src/codejudge/compiler/Java.java renamed to codejudge-compiler/src/codejudge/compiler/languages/Java.java

@@ -1,12 +1,12 @@
-package codejudge.compiler;
+package codejudge.compiler.languages;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-public class Java {
+public class Java implements Language {
 
 	String file, contents, dir;
 

codejudge-compiler/src/codejudge/compiler/languages/Language.java

@@ -0,0 +1,8 @@
+package codejudge.compiler.languages;
+
+public interface Language {
+	
+	public void execute();
+	public void compile();
+	
+}

codejudge-compiler/src/codejudge/compiler/Python.java renamed to codejudge-compiler/src/codejudge/compiler/languages/Python.java

@@ -1,12 +1,12 @@
-package codejudge.compiler;
+package codejudge.compiler.languages;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-public class Python {
+public class Python implements Language {
 
 	String file, contents, dir;
 
@@ -16,7 +16,7 @@ public Python(String file, String contents, String dir) {
 		this.dir = dir;
 	}
 
-	public void execute() {
+	public void compile() {
 		try {
 			BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(dir + "/" + file)));
 			out.write(contents);
@@ -38,4 +38,6 @@ public void execute() {
 			e.printStackTrace();
 		}
 	}
+
+	public void execute() {}
 }