Merge pull request #2 from CodinGame/update_implementation

feat: update java compiler according to the new constraints

Author: Sy1v4in

pom.xml

@@ -15,6 +15,11 @@
 			<artifactId>gson</artifactId>
 			<version>2.8.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.3.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/codingame/codemachine/compiler/java/CodinGameJavaCompiler.java

@@ -4,6 +4,7 @@
 import com.codingame.codemachine.compiler.java.core.CompilationLogKind;
 import com.codingame.codemachine.compiler.java.core.CompilationResult;
 import com.google.gson.Gson;
+import org.apache.commons.io.FileUtils;
 
 import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
@@ -12,6 +13,7 @@
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -21,6 +23,7 @@
 import static java.util.Collections.singletonList;
 
 public class CodinGameJavaCompiler {
+    private static final String DEFAULT_OUTPUT = "-";
 
     private static class NullOutputStream extends OutputStream {
         @Override
@@ -30,6 +33,7 @@ public void write(int b) throws IOException {
 
     public static void main(String... args) throws IOException {
         PrintStream realOut = System.out;
+        PrintStream realErr = System.err;
         System.setOut(new PrintStream(new NullOutputStream(), true));
         System.setErr(new PrintStream(new NullOutputStream(), true));
 
@@ -41,7 +45,6 @@ public static void main(String... args) throws IOException {
         List<String> files = new ArrayList<>();
         List<String> options = new ArrayList<>();
 
-
         for (int i = 0; i < args.length; ++i) {
             String arg = args[i];
 
@@ -64,6 +67,8 @@ public static void main(String... args) throws IOException {
             }
         }
 
+        CompilationResult result = new CompilationResult();
+        int resultCode = 1;
         if (!files.isEmpty()) {
             List<CompilationLogDto> logs = new ArrayList<>();
 
@@ -89,21 +94,33 @@ public static void main(String... args) throws IOException {
             }
             fileManager.close();
 
-            CompilationResult result = new CompilationResult();
             result.setSuccess(success);
             result.setLogs(logs);
-            realOut.println(new Gson().toJson(result));
-            System.exit(success ? 0 : 1);
+            resultCode = success ? 0 : 1;
         }
         else {
-            CompilationResult result = new CompilationResult();
             result.setSuccess(false);
             CompilationLogDto log = new CompilationLogDto();
             log.setKind(CompilationLogKind.ERROR);
             log.setMessage("no source file");
             result.setLogs(singletonList(log));
-            realOut.println(new Gson().toJson(result));
-            System.exit(2);
+            resultCode = 2;
+        }
+
+        String resultOutput = System.getProperty("codingame.compiler.output", DEFAULT_OUTPUT);
+        String resultStr = new Gson().toJson(result);
+        if (DEFAULT_OUTPUT.equals(resultOutput)) {
+            realOut.println(resultStr);
+        }
+        else {
+            try {
+                FileUtils.writeStringToFile(new File(resultOutput), resultStr);
+            }
+            catch (IOException e) {
+                realErr.println(e.getMessage());
+                System.exit(3);
+            }
         }
+        System.exit(resultCode);
     }
 }

src/main/resources/cgjavac

@@ -1,2 +1,2 @@
 #!/bin/bash
-java -jar /usr/src/codingame/java-compiler/java-compiler.jar "$@"
+java -Dcodingame.compiler.output=/project/results/compilation.json -jar /usr/src/codingame/java-compiler/java-compiler.jar "$@"