Refactor into smaller methods

onlyskin · onlyskin · commit 4a268258f592 · 2017-12-06T16:53:09.000+02:00
diff --git a/src/main/java/httpserver/App.java b/src/main/java/httpserver/App.java
@@ -12,6 +12,7 @@ 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) {
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -18,12 +18,14 @@ public SocketHandler(Path root) {
 
     public void process(InputStream inputStream, OutputStream outputStream) throws IOException {
         Response response;
+
         try {
             Request request = new RequestParser().parse(inputStream);
             response = new GeneralResponder().respond(root, request);
         } catch (Exception e) {
             response = new NotFoundResponse();
         }
+
         new ResponseWriter().write(response, outputStream);
     }
 }
diff --git a/src/main/java/httpserver/responder/GetResponder.java b/src/main/java/httpserver/responder/GetResponder.java
@@ -17,18 +17,32 @@ public Response respond(Path root, Request request) {
 
         if (Files.pathExists(path)) {
             if (Files.isFile(path)) {
-                byte[] payload = Files.fileContents(path);
-                return new OkResponse(payload);
+                return responseForFile(path);
             } else {
-                Path[] paths = Files.directoryContents(path);
-                String result = "";
-                for (Path subPath: paths) {
-                    result = result + linkString(root, subPath);
-                }
-                return new OkResponse(result.getBytes());
+                return responseForDir(root, path);
             }
         } else {
             return new NotFoundResponse();
         }
     }
+
+    private Response responseForDir(Path root, Path path) {
+        Path[] paths = Files.directoryContents(path);
+        String result = htmlLinksForContents(root, paths);
+        return new OkResponse(result.getBytes());
+    }
+
+    private String htmlLinksForContents(Path root, Path[] paths) {
+        String result = "";
+        for (Path subPath: paths) {
+            result = result + linkString(root, subPath);
+        }
+        return result;
+    }
+
+    private Response responseForFile(Path path) {
+        byte[] payload = Files.fileContents(path);
+        return new OkResponse(payload);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,14 @@ public SocketHandler(Path root) {`
`18`	`18`
`19`	`19`	`public void process(InputStream inputStream, OutputStream outputStream) throws IOException {`
`20`	`20`	`Response response;`
	`21`	`+`
`21`	`22`	`try {`
`22`	`23`	`Request request = new RequestParser().parse(inputStream);`
`23`	`24`	`response = new GeneralResponder().respond(root, request);`
`24`	`25`	`} catch (Exception e) {`
`25`	`26`	`response = new NotFoundResponse();`
`26`	`27`	`}`
	`28`	`+`
`27`	`29`	`new ResponseWriter().write(response, outputStream);`
`28`	`30`	`}`
`29`	`31`	`}`