Code style

Author: jamo

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

@@ -30,8 +30,7 @@ public final class StudentFileAwareUnzipper implements Unzipper {
 
     private StudentFilePolicy filePolicy;
 
-    public StudentFileAwareUnzipper() {
-    }
+    public StudentFileAwareUnzipper() {}
 
     public StudentFileAwareUnzipper(StudentFilePolicy filePolicy) {
         this.filePolicy = filePolicy;
@@ -70,15 +69,22 @@ public UnzipResult unzip(Path zip, Path target) throws IOException {
                 ZipArchiveEntry entry = entries.nextElement();
 
                 if (entry.getName().startsWith(projectDirInZip)) {
-                    String restOfPath = trimSlashes(entry.getName().substring(projectDirInZip.length()));
+                    String restOfPath =
+                            trimSlashes(entry.getName().substring(projectDirInZip.length()));
 
-                    Path entryTargetPath = target.resolve(trimSlashes(restOfPath.replace("/", File.separator)));
+                    Path entryTargetPath =
+                            target.resolve(trimSlashes(restOfPath.replace("/", File.separator)));
                     pathsInZip.add(entryTargetPath);
 
-                    log.debug("Processing zipEntry with name {} to {}", entry.getName(), entryTargetPath);
+                    log.debug(
+                            "Processing zipEntry with name {} to {}",
+                            entry.getName(),
+                            entryTargetPath);
                     if (entry.isDirectory() || entryTargetPath.toFile().isDirectory()) {
                         Files.createDirectories(entryTargetPath);
-                        log.debug("{} is a directory - creating and off to the next file ", entry.getName());
+                        log.debug(
+                                "{} is a directory - creating and off to the next file ",
+                                entry.getName());
                         continue;
                     }
                     boolean shouldWrite;
@@ -121,10 +127,11 @@ public UnzipResult unzip(Path zip, Path target) throws IOException {
     }
 
     // TODO: validate
-    private void deleteFilesNotInZip(Path projectDir, Path curDir, UnzipResult result, Set<Path> pathsInZip) throws IOException {
+    private void deleteFilesNotInZip(
+            Path projectDir, Path curDir, UnzipResult result, Set<Path> pathsInZip)
+            throws IOException {
 
         for (File file : curDir.toFile().listFiles()) {
-//            Path relPath = Paths.get(trimSlashes(file.getPath().substring(projectDir.getPath().length())));
             Path filePath = file.toPath();
             if (file.isDirectory()) {
                 deleteFilesNotInZip(projectDir, file.toPath(), result, pathsInZip);

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

@@ -101,7 +101,8 @@ void extractProject(Path compressedProject, Path targetLocation, boolean overwri
      * Extract a given archive file containing a compressed project to a target location.
      *
      * <p>This will overwrite all files, even when specified as student files. Similar to
-     * {@link fi.helsinki.cs.tmc.langs.util.TaskExecutor#extractProject(Path, Path, boolean)} but more implicit naming
+     * {@link fi.helsinki.cs.tmc.langs.util.TaskExecutor#extractProject(Path, Path, boolean)}
+     * but more implicit naming
      *
      * @param compressedProject A path to the compressed archive.
      * @param targetLocation Location where the archive should be extracted to

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

@@ -85,10 +85,11 @@ public void extractProject(
     }
 
     @Override
-    public void extractAndRewriteEveryhing(Path compressedProject, Path targetLocation) throws IOException {
-            Unzipper unzipper =
-                    new StudentFileAwareUnzipper(new NothingIsStudentFileStudentFilePolicy());
-            unzipper.unzip(compressedProject, targetLocation);
+    public void extractAndRewriteEveryhing(Path compressedProject, Path targetLocation)
+            throws IOException {
+        Unzipper unzipper =
+                new StudentFileAwareUnzipper(new NothingIsStudentFileStudentFilePolicy());
+        unzipper.unzip(compressedProject, targetLocation);
     }
 
     @Override