refactor: RequestHeader에서 ContentLength 바로 가져오도록 수정

sanhee · Sep 8, 2021 · c519e02 · c519e02
1 parent 2c1ce14
commit c519e02
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 120 deletions.
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
@@ -43,8 +43,7 @@ public void run() {
 
             RequestHeader requestHeader = RequestHeader.from(requestMessages.toString());
 
-            int contentLength = Integer.parseInt(requestHeader.getAttributes().getOrDefault("Content-Length", "0"));
-            String requestBody = IOUtils.readData(br, contentLength);
+            String requestBody = IOUtils.readData(br, requestHeader.getContentLength());
 
             requestMessages.add(System.lineSeparator() + requestBody);
 

diff --git a/src/main/java/webserver/http/header/Header.java b/src/main/java/webserver/http/header/Header.java
@@ -47,4 +47,8 @@ public byte[] getBytes() {
     }
 
     protected abstract String getStatusLine();
+
+    public int getContentLength() {
+        return Integer.parseInt(attributes.getOrDefault("Content-Length", "0"));
+    }
 }
diff --git a/src/test/java/webserver/RequestHandlerTest.java b/src/test/java/webserver/RequestHandlerTest.java
@@ -4,14 +4,16 @@
 import model.User;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.BindException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -25,7 +27,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static webserver.FileForTest.*;
+import static webserver.FileForTest.FORM_HTML;
+import static webserver.FileForTest.INDEX_HTML;
 
 class RequestHandlerTest {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -394,7 +397,7 @@ static Stream<Arguments> loginHandler() {
                                 .setName("test")
                                 .setEmail("test@test")
                                 .build(),
-                        new HashMap() {{
+                        new HashMap<String, String>() {{
                             put("userId", "test");
                             put("password", "test");
                             put("name", "test");
@@ -411,7 +414,7 @@ static Stream<Arguments> loginHandler() {
                                 .setName("test")
                                 .setEmail("test@test")
                                 .build(),
-                        new HashMap() {{
+                        new HashMap<String, String>() {{
                             put("userId", "wrongId");
                             put("password", "test");
                             put("name", "test");
@@ -428,7 +431,7 @@ static Stream<Arguments> loginHandler() {
                                 .setName("test")
                                 .setEmail("test@test")
                                 .build(),
-                        new HashMap() {{
+                        new HashMap<String, String>() {{
                             put("userId", "test");
                             put("password", "wrongPassword");
                             put("name", "test");