Actually extract the files

Author: jamo

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareUnzipper.java

@@ -83,9 +83,10 @@ public UnzipResult unzip(Path zip, Path target) throws IOException {
                     }
                     boolean shouldWrite;
                     InputStream entryContent = zipFile.getInputStream(entry);
+                    byte[] entryData = IOUtils.toByteArray(entryContent);
                     if (Files.exists(entryTargetPath)) {
                         log.trace("Allowed to unzip, unzipping");
-                        byte[] entryData = IOUtils.toByteArray(entryContent);
+
                         if (fileContentEquals(target.toFile(), entryData)) {
                             shouldWrite = false;
                             result.unchangedFiles.add(entryTargetPath);
@@ -101,7 +102,7 @@ public UnzipResult unzip(Path zip, Path target) throws IOException {
                         result.newFiles.add(entryTargetPath);
                     }
                     if (shouldWrite) {
-                        FileUtils.copyInputStreamToFile(entryContent, entryTargetPath.toFile());
+                        FileUtils.writeByteArrayToFile(entryTargetPath.toFile(), entryData);
                     } else {
                         log.trace("Not allowed to unzip, skipping file");
                         result.skippedFiles.add(entryTargetPath);

tmc-langs-util/src/main/java/fi/helsinki/cs/tmc/langs/util/TaskExecutorImpl.java

@@ -10,6 +10,7 @@
 import fi.helsinki.cs.tmc.langs.io.EverythingIsStudentFileStudentFilePolicy;
 import fi.helsinki.cs.tmc.langs.io.NothingIsStudentFileStudentFilePolicy;
 import fi.helsinki.cs.tmc.langs.io.zip.StudentFileAwareUnzipper;
+import fi.helsinki.cs.tmc.langs.io.zip.Unzipper;
 
 import com.google.common.base.Optional;
 
@@ -85,7 +86,7 @@ public void extractProject(
 
     @Override
     public void extractAndRewriteEveryhing(Path compressedProject, Path targetLocation) throws IOException {
-            StudentFileAwareUnzipper unzipper =
+            Unzipper unzipper =
                     new StudentFileAwareUnzipper(new NothingIsStudentFileStudentFilePolicy());
             unzipper.unzip(compressedProject, targetLocation);
     }