Add allowed to responder interface

onlyskin · onlyskin · commit 663218286b0b · 2017-12-14T17:17:44.000+02:00
diff --git a/src/main/java/httpserver/responder/CoffeeResponder.java b/src/main/java/httpserver/responder/CoffeeResponder.java
@@ -10,4 +10,9 @@ public class CoffeeResponder implements Responder {
     public Response respond(AppConfig appConfig, Request request) {
         return new FourEighteenResponse();
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/coffee");
+    }
 }
diff --git a/src/main/java/httpserver/responder/CookieResponder.java b/src/main/java/httpserver/responder/CookieResponder.java
@@ -13,4 +13,9 @@ public Response respond(AppConfig appConfig, Request request) {
         response.setHeader(new Header("Set-Cookie", "key=value"));
         return response;
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/cookie");
+    }
 }
diff --git a/src/main/java/httpserver/responder/EatCookieResponder.java b/src/main/java/httpserver/responder/EatCookieResponder.java
@@ -11,4 +11,9 @@ public Response respond(AppConfig appConfig, Request request) {
         Response response = new OkResponse("mmmm chocolate".getBytes());
         return response;
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/eat_cookie");
+    }
 }
diff --git a/src/main/java/httpserver/responder/FormGetResponder.java b/src/main/java/httpserver/responder/FormGetResponder.java
@@ -29,4 +29,9 @@ public Response respond(AppConfig appConfig, Request request) throws IOException
             return new OkResponse(fileOperator.readContents(fullPath));
         }
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/form");
+    }
 }
diff --git a/src/main/java/httpserver/responder/GeneralResponder.java b/src/main/java/httpserver/responder/GeneralResponder.java
@@ -25,4 +25,9 @@ public Response respond(AppConfig appConfig, Request request) {
             return new ServerErrorResponse();
         }
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return true;
+    }
 }
diff --git a/src/main/java/httpserver/responder/InvalidMethodResponder.java b/src/main/java/httpserver/responder/InvalidMethodResponder.java
@@ -10,4 +10,9 @@ public class InvalidMethodResponder implements Responder {
     public Response respond(AppConfig appConfig, Request request) {
         return new MethodNotAllowedResponse();
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return true;
+    }
 }
diff --git a/src/main/java/httpserver/responder/LogsResponder.java b/src/main/java/httpserver/responder/LogsResponder.java
@@ -17,4 +17,9 @@ public Response respond(AppConfig appConfig, Request request) {
             return new UnauthorizedResponse();
         }
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/logs");
+    }
 }
diff --git a/src/main/java/httpserver/responder/ParametersResponder.java b/src/main/java/httpserver/responder/ParametersResponder.java
@@ -12,6 +12,11 @@ public Response respond(AppConfig appConfig, Request request) {
         return new OkResponse(echoQueryString(request).getBytes());
     }
 
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/parameters");
+    }
+
     private String echoQueryString(Request request) {
         Parameter[] parameters = request.getParams();
         String payload = "";
@@ -20,4 +25,5 @@ private String echoQueryString(Request request) {
         }
         return payload;
     }
+
 }
diff --git a/src/main/java/httpserver/responder/Responder.java b/src/main/java/httpserver/responder/Responder.java
@@ -8,4 +8,6 @@
 
 public interface Responder {
     Response respond(AppConfig appConfig, Request request) throws IOException;
+
+    boolean allowed(String pathString);
 }
diff --git a/src/main/java/httpserver/responder/TeaResponder.java b/src/main/java/httpserver/responder/TeaResponder.java
@@ -10,4 +10,9 @@ public class TeaResponder implements Responder {
     public Response respond(AppConfig appConfig, Request request) {
         return new OkResponse("".getBytes());
     }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return pathString.equals("/tea");
+    }
 }
