More Strings refactored to Paths

Author: nimirum

tmc-plugin/src/fi/helsinki/cs/tmc/model/PushEventListener.java

@@ -11,6 +11,7 @@
 import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.cometd.bayeux.Channel;
 import org.cometd.bayeux.Message;
 import org.cometd.bayeux.client.ClientSession;

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/SourceSnapshotEventSource.java

@@ -23,6 +23,8 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
@@ -102,27 +104,27 @@ public void fileRenamed(FileRenameEvent fre) {
     public void fileAttributeChanged(FileAttributeEvent fae) {}
 
     private void reactToChange(final ChangeType changeType, final FileObject fileObject) {
-        String filePath = TmcFileUtils.tryGetPathRelativeToProject(fileObject);
+        Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(fileObject));
         if (filePath == null) {
             return;
         }
         String metadata =
                 JsonMaker.create()
                         .add("cause", changeType.name().toLowerCase())
-                        .add("file", filePath)
+                        .add("file", filePath.toString())
                         .toString();
         invokeSnapshotThreadViaEdt(fileObject, metadata);
     }
 
     private void reactToRename(final ChangeType changeType, final FileRenameEvent renameEvent) {
-        String filePath = TmcFileUtils.tryGetPathRelativeToProject(renameEvent.getFile());
+        Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(renameEvent.getFile()));
         if (filePath == null) {
             return;
         }
         String metadata =
                 JsonMaker.create()
                         .add("cause", changeType.name().toLowerCase())
-                        .add("file", filePath)
+                        .add("file", filePath.toString())
                         .add("previous_name", renameEvent.getName() + "." + renameEvent.getExt())
                         .toString();
         invokeSnapshotThreadViaEdt(renameEvent.getFile(), metadata);

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/TextInsertEventSource.java

