implement read() for ProblemLocalConnection

Author: charlesnguyen8

app/controllers/Upload.java

@@ -73,25 +73,7 @@ public Result uploadFiles(Http.Request request, String problem, String editKey)
         }
     }
 
-    private void saveProblem(String problem, Map<Path, byte[]> problemFiles) throws IOException {
-        // boolean isOnS3 = s3conn.isOnS3("ext");
-        // if (isOnS3) {
-        //     byte[] problemZip = Util.zip(problemFiles);
-        //     s3conn.putToS3(problemZip, repo, problem);
-        // } else {
-        //     Path extDir = java.nio.file.Path.of(config.getString("com.horstmann.codecheck.repo.ext"));
-        //     Path problemDir = extDir.resolve(problem);
-        //     com.horstmann.codecheck.Util.deleteDirectory(problemDir); // Delete any prior contents so that it is replaced by new zip file
-        //     Files.createDirectories(problemDir);
-        //     problemDir = problemDir.resolve("problem.zip");
-            
-        //     // for (Map.Entry<Path, byte[]> entry : problemFiles.entrySet()) {
-        //     //     Path p = problemDir.resolve(entry.getKey());
-        //     //     Files.write(p, entry.getValue());
-        //     // }
-        //     byte[] problemZip = Util.zip(problemFiles);
-        //     org.apache.commons.io.FileUtils.writeByteArrayToFile(new File(problemDir.toString()), problemZip);
-        // }     
+    private void saveProblem(String problem, Map<Path, byte[]> problemFiles) throws IOException {   
         byte[] problemZip = Util.zip(problemFiles);
         probConn.write(problemZip, repo, problem);  
     }

app/models/CodeCheck.java

@@ -1,5 +1,7 @@
 package models;
 
+import models.ProblemConnection.ProblemConnector;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -38,12 +40,13 @@ public class CodeCheck {
     private static Logger.ALogger logger = Logger.of("com.horstmann.codecheck");    
     private Config config;
     private S3Connection s3conn;
+    private ProblemConnector probConn;
     private JarSigner signer;
     private ResourceLoader resourceLoader;
 
-    @Inject public CodeCheck(Config config, S3Connection s3conn, Environment playEnv) {
+    @Inject public CodeCheck(Config config, ProblemConnector probConn, Environment playEnv) {
         this.config = config;
-        this.s3conn = s3conn;
+        this.probConn = probConn;
         resourceLoader = new ResourceLoader() {
             @Override
             public InputStream loadResource(String path) throws IOException {
@@ -128,16 +131,10 @@ private String replaceParametersInFile(String contents, ScriptEngine engine) thr
     }
 
     public Map<Path, byte[]> loadProblem(String repo, String problemName) throws IOException {
-        if (s3conn.isOnS3(repo)) {
-            return Util.unzip(s3conn.readFromS3(repo, problemName));
-        } else {
-            Path repoPath = Path.of(config.getString("com.horstmann.codecheck.repo."
-                            + repo));
-            // TODO: That comes from Problems.java--fix it there
-            if (problemName.startsWith("/"))
-                problemName = problemName.substring(1);
-            return Util.descendantFiles(repoPath.resolve(problemName));         
-        }
+        Map<Path, byte[]> result;
+        byte[] zipFile = probConn.read(repo, problemName);
+        result = Util.unzip(zipFile);
+        return result;
     }
 
     public Report run(String reportType, String repo,

app/models/ProblemConnection.java

@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.FileInputStream;
 import java.io.File;
 import java.io.FileWriter;
 import java.nio.file.Path;
@@ -15,6 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.horstmann.codecheck.Util;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -47,6 +50,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.typesafe.config.Config;
+import com.typesafe.config.ConfigException;
 
 import play.Logger;
 
@@ -210,14 +214,26 @@ public void write(String contents, String repo, String key) throws IOException {
         public void write(byte[] contents, String repo, String key) throws IOException {
             Path repoPath = Path.of(config.getString("com.horstmann.codecheck.repo." + repo));
             Path problemDir = repoPath.resolve(key);
-            com.horstmann.codecheck.Util.deleteDirectory(problemDir); // Delete any prior contents so that it is replaced by new zip file
+            Util.deleteDirectory(problemDir); // Delete any prior contents so that it is replaced by new zip file
             Files.createDirectories(problemDir);
             problemDir = problemDir.resolve("problem.zip");
             org.apache.commons.io.FileUtils.writeByteArrayToFile(new File(problemDir.toString()), contents);
         }
-        public void delete(String repo, String key) throws IOException {}
+        public void delete(String repo, String key) throws IOException {
+
+        }
         public byte[] read(String repo, String problem) throws IOException {
-            return null;
+            Path repoPath = Path.of(config.getString("com.horstmann.codecheck.repo." + repo));
+            if (problem.startsWith("/"))
+                problem = problem.substring(1);
+            
+            byte[] result = null;
+            try {
+                InputStream in = new FileInputStream(repoPath.resolve(problem).resolve("problem.zip").toString());
+                result = in.readAllBytes();
+            } catch (IOException ex) {}   
+            
+            return result;  
         }
     }