Start refactoring to use Path instead of String dir

onlyskin · onlyskin · commit 458e47e07c20 · 2017-12-05T16:37:40.000+02:00
diff --git a/src/main/java/httpserver/App.java b/src/main/java/httpserver/App.java
@@ -1,18 +1,22 @@
 package httpserver;
 
+import httpserver.fileutils.Files;
+
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.file.Path;
 
 public class App {
     public static void main(String[] args) {
         int port = Integer.parseInt(args[1]);
         String fileDirectory = args[3];
+        Path root = Files.getPath(fileDirectory);
         try {
             ServerSocket serverSocket = new ServerSocket(port);
             while (true) {
                 Socket clientSocket = serverSocket.accept();
-                SocketHandler socketHandler = new SocketHandler(fileDirectory);
+                SocketHandler socketHandler = new SocketHandler(root);
                 socketHandler.process(clientSocket.getInputStream(), clientSocket.getOutputStream());
             }
         } catch (IOException e) {
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -3,15 +3,16 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Path;
 
 public class SocketHandler {
     private final RequestParser requestParser;
     private final Responder responder;
     private final ResponseWriter responseWriter;
 
-    public SocketHandler(String fileDirectory) {
+    public SocketHandler(Path root) {
         this.requestParser = new RequestParser();
-        this.responder = new Responder(fileDirectory);
+        this.responder = new Responder(root);
         this.responseWriter = new ResponseWriter();
     }
 
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -3,29 +3,27 @@
 import org.junit.Test;
 
 import java.io.*;
+import java.nio.file.Path;
 
+import static httpserver.fileutils.FileHelpers.tempDir;
+import static httpserver.fileutils.FileHelpers.tempFileOptions;
+import static java.nio.file.Files.write;
 import static org.junit.Assert.*;
 
 public class SocketHandlerTest {
-    private final String tempdir;
-
-    public SocketHandlerTest() {
-        this.tempdir = System.getProperty("java.io.tmpdir");
-    }
 
     @Test
     public void writesRequestedFileContentsToOutputStreamForGET() throws Exception {
-        File tempFile = File.createTempFile("temp-", "-testfile");
-        tempFile.deleteOnExit();
-        String fullPath = tempFile.toString();
-        String relativePath = fullPath.substring(tempdir.length());
-        FileOutputStream fileOutputStream = new FileOutputStream(fullPath);
-        fileOutputStream.write("Test file contents for GET request.".getBytes());
-
-        byte[] request = ("GET " + relativePath + " HTTP/1.1\r\nHost: 127.0.0.1:5000\r\n\r\n").getBytes();
+        Path root = tempDir();
+        Path file = tempFileOptions(root, "aaa");
+        write(file, "Test file contents for GET request.".getBytes());
+
+        Path relativePath = root.relativize(file);
+        byte[] request = ("GET " + relativePath.toString() + " HTTP/1.1\r\nHost: 127.0.0.1:5000\r\n\r\n").getBytes();
+
         InputStream inputStream = new ByteArrayInputStream(request);
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        SocketHandler socketHandler = new SocketHandler(tempdir);
+        SocketHandler socketHandler = new SocketHandler(root);
 
         socketHandler.process(inputStream, outputStream);
 