@@ -25,6 +25,8 @@
 import java.beans.PropertyChangeListener;
 import java.io.Closeable;
 import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -168,10 +170,10 @@ private void sendEvent(Exercise ex, String eventType, String text) {
 
                 private String generatePatchDescription(
                         FileObject fo, List<Patch> patches, boolean patchContainsFullDocument) {
-                    String filePath = TmcFileUtils.tryGetPathRelativeToProject(fo);
+                    Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(fo));
                     if (filePath != null) {
                         return JsonMaker.create()
-                                .add("file", filePath)
+                                .add("file", filePath.toString())
                                 .add("patches", PATCH_GENERATOR.patch_toText(patches))
                                 .add("full_document", patchContainsFullDocument)
                                 .toString();

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/TmcFileUtils.java

@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.utilities;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.Project;
 
@@ -13,20 +15,20 @@ public class TmcFileUtils {
      * Otherwise returns null.
      */
     public static String tryGetPathRelativeToProject(FileObject fileObject) {
-        String filePath = fileObject.getPath();
+        Path filePath = Paths.get(fileObject.getPath());
 
         try {
             Project p = FileOwnerQuery.getOwner(fileObject);
             String projectDirectory = p.getProjectDirectory().getPath();
-            if (filePath.contains(projectDirectory)) {
+            if (filePath.toString().contains(projectDirectory)) {
                 filePath =
-                        filePath.substring(
-                                filePath.indexOf(projectDirectory) + projectDirectory.length());
+                        Paths.get(filePath.toString().substring(
+                                filePath.toString().indexOf(projectDirectory) + projectDirectory.length()));
             }
         } catch (Exception e) {
             return null;
         }
 
-        return filePath;
+        return filePath.toString();
     }
 }

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/zip/NbProjectUnzipper.java

@@ -12,6 +12,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -148,11 +150,11 @@ public Result unzipProject(byte[] data, File projectDir, boolean reallyWriteFile
         ZipEntry zent;
         while ((zent = zis.getNextEntry()) != null) {
             if (zent.getName().startsWith(projectDirInZip)) {
-                String restOfPath = zent.getName().substring(projectDirInZip.length());
-                restOfPath = trimSlashes(restOfPath);
+                Path restOfPath = Paths.get(zent.getName().substring(projectDirInZip.length()));
+                restOfPath = trimSlashes(restOfPath.toString());
 
-                String destFileRelativePath = trimSlashes(restOfPath.replace("/", File.separator));
-                pathsInZip.add(destFileRelativePath);
+                Path destFileRelativePath = trimSlashes(restOfPath.toString().replace("/", File.separator));
+                pathsInZip.add(destFileRelativePath.toString());
                 File destFile =
                         new File(projectDir.toString() + File.separator + destFileRelativePath);
 
@@ -167,17 +169,17 @@ public Result unzipProject(byte[] data, File projectDir, boolean reallyWriteFile
                     if (destFile.exists()) {
                         if (fileContentEquals(destFile, entryData)) {
                             shouldWrite = false;
-                            result.unchangedFiles.add(destFileRelativePath);
-                        } else if (overwriting.mayOverwrite(destFileRelativePath)) {
+                            result.unchangedFiles.add(destFileRelativePath.toString());
+                        } else if (overwriting.mayOverwrite(destFileRelativePath.toString())) {
                             shouldWrite = true;
-                            result.overwrittenFiles.add(destFileRelativePath);
+                            result.overwrittenFiles.add(destFileRelativePath.toString());
                         } else {
                             shouldWrite = false;
-                            result.skippedFiles.add(destFileRelativePath);
+                            result.skippedFiles.add(destFileRelativePath.toString());
                         }
                     } else {
                         shouldWrite = true;
-                        result.newFiles.add(destFileRelativePath);
+                        result.newFiles.add(destFileRelativePath.toString());
                     }
                     if (shouldWrite && reallyWriteFiles) {
                         FileUtils.forceMkdir(destFile.getParentFile());
@@ -204,40 +206,40 @@ private void deleteFilesNotInZip(
             boolean reallyWriteFiles)
             throws IOException {
         for (File file : curDir.listFiles()) {
-            String relPath = file.getPath().substring(projectDir.getPath().length());
-            relPath = trimSlashes(relPath);
+            Path relPath = Paths.get(file.getPath().substring(projectDir.getPath().length()));
+            relPath = trimSlashes(relPath.toString());
 
             if (file.isDirectory()) {
                 deleteFilesNotInZip(
                         projectDir, file, result, pathsInZip, overwriting, reallyWriteFiles);
             }
 
-            if (!pathsInZip.contains(relPath)) {
-                if (overwriting.mayDelete(relPath)) {
+            if (!pathsInZip.contains(relPath.toString())) {
+                if (overwriting.mayDelete(relPath.toString())) {
                     if (file.isDirectory() && file.listFiles().length > 0) {
                         // Won't delete directories if they still have contents
-                        result.skippedDeletingFiles.add(relPath);
+                        result.skippedDeletingFiles.add(relPath.toString());
                     } else {
                         if (reallyWriteFiles) {
                             file.delete();
                         }
-                        result.deletedFiles.add(relPath);
+                        result.deletedFiles.add(relPath.toString());
                     }
                 } else {
-                    result.skippedDeletingFiles.add(relPath);
+                    result.skippedDeletingFiles.add(relPath.toString());
                 }
             }
         }
     }
 
-    private String trimSlashes(String s) {
+    private Path trimSlashes(String s) {
         while (s.startsWith("/") || s.startsWith(File.separator)) {
             s = s.substring(1);
         }
         while (s.endsWith("/") || s.startsWith(File.separator)) {
             s = s.substring(0, s.length() - 1);
         }
-        return s;
+        return Paths.get(s);
     }
 
     private String findProjectDirInZip(byte[] data) throws IOException {

tmc-plugin/test/qa-functional/src/fi/helsinki/cs/tmc/functionaltests/utils/FakeTmcServer.java

@@ -2,21 +2,25 @@
 
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.testing.AdHocHttpServer;
+
 import java.io.UnsupportedEncodingException;
-import org.apache.http.entity.StringEntity;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
@@ -29,31 +33,31 @@ public class FakeTmcServer extends AdHocHttpServer {
     private String expectedPassword;
     private String coursesJson = "{}";
     private Map<String, String> courseDetails = new HashMap<String, String>();
-    
+
     private HashMap<String, byte[]> zipFiles = new HashMap<String, byte[]>();
 
     public FakeTmcServer() {
         setHandler(new Handler());
     }
-    
+
     public synchronized FakeTmcServer expectUser(String username, String password) {
         this.expectedUsername = username;
         this.expectedPassword = password;
         return this;
     }
-    
+
     public synchronized void respondWithCourses(String coursesJson) {
         this.coursesJson = coursesJson;
     }
 
     public synchronized void respondWithCourseDetails(String id, String courseDetailsJson) {
         this.courseDetails.put(id, courseDetailsJson);
     }
-    
+
     public synchronized void putZipFile(String path, byte[] data) {
         zipFiles.put(path, data);
     }
-    
+
     public synchronized void clearResponses() {
         coursesJson = "{}";
         courseDetails.clear();
@@ -63,6 +67,7 @@ public synchronized void clearResponses() {
     private static final Pattern courseRegex = Pattern.compile("/courses/(.+)\\.json");
 
     private class Handler implements HttpRequestHandler {
+
         @Override
         public void handle(HttpRequest req, HttpResponse resp, HttpContext hc) throws HttpException, IOException {
             synchronized (FakeTmcServer.this) {
@@ -75,34 +80,34 @@ public void handle(HttpRequest req, HttpResponse resp, HttpContext hc) throws Ht
 
                 Map<String, String> params = parseQueryParameters(uri);
 
-                String path = uri.getPath();
-                debug("Path: " + path);
+                Path path = Paths.get(uri.getPath());
+                debug("Path: " + path.toString());
 
                 if (path.startsWith("/courses.json")) {
                     authenticate(params);
                     debug("Responding with course list: " + coursesJson);
                     respondWithJson(resp, coursesJson);
-                } else if (courseRegex.matcher(path).matches()) {
-                    Matcher m = courseRegex.matcher(path);
+                } else if (courseRegex.matcher(path.toString()).matches()) {
+                    Matcher m = courseRegex.matcher(path.toString());
                     m.matches();
                     String id = m.group(1);
 
-System.out.println(courseDetails);
-System.out.println(id);
+                    System.out.println(courseDetails);
+                    System.out.println(id);
                     String response = courseDetails.get(id);
                     if (response != null) {
                         authenticate(params);
                         debug("Responding with course details: " + response);
                         respondWithJson(resp, response);
                     } else {
-                        debug("Unknown course path: " + path);
+                        debug("Unknown course path: " + path.toString());
                         resp.setStatusCode(404);
                         resp.setEntity(new StringEntity("Not Found"));
                     }
-                } else if (zipFiles.containsKey(path)) {
-                    respondWithBinary(resp, zipFiles.get(path), "application/zip");
+                } else if (zipFiles.containsKey(path.toString())) {
+                    respondWithBinary(resp, zipFiles.get(path.toString()), "application/zip");
                 } else {
-                    debug("Unknown path: " + path);
+                    debug("Unknown path: " + path.toString());
                     resp.setStatusCode(404);
                     resp.setEntity(new StringEntity("Not Found"));
                 }
@@ -137,7 +142,7 @@ private void respondWithJson(HttpResponse resp, String json) {
         }
 
         private void respondWithBinary(HttpResponse resp, byte[] data, String mimeType) {
-            ByteArrayEntity entity =  new ByteArrayEntity(data);
+            ByteArrayEntity entity = new ByteArrayEntity(data);
             entity.setContentType(mimeType);
             resp.setEntity(entity);
         }