Update Server so it no longer uses futures as this was actually blocking thread execution

onlyskin · onlyskin · commit cb77340d395c · 2017-12-19T13:38:35.000+02:00
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -3,9 +3,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 
 public class Server {
     private final ServerSocket serverSocket;
@@ -20,10 +18,8 @@ public void acceptConnection(ExecutorService executorService, SocketHandlerFacto
         try {
             Socket clientSocket = serverSocket.accept();
             SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(appConfig, clientSocket);
-            Future<?> future = executorService.submit(socketHandler);
-            future.get();
-            clientSocket.close();
-        } catch (IOException | InterruptedException | ExecutionException e) {
+            executorService.submit(socketHandler);
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
diff --git a/src/test/java/httpserver/ServerTest.java b/src/test/java/httpserver/ServerTest.java
@@ -6,7 +6,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 
 import static org.mockito.Mockito.*;
 
@@ -19,7 +18,6 @@ public class ServerTest {
     private Server server;
     private final ExecutorService executorServiceMock;
     private final SocketHandler socketHandlerMock;
-    private final Future futureMock;
 
     public ServerTest() throws IOException {
         socket = new Socket();
@@ -34,8 +32,6 @@ public ServerTest() throws IOException {
         when(socketHandlerFactoryMock.newSocketHandler(any(), any())).thenReturn(socketHandlerMock);
 
         executorServiceMock = mock(ExecutorService.class);
-        futureMock = mock(Future.class);
-        when(executorServiceMock.submit(socketHandlerMock)).thenReturn(futureMock);
     }
 
     @Test
@@ -58,11 +54,4 @@ public void callsExecutorSubmitWithSocketHandler() throws Exception {
 
         verify(executorServiceMock).submit(socketHandlerMock);
     }
-
-    @Test
-    public void callsGetOnFuture() throws Exception {
-        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
-
-        verify(futureMock).get();
-    }
 }
