refactor: sonarLint 반영

woowacourse · Sep 3, 2023 · 22f500e · 22f500e
1 parent 14c3a37
commit 22f500e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/study/src/test/java/study/IOStreamTest.java b/study/src/test/java/study/IOStreamTest.java
@@ -113,7 +113,7 @@ class OutputStream_학습_테스트 {
             }
 
             //then
-            assertThat(charCount).isEqualTo(0);
+            assertThat(charCount).isZero();
             fileInputStream1.close();
             bufferedOutputStream.close();
         }

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java b/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java
@@ -67,7 +67,7 @@ private String readRequestLine(BufferedReader inputReader) {
         try {
             return inputReader.readLine();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            return null;
         }
     }
 
@@ -82,7 +82,7 @@ private String readHeaders(BufferedReader inputReader) {
             }
             return stringBuilder.toString();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            return null;
         }
     }
 
@@ -97,7 +97,7 @@ private String readBody(BufferedReader inputReader, RequestHeaders requestHeader
             inputReader.read(buffer, 0, contentLength);
             return new String(buffer);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            return null;
         }
     }
 
@@ -128,7 +128,7 @@ private String staticResourceResponse(String resourcePath) {
 
     private String controllerResponse(Request request) {
         Controller handler = handlerMapper.getHandler(request);
-        Response response = handler.handle(request);
+        Response<Object> response = handler.handle(request);
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(requestLine(response));
         Optional<String> body = bodyOf(response);
@@ -140,16 +140,16 @@ private String controllerResponse(Request request) {
         return stringBuilder.append(str).toString();
     }
 
-    private String responseNoBody(Response response) {
-        Map headers = response.getHeaders();
+    private String responseNoBody(Response<Object> response) {
+        Map<String, String> headers = response.getHeaders();
         StringJoiner stringJoiner = new StringJoiner("\r\n");
         stringJoiner.add(headerResponse(headers));
         stringJoiner.add("");
         return stringJoiner.toString();
     }
 
-    private String responseWithBody(Response response, String body) {
-        Map headers = response.getHeaders();
+    private String responseWithBody(Response<Object> response, String body) {
+        Map<String, String> headers = response.getHeaders();
         StringJoiner stringJoiner = new StringJoiner("\r\n");
         stringJoiner.add(headerResponse(headers));
         stringJoiner.add(resourceProvider.contentTypeOf(response.getViewPath()));
@@ -159,8 +159,8 @@ private String responseWithBody(Response response, String body) {
         return stringJoiner.toString();
     }
 
-    private String headerResponse(Map headers) {
-        return (String) headers.keySet()
+    private String headerResponse(Map<String, String> headers) {
+        return headers.keySet()
             .stream()
             .map(headerName -> makeHeader(headerName, headers.get(headerName)))
             .collect(Collectors.joining("\r\n"));
@@ -172,14 +172,14 @@ private String makeHeader(Object headerName, Object value) {
         return headerKey + ": " + headerValue;
     }
 
-    private Optional<String> bodyOf(Response response) {
+    private Optional<String> bodyOf(Response<Object> response) {
         if (response.isViewResponse()) {
             return Optional.of(resourceProvider.resourceBodyOf(response.getViewPath()));
         }
         return Optional.empty();
     }
 
-    private String requestLine(Response response) {
+    private String requestLine(Response<Object> response) {
         HttpResponse httpResponse = HttpResponse.of(response.getStatusCode());
         return "HTTP/1.1 " + httpResponse.getStatusCode() + " " + httpResponse.name() + " ";
     }

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/controller/HandlerMapper.java b/tomcat/src/main/java/org/apache/coyote/http11/controller/HandlerMapper.java
@@ -12,22 +12,22 @@ public class HandlerMapper {
 
     public HandlerMapper() {
         contollerByMapper.put(
-            (request) -> "/login".equals(request.getRequestLine().getPath()) &&
+            request -> "/login".equals(request.getRequestLine().getPath()) &&
                 Method.POST.equals(request.getRequestLine().getMethod()),
             new LoginController(new LoginService()));
 
         contollerByMapper.put(
-            (request) -> "/register".equals(request.getRequestLine().getPath()) &&
+            request -> "/register".equals(request.getRequestLine().getPath()) &&
                 Method.POST.equals(request.getRequestLine().getMethod()),
             new SignUpController(new LoginService()));
 
         contollerByMapper.put(
-            (request) -> "/login".equals(request.getRequestLine().getPath()) &&
+            request -> "/login".equals(request.getRequestLine().getPath()) &&
                 Method.GET.equals(request.getRequestLine().getMethod()),
             new LoginViewController());
 
         contollerByMapper.put(
-            (request) -> "/register".equals(request.getRequestLine().getPath()) &&
+            request -> "/register".equals(request.getRequestLine().getPath()) &&
                 Method.GET.equals(request.getRequestLine().getMethod()),
             new SignUpViewController());
     }

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/service/LoginService.java b/tomcat/src/main/java/org/apache/coyote/http11/service/LoginService.java
@@ -17,7 +17,7 @@ public class LoginService {
     private static void enrollSession(User user, String sessionId) {
         Session session = new Session(sessionId);
         session.setAttribute("user", user);
-        SessionManager.getInstance().add(session);
+        SessionManager.enroll(session);
     }
 
     public Optional<String> login(String account, String password) {

diff --git a/tomcat/src/main/java/org/apache/coyote/http11/session/SessionManager.java b/tomcat/src/main/java/org/apache/coyote/http11/session/SessionManager.java
@@ -9,16 +9,7 @@
 import org.apache.coyote.http11.request.Request;
 
 public class SessionManager implements Manager {
-
     private static final Map<String, HttpSession> SESSIONS = new HashMap<>();
-    private static final SessionManager instance = new SessionManager();
-
-    private SessionManager() {
-    }
-
-    public static SessionManager getInstance() {
-        return instance;
-    }
 
     public static boolean loggedIn(Request request) {
         Optional<Cookies> cookie = request.getRequestHeaders().getCookie();
@@ -32,23 +23,24 @@ private static boolean checkSession(Cookies cookies) {
         Optional<String> sessionCookie = cookies.getSessionCookie();
         if (sessionCookie.isPresent()) {
             String sessionId = sessionCookie.get();
-            HttpSession session = SessionManager.getInstance().findSession(sessionId);
+            HttpSession session = SESSIONS.get(sessionId);
             return session != null;
         }
         return false;
     }
 
+    public static void enroll(Session session) {
+        SESSIONS.put(session.getId(), session);
+    }
+
     @Override
     public void add(HttpSession session) {
         SESSIONS.put(session.getId(), session);
     }
 
     @Override
     public HttpSession findSession(String id) {
-        if (SESSIONS.containsKey(id)) {
-            return SESSIONS.get(id);
-        }
-        return null;
+        return SESSIONS.get(id);
     }
 
     @Override