Update server

onlyskin · onlyskin · commit a134ac07b615 · 2017-12-13T18:46:32.000+02:00
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -4,7 +4,9 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.file.Path;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 public class Server {
     private final Path logPath;
@@ -17,9 +19,17 @@ public Server(ServerSocket serverSocket, Path root, Path logPath) {
         this.logPath = logPath;
     }
 
-    public void acceptConnection(Executor executor, SocketHandlerFactory socketHandlerFactory) throws IOException {
-        Socket clientSocket = serverSocket.accept();
-        SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(root, logPath, clientSocket);
-        executor.execute(socketHandler);
+    public void acceptConnection(ExecutorService executorService, SocketHandlerFactory socketHandlerFactory){
+        try (Socket clientSocket = serverSocket.accept()) {
+            SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(root, logPath, clientSocket);
+            Future<?> future = executorService.submit(socketHandler);
+            future.get();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }
     }
 }
diff --git a/src/test/java/httpserver/ServerTest.java b/src/test/java/httpserver/ServerTest.java
@@ -7,7 +7,8 @@
 import java.net.Socket;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 import static org.mockito.Mockito.*;
 
@@ -19,8 +20,9 @@ public class ServerTest {
     private final ServerSocket serverSocketMock;
     private final Socket socket;
     private Server server;
-    private final Executor executorMock;
+    private final ExecutorService executorServiceMock;
     private final SocketHandler socketHandlerMock;
+    private final Future futureMock;
 
     public ServerTest() throws IOException {
         socket = new Socket();
@@ -35,27 +37,36 @@ public ServerTest() throws IOException {
         socketHandlerFactoryMock = mock(SocketHandlerFactory.class);
         when(socketHandlerFactoryMock.newSocketHandler(any(), any(), any())).thenReturn(socketHandlerMock);
 
-        executorMock = mock(Executor.class);
+        executorServiceMock = mock(ExecutorService.class);
+        futureMock = mock(Future.class);
+        when(executorServiceMock.submit(socketHandlerMock)).thenReturn(futureMock);
     }
 
     @Test
     public void callsAcceptOnServerSocket() throws Exception {
-        server.acceptConnection(executorMock, socketHandlerFactoryMock);
+        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
 
         verify(serverSocketMock).accept();
     }
 
     @Test
     public void callsNewSocketHandlerWithCorrectArgs() throws Exception {
-        server.acceptConnection(executorMock, socketHandlerFactoryMock);
+        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
 
         verify(socketHandlerFactoryMock).newSocketHandler(root, logPath, socket);
     }
 
     @Test
-    public void callsExecutorExecuteWithSocketHandler() throws Exception {
-        server.acceptConnection(executorMock, socketHandlerFactoryMock);
+    public void callsExecutorSubmitWithSocketHandler() throws Exception {
+        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
 
-        verify(executorMock).execute(socketHandlerMock);
+        verify(executorServiceMock).submit(socketHandlerMock);
+    }
+
+    @Test
+    public void callsGetOnFuture() throws Exception {
+        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
+
+        verify(futureMock).get();
     }
 }