diff --git a/src/test/java/httpserver/responder/CoffeeResponderTest.java b/src/test/java/httpserver/responder/CoffeeResponderTest.java
@@ -9,12 +9,24 @@
 import static org.mockito.Mockito.*;
 
 public class CoffeeResponderTest {
+
+    private final CoffeeResponder coffeeResponder;
+
+    public CoffeeResponderTest() {
+        coffeeResponder = new CoffeeResponder();
+    }
+
     @Test
     public void returnsFourEighteen() throws Exception {
-        CoffeeResponder coffeeResponder = new CoffeeResponder();
-
         Response response = coffeeResponder.respond(mock(AppConfig.class),
                 mock(Request.class));
+
         assertEquals(418, response.getStatusCode());
     }
+
+    @Test
+    public void coffeeIsAllowed() throws Exception {
+        assertTrue(coffeeResponder.allowed("/coffee"));
+        assertFalse(coffeeResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/CookieResponderTest.java b/src/test/java/httpserver/responder/CookieResponderTest.java
@@ -12,15 +12,27 @@
 import static org.mockito.Mockito.*;
 
 public class CookieResponderTest {
+
+    private final CookieResponder cookieResponder;
+
+    public CookieResponderTest() {
+        cookieResponder = new CookieResponder();
+    }
+
     @Test
     public void hasCorrectPayloadAndSetsCookie() throws Exception {
-        CookieResponder cookieResponder = new CookieResponder();
-
         Response response = cookieResponder.respond(mock(AppConfig.class),
                 mock(Request.class));
+
         assertEquals(200, response.getStatusCode());
         assertEquals("Eat", new String(response.getPayload()));
         Header[] expected = new Header[]{new Header("Set-Cookie", "key=value")};
         assertTrue(Arrays.equals(expected, response.getHeaders()));
     }
+
+    @Test
+    public void cookieIsAllowed() throws Exception {
+        assertTrue(cookieResponder.allowed("/cookie"));
+        assertFalse(cookieResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/EatCookieResponderTest.java b/src/test/java/httpserver/responder/EatCookieResponderTest.java
@@ -9,13 +9,25 @@
 import static org.mockito.Mockito.*;
 
 public class EatCookieResponderTest {
+
+    private final EatCookieResponder eatCookieResponder;
+
+    public EatCookieResponderTest() {
+        eatCookieResponder = new EatCookieResponder();
+    }
+
     @Test
     public void hasCorrectPayloadAndSetsCookie() throws Exception {
-        EatCookieResponder eatCookieResponder = new EatCookieResponder();
 
         Response response = eatCookieResponder.respond(mock(AppConfig.class),
                 mock(Request.class));
         assertEquals(200, response.getStatusCode());
         assertEquals("mmmm chocolate", new String(response.getPayload()));
     }
+
+    @Test
+    public void eat_cookieIsAllowed() throws Exception {
+        assertTrue(eatCookieResponder.allowed("/eat_cookie"));
+        assertFalse(eatCookieResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/GeneralResponderTest.java b/src/test/java/httpserver/responder/GeneralResponderTest.java
@@ -15,21 +15,23 @@ public class GeneralResponderTest {
 
     private final AppConfig appConfigMock;
     private final Request requestMock;
+    private final ResponderSupplier responderSupplierMock;
+    private final Responder responderMock;
+    private final GeneralResponder generalResponder;
 
     public GeneralResponderTest() {
         appConfigMock = mock(AppConfig.class);
         requestMock = mock(Request.class);
         when(requestMock.getMethodString()).thenReturn("methodString");
+        responderSupplierMock = mock(ResponderSupplier.class);
+        responderMock = mock(Responder.class);
+        generalResponder = new GeneralResponder(responderSupplierMock);
     }
 
     @Test
     public void callsResponderForMethodStringOnResponderSupplier() throws Exception {
-        ResponderSupplier responderSupplierMock = mock(ResponderSupplier.class);
-        Responder responderMock = mock(Responder.class);
         when(responderSupplierMock.responderForMethodString(any())).thenReturn(responderMock);
 
-        GeneralResponder generalResponder = new GeneralResponder(responderSupplierMock);
-
         generalResponder.respond(appConfigMock, requestMock);
 
         verify(responderSupplierMock).responderForMethodString("methodString");
@@ -38,15 +40,17 @@ public void callsResponderForMethodStringOnResponderSupplier() throws Exception
 
     @Test
     public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throws Exception {
-        ResponderSupplier responderSupplierMock = mock(ResponderSupplier.class);
-        Responder responderMock = mock(Responder.class);
         when(responderMock.respond(any(), any())).thenThrow(new IOException());
         when(responderSupplierMock.responderForMethodString(any())).thenReturn(responderMock);
 
-        GeneralResponder generalResponder = new GeneralResponder(responderSupplierMock);
-
         Response response = generalResponder.respond(appConfigMock, requestMock);
 
         assertEquals(500, response.getStatusCode());
     }
+
+    @Test
+    public void anythingIsAllowed() throws Exception {
+        assertTrue(generalResponder.allowed("/anything"));
+        assertTrue(generalResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/InvalidMethodResponderTest.java b/src/test/java/httpserver/responder/InvalidMethodResponderTest.java
@@ -9,11 +9,24 @@
 import static org.mockito.Mockito.mock;
 
 public class InvalidMethodResponderTest {
+
+    private final InvalidMethodResponder invalidMethodResponder;
+
+    public InvalidMethodResponderTest() {
+        invalidMethodResponder = new InvalidMethodResponder();
+    }
+
     @Test
     public void returns405Response() throws Exception {
-        Response response = new InvalidMethodResponder().
+        Response response = invalidMethodResponder.
                 respond(mock(AppConfig.class), mock(Request.class));
 
         assertEquals(405, response.getStatusCode());
     }
+
+    @Test
+    public void anythingIsAllowed() throws Exception {
+        assertTrue(invalidMethodResponder.allowed("/logs"));
+        assertTrue(invalidMethodResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/LogsResponderTest.java b/src/test/java/httpserver/responder/LogsResponderTest.java
@@ -43,4 +43,10 @@ public void returnsUnauthorizedResponseWhenIncorrectAuthHeader() {
 
         assertEquals(401, response.getStatusCode());
     }
+
+    @Test
+    public void logsIsAllowed() throws Exception {
+        assertTrue(logsResponder.allowed("/logs"));
+        assertFalse(logsResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/ParametersResponderTest.java b/src/test/java/httpserver/responder/ParametersResponderTest.java
@@ -10,18 +10,31 @@
 import static org.mockito.Mockito.*;
 
 public class ParametersResponderTest {
+
+    private final ParametersResponder parametersResponder;
+
+    public ParametersResponderTest() {
+        parametersResponder = new ParametersResponder();
+    }
+
     @Test
     public void itEchoesRequestQueryStringInBody() {
         Request requestMock = mock(Request.class);
         Parameter[] params = {new Parameter("key1", "value1"),
                 new Parameter("key2", "value2")};
         when(requestMock.getParams()).thenReturn(params);
-        ParametersResponder parametersResponder = new ParametersResponder();
 
         Response response = parametersResponder.respond(mock(AppConfig.class),
                 requestMock);
+
         assertEquals(200, response.getStatusCode());
         assertTrue(new String(response.getPayload()).contains("key1 = value1"));
         assertTrue(new String(response.getPayload()).contains("key2 = value2"));
     }
+
+    @Test
+    public void parametersIsAllowed() throws Exception {
+        assertTrue(parametersResponder.allowed("/parameters"));
+        assertFalse(parametersResponder.allowed("/other"));
+    }
 }
diff --git a/src/test/java/httpserver/responder/TeaResponderTest.java b/src/test/java/httpserver/responder/TeaResponderTest.java
@@ -9,12 +9,24 @@
 import static org.mockito.Mockito.*;
 
 public class TeaResponderTest {
+
+    private final TeaResponder teaResponder;
+
+    public TeaResponderTest() {
+        teaResponder = new TeaResponder();
+    }
+
     @Test
     public void returns200() {
-        TeaResponder teaResponder = new TeaResponder();
-
         Response response = teaResponder.respond(mock(AppConfig.class),
                 mock(Request.class));
+
         assertEquals(200, response.getStatusCode());
     }
+
+    @Test
+    public void teaIsAllowed() throws Exception {
+        assertTrue(teaResponder.allowed("/tea"));
+        assertFalse(teaResponder.allowed("/other"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,9 @@ public class CoffeeResponder implements Responder {`
`10`	`10`	`public Response respond(AppConfig appConfig, Request request) {`
`11`	`11`	`return new FourEighteenResponse();`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ @Override`
	`15`	`+ public boolean allowed(String pathString) {`
	`16`	`+ return pathString.equals("/coffee");`
	`17`	`+ }`
`13`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,9 @@ public Response respond(AppConfig appConfig, Request request) {`
`13`	`13`	`response.setHeader(new Header("Set-Cookie", "key=value"));`
`14`	`14`	`return response;`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ @Override`
	`18`	`+ public boolean allowed(String pathString) {`
	`19`	`+ return pathString.equals("/cookie");`
	`20`	`+ }`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,9 @@ public Response respond(AppConfig appConfig, Request request) {`
`11`	`11`	`Response response = new OkResponse("mmmm chocolate".getBytes());`
`12`	`12`	`return response;`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+ @Override`
	`16`	`+ public boolean allowed(String pathString) {`
	`17`	`+ return pathString.equals("/eat_cookie");`
	`18`	`+ }`
`14`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,9 @@ public Response respond(AppConfig appConfig, Request request) throws IOException`
`29`	`29`	`return new OkResponse(fileOperator.readContents(fullPath));`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Override`
	`34`	`+ public boolean allowed(String pathString) {`
	`35`	`+ return pathString.equals("/form");`
	`36`	`+ }`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,9 @@ public Response respond(AppConfig appConfig, Request request) {`
`25`	`25`	`return new ServerErrorResponse();`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ @Override`
	`30`	`+ public boolean allowed(String pathString) {`
	`31`	`+ return true;`
	`32`	`+ }`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,9 @@ public class InvalidMethodResponder implements Responder {`
`10`	`10`	`public Response respond(AppConfig appConfig, Request request) {`
`11`	`11`	`return new MethodNotAllowedResponse();`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ @Override`
	`15`	`+ public boolean allowed(String pathString) {`
	`16`	`+ return true;`
	`17`	`+ }`
`13`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,9 @@ public Response respond(AppConfig appConfig, Request request) {`
`17`	`17`	`return new UnauthorizedResponse();`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ @Override`
	`22`	`+ public boolean allowed(String pathString) {`
	`23`	`+ return pathString.equals("/logs");`
	`24`	`+ }`
`20`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ public Response respond(AppConfig appConfig, Request request) {`
`12`	`12`	`return new OkResponse(echoQueryString(request).getBytes());`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ @Override`
	`16`	`+ public boolean allowed(String pathString) {`
	`17`	`+ return pathString.equals("/parameters");`
	`18`	`+ }`
	`19`	`+`
`15`	`20`	`private String echoQueryString(Request request) {`
`16`	`21`	`Parameter[] parameters = request.getParams();`
`17`	`22`	`String payload = "";`
`@@ -20,4 +25,5 @@ private String echoQueryString(Request request) {`
`20`	`25`	`}`
`21`	`26`	`return payload;`
`22`	`27`	`}`
	`28`	`+`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@`
`8`	`8`
`9`	`9`	`public interface Responder {`
`10`	`10`	`Response respond(AppConfig appConfig, Request request) throws IOException;`
	`11`	`+`
	`12`	`+ boolean allowed(String pathString);`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,9 @@ public class TeaResponder implements Responder {`
`10`	`10`	`public Response respond(AppConfig appConfig, Request request) {`
`11`	`11`	`return new OkResponse("".getBytes());`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ @Override`
	`15`	`+ public boolean allowed(String pathString) {`
	`16`	`+ return pathString.equals("/tea");`
	`17`	`+ }`
`13`	`18`	`}`