Refactor the exact handling of the String to Method enum

onlyskin · onlyskin · commit 4abd423e55a8 · 2018-01-10T16:29:46.000+02:00
diff --git a/src/main/java/httpserver/request/RequestParser.java b/src/main/java/httpserver/request/RequestParser.java
@@ -18,13 +18,15 @@ public RequestParser(AppConfig appConfig) {
         this.contentLength = 0;
     }
 
-    public Request parse(InputStream inputStream) throws IOException {
+    public Request parse(InputStream inputStream)
+            throws IOException, IllegalArgumentException {
         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
 
         RequestLine requestLine = getRequestLine(bufferedReader);
 
+        Method method;
         try {
-            Method.valueOf(requestLine.getMethod());
+            method = requestLine.getMethod();
         } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException();
         }
@@ -33,7 +35,7 @@ public Request parse(InputStream inputStream) throws IOException {
 
         String body = getBody(bufferedReader);
 
-        return new Request(Method.valueOf(requestLine.getMethod()),
+        return new Request(method,
                 requestLine.getPath(),
                 headers,
                 requestLine.getQueryString(),
@@ -51,8 +53,8 @@ private class RequestLine {
         private final String path;
         private final String queryString;
 
-        private String getMethod() {
-            return method;
+        private Method getMethod() throws IllegalArgumentException {
+            return Method.valueOf(method);
         }
 
         private String getPath() {
diff --git a/src/test/java/httpserver/request/RequestParserTest.java b/src/test/java/httpserver/request/RequestParserTest.java
@@ -79,4 +79,11 @@ public void callsLogOnLogger() throws Exception {
         verify(loggerMock).log("GET /text-file?key1=value1%3C%2C%3F&key2=value2 HTTP/1.1");
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void throwsIllegalArgumentExceptionWhenBadMethod() throws Exception {
+        String input = "ABCXYZ /text-file HTTP/1.1\r\n" +
+                "Host: 0.0.0.0:5000\r\n\r\n";
+        InputStream inputStream = new ByteArrayInputStream(input.getBytes());
+        requestParser.parse(inputStream);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,4 +79,11 @@ public void callsLogOnLogger() throws Exception {`
`79`	`79`	`verify(loggerMock).log("GET /text-file?key1=value1%3C%2C%3F&key2=value2 HTTP/1.1");`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ @Test(expected = IllegalArgumentException.class)`
	`83`	`+ public void throwsIllegalArgumentExceptionWhenBadMethod() throws Exception {`
	`84`	`+ String input = "ABCXYZ /text-file HTTP/1.1\r\n" +`
	`85`	`+ "Host: 0.0.0.0:5000\r\n\r\n";`
	`86`	`+ InputStream inputStream = new ByteArrayInputStream(input.getBytes());`
	`87`	`+ requestParser.parse(inputStream);`
	`88`	`+ }`
`82`	`89`	`}`