Removes Action interface since it ended up being the same thing as the Application interface - previous implementations of the Action interface now use Application instead.

mh120888 · mh120888 · commit eae266383dad · 2016-09-02T10:58:33.000-07:00
diff --git a/src/main/java/com/github/mh120888/cobspecapp/Action.java b/src/main/java/com/github/mh120888/cobspecapp/Action.java
diff --git a/src/main/java/com/github/mh120888/cobspecapp/CobSpecApp.java b/src/main/java/com/github/mh120888/cobspecapp/CobSpecApp.java
@@ -14,7 +14,7 @@ public CobSpecApp(String filepath) {
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         response.setHTTPVersion(request.getVersion());
         Router.initRouter(publicDirectory, new RealFileIO());
-        Action action = Router.route(request);
+        Application action = Router.route(request);
         return action.getResponse(request, response);
     }
 }
diff --git a/src/main/java/com/github/mh120888/cobspecapp/CoffeeAction.java b/src/main/java/com/github/mh120888/cobspecapp/CoffeeAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class CoffeeAction implements Action {
+public class CoffeeAction implements Application {
     public CoffeeAction() {}
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
diff --git a/src/main/java/com/github/mh120888/cobspecapp/FormAction.java b/src/main/java/com/github/mh120888/cobspecapp/FormAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class FormAction implements Action {
+public class FormAction implements Application {
     static String data = "default";
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
diff --git a/src/main/java/com/github/mh120888/cobspecapp/GetStaticResourceAction.java b/src/main/java/com/github/mh120888/cobspecapp/GetStaticResourceAction.java
@@ -1,13 +1,14 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
 import java.util.Arrays;
 
-public class GetStaticResourceAction implements Action {
+public class GetStaticResourceAction implements Application {
     private static String publicDirectory;
     private HTTPRequest request;
     private FileIO fileIO;
diff --git a/src/main/java/com/github/mh120888/cobspecapp/HeadStaticResourceAction.java b/src/main/java/com/github/mh120888/cobspecapp/HeadStaticResourceAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class HeadStaticResourceAction implements Action {
+public class HeadStaticResourceAction implements Application {
     FileIO fileIO;
     String publicDirectory;
 
diff --git a/src/main/java/com/github/mh120888/cobspecapp/LogsAction.java b/src/main/java/com/github/mh120888/cobspecapp/LogsAction.java
@@ -1,11 +1,12 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class LogsAction implements Action {
+public class LogsAction implements Application {
     private String correctCredentials = "admin:hunter2";
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
diff --git a/src/main/java/com/github/mh120888/cobspecapp/MethodNotAllowedAction.java b/src/main/java/com/github/mh120888/cobspecapp/MethodNotAllowedAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class MethodNotAllowedAction implements Action {
+public class MethodNotAllowedAction implements Application {
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         response.setStatus(HTTPStatus.METHOD_NOT_ALLOWED);
         return response;
diff --git a/src/main/java/com/github/mh120888/cobspecapp/NotFoundAction.java b/src/main/java/com/github/mh120888/cobspecapp/NotFoundAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class NotFoundAction implements Action {
+public class NotFoundAction implements Application {
     public NotFoundAction() {}
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
diff --git a/src/main/java/com/github/mh120888/cobspecapp/OptionsAction.java b/src/main/java/com/github/mh120888/cobspecapp/OptionsAction.java
@@ -1,13 +1,14 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
 import java.util.List;
 
-public class OptionsAction implements Action {
+public class OptionsAction implements Application {
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         response.setStatus(HTTPStatus.OK);
         response.addHeader(HTTPHeaders.ALLOW, buildHeaders(request.getPath()));
diff --git a/src/main/java/com/github/mh120888/cobspecapp/ParametersAction.java b/src/main/java/com/github/mh120888/cobspecapp/ParametersAction.java
@@ -1,18 +1,17 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
 import java.util.Map;
 
-public class ParametersAction implements Action {
+public class ParametersAction implements Application {
     private HTTPRequest request;
-    private HTTPResponse response;
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         this.request = request;
-        this.response = response;
 
         response.setStatus(getStatus());
         response.setBody(getBody());
diff --git a/src/main/java/com/github/mh120888/cobspecapp/PatchStaticResourceAction.java b/src/main/java/com/github/mh120888/cobspecapp/PatchStaticResourceAction.java
@@ -1,11 +1,12 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class PatchStaticResourceAction implements Action {
+public class PatchStaticResourceAction implements Application {
     FileIO fileIO;
     String publicDirectory;
     HTTPRequest request;
diff --git a/src/main/java/com/github/mh120888/cobspecapp/RedirectAction.java b/src/main/java/com/github/mh120888/cobspecapp/RedirectAction.java
@@ -1,11 +1,12 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class RedirectAction implements Action {
+public class RedirectAction implements Application {
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         response.setStatus(HTTPStatus.FOUND);
         response.addHeader(HTTPHeaders.LOCATION, request.getBaseLocation());
diff --git a/src/main/java/com/github/mh120888/cobspecapp/Router.java b/src/main/java/com/github/mh120888/cobspecapp/Router.java
@@ -1,5 +1,6 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 
 import java.util.ArrayList;
@@ -10,7 +11,7 @@
 public class Router {
     private static String publicDirectory;
     private static FileIO fileIO;
-    private static LinkedHashMap<MethodRoute, Action> ROUTES = new LinkedHashMap<>();
+    private static LinkedHashMap<MethodRoute, Application> ROUTES = new LinkedHashMap<>();
     private static HashMap<String, List<String>> ALLOWED_METHODS_BY_ROUTE = new HashMap<>();
     private static NotFoundAction notFoundAction = new NotFoundAction();
     private static MethodNotAllowedAction methodNotAllowedAction = new MethodNotAllowedAction();
@@ -21,7 +22,7 @@ public static void initRouter(String directory, FileIO io) {
         configureAllRoutes();
     }
 
-    public static Action route(HTTPRequest request) {
+    public static Application route(HTTPRequest request) {
         Logger.addLog(request.getInitialRequestLine());
 
         return getAction(request.getMethod(), request.getPath());
@@ -31,7 +32,7 @@ public static List<String> getAllowedMethodsFor(String path) {
         return ALLOWED_METHODS_BY_ROUTE.getOrDefault(path, new ArrayList<>());
     }
 
-    private static Action getAction(String method, String path) {
+    private static Application getAction(String method, String path) {
         path = path.equals("/") ? "/index" : path;
         return ROUTES.getOrDefault(new MethodRoute(method, path), notFoundAction);
     }
@@ -68,7 +69,7 @@ private static void configureCustomRoutes() {
         addRoute("GET", "/redirect", new RedirectAction());
     }
 
-    private static void addRoute(String method, String path, Action action) {
+    private static void addRoute(String method, String path, Application action) {
         ROUTES.put(new MethodRoute(method, path), action);
         List<String> list = ALLOWED_METHODS_BY_ROUTE.getOrDefault(path, new ArrayList<String>() {});
         list.add(method);
@@ -80,9 +81,9 @@ private static void disallowUndeclaredMethodsFor(String path) {
     }
 
     private static void configureRoutesBasedOnPublicDirectory() {
-        Action getStaticResourceAction = new GetStaticResourceAction(publicDirectory);
-        Action headStaticResourceAction = new HeadStaticResourceAction(publicDirectory);
-        Action patchStaticResourceAction = new PatchStaticResourceAction(publicDirectory, fileIO);
+        Application getStaticResourceAction = new GetStaticResourceAction(publicDirectory);
+        Application headStaticResourceAction = new HeadStaticResourceAction(publicDirectory);
+        Application patchStaticResourceAction = new PatchStaticResourceAction(publicDirectory, fileIO);
 
         String[] fileNames = fileIO.getFilenames(publicDirectory);
         for (String fileName : fileNames) {
diff --git a/src/main/java/com/github/mh120888/cobspecapp/TeaAction.java b/src/main/java/com/github/mh120888/cobspecapp/TeaAction.java
@@ -1,10 +1,11 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.httpmessage.HTTPStatus;
 
-public class TeaAction implements Action {
+public class TeaAction implements Application {
 
     public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {
         response.setStatus(HTTPStatus.OK);
diff --git a/src/test/java/com/github/mh120888/cobspecapp/ResponseGenerator.java b/src/test/java/com/github/mh120888/cobspecapp/ResponseGenerator.java
@@ -1,12 +1,13 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.basichttpmessage.BasicHTTPMessageFactory;
 import com.github.mh120888.httpmessage.HTTPHeaders;
 import com.github.mh120888.httpmessage.HTTPResponse;
 import com.github.mh120888.mocks.MockHTTPRequest;
 
 public class ResponseGenerator {
-    static HTTPResponse generateResponse(String method, String pathWithParams, Action action) {
+    static HTTPResponse generateResponse(String method, String pathWithParams, Application action) {
         MockHTTPRequest request = new MockHTTPRequest();
         HTTPResponse response = new BasicHTTPMessageFactory().getNewResponse();
         request.setMethod(method);
diff --git a/src/test/java/com/github/mh120888/cobspecapp/RouterTest.java b/src/test/java/com/github/mh120888/cobspecapp/RouterTest.java
@@ -1,5 +1,6 @@
 package com.github.mh120888.cobspecapp;
 
+import com.github.mh120888.app.Application;
 import com.github.mh120888.basichttpmessage.BasicHTTPRequest;
 import com.github.mh120888.httpmessage.HTTPRequest;
 import com.github.mh120888.mocks.MockFileIO;
@@ -27,7 +28,7 @@ public void setUp() throws Exception {
     public void routeReturnsGetStaticResourceActionForGETAStaticResource() {
         request.setRequestLine("GET /fakefile HTTP/1.1");
 
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof GetStaticResourceAction);
     }
@@ -36,7 +37,7 @@ public void routeReturnsGetStaticResourceActionForGETAStaticResource() {
     public void routeReturnsHeadStaticResourceActionForHEADRequestForAStaticResource() {
         request.setRequestLine("HEAD /fakefile HTTP/1.1");
 
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof HeadStaticResourceAction);
     }
@@ -45,55 +46,55 @@ public void routeReturnsHeadStaticResourceActionForHEADRequestForAStaticResource
     public void routeReturnsPatchStaticResourceActionForAPatchRequestForStaticResource() {
         request.setRequestLine("PATCH /fakefile HTTP/1.1");
 
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof PatchStaticResourceAction);
     }
 
     @Test
     public void routeReturnsCoffeeActionWhenAppropriate() {
         request.setRequestLine("GET /coffee HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof CoffeeAction);
     }
 
     @Test
     public void routeReturnsMethodNotAllowedForPOSTCoffee() {
         request.setRequestLine("POST /coffee HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof MethodNotAllowedAction);
     }
 
     @Test
     public void routeReturnsTeaActionWhenAppropriate() {
         request.setRequestLine("GET /tea HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof TeaAction);
     }
 
     @Test
     public void routeReturnsNotFoundActionWhenPathIsNotRecognized() {
         request.setRequestLine("GET /foobarssss HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof NotFoundAction);
     }
 
     @Test
     public void routeReturnsPostableActionWhenAppropriate() {
         request.setRequestLine("POST /form HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof FormAction);
     }
 
     @Test
     public void routeReturnsLogsActionWhenAppropriatePathIsRequested() {
         request.setRequestLine("GET /logs HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof LogsAction);
     }
@@ -110,23 +111,23 @@ public void allRequestsAreLoggedAfterBeingRoutes() {
     @Test
     public void requestToParametersReturnsParametersAction() {
         request.setRequestLine("GET /parameters HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof ParametersAction);
     }
 
     @Test
     public void routeReturnsOptionsActionWhenAppropriate() {
         request.setRequestLine("GET /method_options HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof OptionsAction);
     }
 
     @Test
     public void routeReturnsRedirectResourceHandlerWhenAppropriate() {
         request.setRequestLine("GET /redirect HTTP/1.1");
-        Action action = Router.route(request);
+        Application action = Router.route(request);
 
         assertTrue(action instanceof RedirectAction);
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public CobSpecApp(String filepath) {`
`14`	`14`	`public HTTPResponse getResponse(HTTPRequest request, HTTPResponse response) {`
`15`	`15`	`response.setHTTPVersion(request.getVersion());`
`16`	`16`	`Router.initRouter(publicDirectory, new RealFileIO());`
`17`		`- Action action = Router.route(request);`
	`17`	`+ Application action = Router.route(request);`
`18`	`18`	`return action.getResponse(request, response);`
`19`	`19`	`}`
`20`	`20`	`}`