Move hard to test socket stuff in to App class, rename IoProcessor to SocketHandler

onlyskin · onlyskin · commit cd38f7dbd743 · 2017-12-04T23:16:32.000+02:00
diff --git a/src/main/java/httpserver/App.java b/src/main/java/httpserver/App.java
@@ -1,14 +1,20 @@
 package httpserver;
 
 import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
 
 public class App {
     public static void main(String[] args) {
         int port = Integer.parseInt(args[1]);
         String fileDirectory = args[3];
-        SocketServer socketServer = new SocketServer(port, fileDirectory);
         try {
-            socketServer.run();
+            ServerSocket serverSocket = new ServerSocket(port);
+            while (true) {
+                Socket clientSocket = serverSocket.accept();
+                SocketHandler socketHandler = new SocketHandler(fileDirectory);
+                socketHandler.process(clientSocket.getInputStream(), clientSocket.getOutputStream());
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -4,12 +4,12 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-public class IoProcessor {
+public class SocketHandler {
     private final RequestParser requestParser;
     private final Responder responder;
     private final ResponseWriter responseWriter;
 
-    public IoProcessor(String fileDirectory) {
+    public SocketHandler(String fileDirectory) {
         this.requestParser = new RequestParser();
         this.responder = new Responder(fileDirectory);
         this.responseWriter = new ResponseWriter();
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -6,10 +6,10 @@
 
 import static org.junit.Assert.*;
 
-public class IoProcessorTest {
+public class SocketHandlerTest {
     private final String tempdir;
 
-    public IoProcessorTest() {
+    public SocketHandlerTest() {
         this.tempdir = System.getProperty("java.io.tmpdir");
     }
 
@@ -25,9 +25,9 @@ public void writesRequestedFileContentsToOutputStreamForGET() throws Exception {
         byte[] request = ("GET " + relativePath + " HTTP/1.1\r\nHost: 127.0.0.1:5000\r\n\r\n").getBytes();
         InputStream inputStream = new ByteArrayInputStream(request);
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        IoProcessor ioProcessor = new IoProcessor(tempdir);
+        SocketHandler socketHandler = new SocketHandler(tempdir);
 
-        ioProcessor.process(inputStream, outputStream);
+        socketHandler.process(inputStream, outputStream);
 
         String expected = "HTTP/1.1 200 OK\r\nContent-Length: 35\r\n\r\nTest file contents for GET request.";
         assertEquals(expected, outputStream.toString());
