refactor: 개행 정리 및 불필요한 메서드 제거

woowacourse · Sep 4, 2023 · 3069ea7 · 3069ea7
1 parent 2b05c7c
commit 3069ea7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/tomcat/src/main/java/nextstep/handler/Handler.java b/tomcat/src/main/java/nextstep/handler/Handler.java
@@ -13,13 +13,10 @@
 import org.apache.coyote.http11.HttpResponse;
 import org.apache.coyote.http11.HttpStatus;
 import org.apache.coyote.http11.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class Handler {
 
     public static final String INDEX_HTML = "/index.html";
-    private static final Logger log = LoggerFactory.getLogger(Handler.class);
     private static final String TEXT_HTML = "text/html;charset=utf-8";
 
     private Handler() {

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java b/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java
@@ -13,6 +13,7 @@
 public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
+
     private final Socket connection;
 
     public Http11Processor(final Socket connection) {

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/HttpHeaders.java b/tomcat/src/main/java/org/apache/coyote/http11/HttpHeaders.java
@@ -14,9 +14,6 @@ public class HttpHeaders {
 
     private final Map<String, String> headers = new HashMap<>();
 
-    public HttpHeaders() {
-    }
-
     public boolean containsHeader(String headerName) {
         return this.headers.containsKey(headerName);
     }

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/Session.java b/tomcat/src/main/java/org/apache/coyote/http11/Session.java
@@ -16,15 +16,7 @@ public String getId() {
         return id;
     }
 
-    public Object getAttribute(final String name) {
-        return this.values.get(name);
-    }
-
     public void setAttribute(final String name, final Object value) {
         this.values.put(name, value);
     }
-
-    public void removeAttribute(final String name) {
-        this.values.remove(name);
-    }
 }
diff --git a/tomcat/src/main/java/org/apache/coyote/http11/util/HttpRequestReader.java b/tomcat/src/main/java/org/apache/coyote/http11/util/HttpRequestReader.java
@@ -108,9 +108,9 @@ private static Map<String, String> parseParameters(String queryString) {
 
     private static String getFilePath(String uri) {
         String filePath = uri.split("\\?")[0];
-        if (!filePath.matches(".+\\.[a-zA-Z]+$")) {
-            return filePath + ".html";
+        if (filePath.matches(".+\\.[a-zA-Z]+$") || filePath.equals("/")) {
+            return filePath;
         }
-        return filePath;
+        return filePath + ".html";
     }
 }
diff --git a/tomcat/src/main/java/org/apache/coyote/http11/util/HttpResponseWriter.java b/tomcat/src/main/java/org/apache/coyote/http11/util/HttpResponseWriter.java
@@ -40,22 +40,17 @@ public static void write(OutputStream outputStream, HttpResponse httpResponse)
     }
 
     private static String createOkResponse(HttpResponse httpResponse, String contentType) {
-        return String.join("\r\n",
-                createStatusLine(httpResponse),
+        return String.join("\r\n", createStatusLine(httpResponse) + " ",
                 String.join(HEADER_DELIMITER, HttpHeaders.CONTENT_TYPE, contentType) + " ",
                 String.join(HEADER_DELIMITER, HttpHeaders.CONTENT_LENGTH,
-                        String.valueOf(httpResponse.getBody().getBytes().length)) + " ",
-                "",
+                        String.valueOf(httpResponse.getBody().getBytes().length)) + " ", "",
                 httpResponse.getBody());
     }
 
     private static String createFoundResponse(HttpResponse httpResponse) {
-        return String.join("\r\n",
-                createStatusLine(httpResponse) + " ",
-                setCookie(httpResponse) + " ",
-                String.join(HEADER_DELIMITER, HttpHeaders.LOCATION, httpResponse.getHeader("Location")) + " ",
-                "",
-                httpResponse.getBody());
+        return String.join("\r\n", createStatusLine(httpResponse) + " ",
+                setCookie(httpResponse) + " ", String.join(HEADER_DELIMITER, HttpHeaders.LOCATION,
+                        httpResponse.getHeader("Location")) + " ", "", httpResponse.getBody());
     }
 
     private static String createStatusLine(HttpResponse httpResponse) {