Refactor app out into spiked factories in preparation for TDD

onlyskin · onlyskin · commit 4454dd4a8a62 · 2017-12-08T13:57:23.000+02:00
diff --git a/src/main/java/httpserver/App.java b/src/main/java/httpserver/App.java
@@ -1,34 +1,26 @@
 package httpserver;
 
-import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 
 import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class App {
+
+    private static ExecutorService threadPool;
+    private static ServerFactory serverFactory;
+    private static SocketHandlerFactory socketHandlerFactory;
+
     public static void main(String[] args) throws IOException {
+        threadPool = Executors.newFixedThreadPool(16);
+        serverFactory = new ServerFactory(new PathExaminer(), new ServerSocketFactory());
+        socketHandlerFactory = new SocketHandlerFactory();
+
         int port = Integer.parseInt(args[1]);
         String fileDirectory = args[3];
 
-        Path root = new PathExaminer().getPath(fileDirectory);
-        ServerSocket serverSocket = new ServerSocket(port);
-        Path logPath = Paths.get(root.toString(), "logs");
-
-        ExecutorService pool = Executors.newFixedThreadPool(16);
-
-        while (true) {
-            Socket clientSocket = serverSocket.accept();
-            SocketHandler socketHandler = new SocketHandler(root,
-                    new FileLogger(logPath, new FileOperator()),
-                    clientSocket.getInputStream(),
-                    clientSocket.getOutputStream());
-            pool.execute(socketHandler);
-        }
+        Server server = serverFactory.makeServer(port, fileDirectory);
+        server.start(threadPool, socketHandlerFactory);
     }
 }
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -0,0 +1,27 @@
+package httpserver;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.file.Path;
+import java.util.concurrent.ExecutorService;
+
+public class Server {
+    private final Path logPath;
+    private final Path root;
+    private final ServerSocket serverSocket;
+
+    public Server(ServerSocket serverSocket, Path root, Path logPath) {
+        this.serverSocket = serverSocket;
+        this.root = root;
+        this.logPath = logPath;
+    }
+
+    public void start(ExecutorService threadPool, SocketHandlerFactory socketHandlerFactory) throws IOException {
+        while (true) {
+            Socket clientSocket = serverSocket.accept();
+            SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(root, logPath, clientSocket);
+            threadPool.execute(socketHandler);
+        }
+    }
+}
diff --git a/src/main/java/httpserver/ServerFactory.java b/src/main/java/httpserver/ServerFactory.java
@@ -0,0 +1,25 @@
+package httpserver;
+
+import httpserver.file.PathExaminer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class ServerFactory {
+    private ServerSocketFactory serverSocketFactory;
+    private PathExaminer pathExaminer;
+
+    public ServerFactory(PathExaminer pathExaminer, ServerSocketFactory serverSocketFactory) {
+        this.serverSocketFactory = serverSocketFactory;
+        this.pathExaminer = pathExaminer;
+    }
+    public Server makeServer(int port, String fileDirectory) throws IOException {
+        Path root = pathExaminer.getPath(fileDirectory);
+        Path logPath = Paths.get(root.toString(), "logs");
+        ServerSocket serverSocket = serverSocketFactory.newServerSocket(port);
+
+        return new Server(serverSocket, root, logPath);
+    }
+}
diff --git a/src/main/java/httpserver/ServerSocketFactory.java b/src/main/java/httpserver/ServerSocketFactory.java
@@ -0,0 +1,10 @@
+package httpserver;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+public class ServerSocketFactory {
+    public ServerSocket newServerSocket(int port) throws IOException {
+        return new ServerSocket(port);
+    }
+}
diff --git a/src/main/java/httpserver/SocketHandlerFactory.java b/src/main/java/httpserver/SocketHandlerFactory.java
@@ -0,0 +1,16 @@
+package httpserver;
+
+import httpserver.file.FileOperator;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.file.Path;
+
+public class SocketHandlerFactory {
+    public SocketHandler newSocketHandler(Path root, Path logPath, Socket clientSocket) throws IOException {
+        return new SocketHandler(root,
+                new FileLogger(logPath, new FileOperator()),
+                clientSocket.getInputStream(),
+                clientSocket.getOutputStream());
+    }
+}
diff --git a/src/main/java/httpserver/file/FileOperator.java b/src/main/java/httpserver/file/FileOperator.java
@@ -21,11 +21,7 @@ public void appendToFile(Path path, byte[] contents) throws IOException {
         write(path, contents, StandardOpenOption.APPEND);
     }
 
-    public void replaceContents(Path path, byte[] contents) {
-        try {
-            write(path, contents);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    public void replaceContents(Path path, byte[] contents) throws IOException {
+        write(path, contents);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,7 @@ public void appendToFile(Path path, byte[] contents) throws IOException {`
`21`	`21`	`write(path, contents, StandardOpenOption.APPEND);`
`22`	`22`	`}`
`23`	`23`
`24`		`- public void replaceContents(Path path, byte[] contents) {`
`25`		`- try {`
`26`		`- write(path, contents);`
`27`		`- } catch (IOException e) {`
`28`		`- e.printStackTrace();`
`29`		`- }`
	`24`	`+ public void replaceContents(Path path, byte[] contents) throws IOException {`
	`25`	`+ write(path, contents);`
`30`	`26`	`}`
`31`	`27`	`}`