[톰캣 구현하기 - 1, 2단계] 테오(최우성) 미션 제출합니다.

study/src/test/java/study/FileTest.java

@@ -1,5 +1,9 @@
 package study;
 
+import java.io.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Objects;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -27,10 +31,10 @@ class FileTest {
     void resource_디렉터리에_있는_파일의_경로를_찾는다() {
         final String fileName = "nextstep.txt";
 
-        // todo
-        final String actual = "";
+        ClassLoader classLoader = getClass().getClassLoader();
+        URL actual = classLoader.getResource(fileName);
 
-        assertThat(actual).endsWith(fileName);
+        assertThat(actual.getFile()).endsWith(fileName);
     }
 
     /**
@@ -40,15 +44,21 @@ class FileTest {
      * File, Files 클래스를 사용하여 파일의 내용을 읽어보자.
      */
     @Test
-    void 파일의_내용을_읽는다() {
+    void 파일의_내용을_읽는다() throws IOException {
         final String fileName = "nextstep.txt";
 
-        // todo
-        final Path path = null;
+        ClassLoader classLoader = getClass().getClassLoader();
+        URL url = classLoader.getResource(fileName);
+        File file = new File(url.getPath());
 
-        // todo
-        final List<String> actual = Collections.emptyList();
+        BufferedReader reader = new BufferedReader(new FileReader(file));
 
+        final List<String> actual = new ArrayList<>();
+
+        String line;
+        while (Objects.nonNull(line = reader.readLine())) {
+            actual.add(line);
+        }
         assertThat(actual).containsOnly("nextstep");
     }
 }

study/src/test/java/study/IOStreamTest.java

@@ -48,11 +48,11 @@ class OutputStream_학습_테스트 {
         void OutputStream은_데이터를_바이트로_처리한다() throws IOException {
             final byte[] bytes = {110, 101, 120, 116, 115, 116, 101, 112};
             final OutputStream outputStream = new ByteArrayOutputStream(bytes.length);
-
             /**
              * todo
              * OutputStream 객체의 write 메서드를 사용해서 테스트를 통과시킨다
              */
+            outputStream.write(bytes);
 
             final String actual = outputStream.toString();
 
@@ -73,6 +73,7 @@ class OutputStream_학습_테스트 {
         void BufferedOutputStream을_사용하면_버퍼링이_가능하다() throws IOException {
             final OutputStream outputStream = mock(BufferedOutputStream.class);
 
+            outputStream.flush();
             /**
              * todo
              * flush를 사용해서 테스트를 통과시킨다.

tomcat/src/main/java/nextstep/jwp/db/InMemorySessionRepository.java

@@ -0,0 +1,19 @@
+package nextstep.jwp.db;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemorySessionRepository {
+
+    private InMemorySessionRepository() {
+    }
+
+    private static final Map<Long, UUID> sessions = new ConcurrentHashMap<>();
+
+    public static UUID save(Long userId) {
+        UUID uuid = UUID.randomUUID();
+        sessions.put(userId, uuid);
+        return uuid;
+    }
+}

tomcat/src/main/java/nextstep/jwp/db/InMemoryUserRepository.java

@@ -1,27 +1,38 @@
 package nextstep.jwp.db;
 
-import nextstep.jwp.model.User;
-
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import nextstep.jwp.model.User;
 
 public class InMemoryUserRepository {
 
-    private static final Map<String, User> database = new ConcurrentHashMap<>();
+    private static final Map<Long, User> database = new ConcurrentHashMap<>();
+
+    private static AtomicLong counter = new AtomicLong();
 
     static {
-        final User user = new User(1L, "gugu", "password", "hkkang@woowahan.com");
-        database.put(user.getAccount(), user);
+        final User user = new User("gugu", "password", "hkkang@woowahan.com");
+        database.put(counter.getAndIncrement(), user);
+    }
+
+    private InMemoryUserRepository() {
     }
 
     public static void save(User user) {
-        database.put(user.getAccount(), user);
+        database.put(counter.getAndIncrement(), user);
     }
 
-    public static Optional<User> findByAccount(String account) {
-        return Optional.ofNullable(database.get(account));
+    public static Long getIdByCredentials(String account, String password) {
+        return database.entrySet().stream()
+                .filter(entry -> entry.getValue().hasSameCredential(account, password))
+                .findFirst()
+                .orElseThrow()
+                .getKey();
     }
 
-    private InMemoryUserRepository() {}
+    public static boolean hasSameCredential(String account, String password) {
+        return database.values().stream()
+                .anyMatch(user -> user.hasSameCredential(account, password));
+    }
 }

tomcat/src/main/java/nextstep/jwp/model/User.java

@@ -1,38 +1,39 @@
 package nextstep.jwp.model;
 
+import java.util.Objects;
+
 public class User {
 
-    private final Long id;
     private final String account;
     private final String password;
     private final String email;
 
-    public User(Long id, String account, String password, String email) {
-        this.id = id;
+    public User(String account, String password, String email) {
         this.account = account;
         this.password = password;
         this.email = email;
     }
 
-    public User(String account, String password, String email) {
-        this(null, account, password, email);
-    }
-
-    public boolean checkPassword(String password) {
-        return this.password.equals(password);
+    public boolean hasSameCredential(String account, String password) {
+        return this.account.equals(account) && this.password.equals(password);
     }
 
     public String getAccount() {
         return account;
     }
 
     @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", account='" + account + '\'' +
-                ", email='" + email + '\'' +
-                ", password='" + password + '\'' +
-                '}';
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return Objects.equals(account, user.account) &&
+                Objects.equals(password, user.password) &&
+                Objects.equals(email, user.email);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(account, password, email);
     }
 }

tomcat/src/main/java/org/apache/catalina/Manager.java

@@ -1,7 +1,6 @@
 package org.apache.catalina;
 
 import jakarta.servlet.http.HttpSession;
-
 import java.io.IOException;
 
 /**
@@ -36,14 +35,12 @@ public interface Manager {
      * specified session id (if any); otherwise return <code>null</code>.
      *
      * @param id The session id for the session to be returned
-     *
-     * @exception IllegalStateException if a new session cannot be
-     *  instantiated for any reason
-     * @exception IOException if an input/output error occurs while
-     *  processing this request
-     *
      * @return the request session or {@code null} if a session with the
-     *         requested ID could not be found
+     * requested ID could not be found
+     * @throws IllegalStateException if a new session cannot be
+     *                               instantiated for any reason
+     * @throws IOException           if an input/output error occurs while
+     *                               processing this request
      */
     HttpSession findSession(String id) throws IOException;
 

tomcat/src/main/java/org/apache/catalina/connector/Connector.java

@@ -1,13 +1,12 @@
 package org.apache.catalina.connector;
 
-import org.apache.coyote.http11.Http11Processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import org.apache.coyote.http11.Http11Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Connector implements Runnable {
 

tomcat/src/main/java/org/apache/catalina/startup/Tomcat.java

@@ -1,11 +1,10 @@
 package org.apache.catalina.startup;
 
+import java.io.IOException;
 import org.apache.catalina.connector.Connector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-
 public class Tomcat {
 
     private static final Logger log = LoggerFactory.getLogger(Tomcat.class);

tomcat/src/main/java/org/apache/coyote/http11/ContentTypeParser.java

@@ -0,0 +1,28 @@
+package org.apache.coyote.http11;
+
+import java.util.Arrays;
+
+public enum ContentTypeParser {
+
+    HTML("text/html;charset=utf-8"),
+    CSS("text/css"),
+    JS("text/javascript"),
+    ICO("image/x-icon");
+
+    private final String contentType;
+
+    ContentTypeParser(String contentType) {
+        this.contentType = contentType;
+    }
+
+    public static String parse(String path) {
+        int commaLocation = path.lastIndexOf(".");
+        String resourceExtension = path.substring(commaLocation + 1);
+
+        return Arrays.stream(values())
+                .filter(value -> value.name().toLowerCase().equals(resourceExtension))
+                .findFirst()
+                .orElse(HTML)
+                .contentType;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java

@@ -1,19 +1,22 @@
 package org.apache.coyote.http11;
 
+import java.io.IOException;
+import java.net.Socket;
 import nextstep.jwp.exception.UncheckedServletException;
 import org.apache.coyote.Processor;
+import org.apache.coyote.http11.handler.Handlers;
+import org.apache.coyote.http11.message.request.Request;
+import org.apache.coyote.http11.message.response.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.Socket;
-
 public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
 
     private final Socket connection;
 
+
     public Http11Processor(final Socket connection) {
         this.connection = connection;
     }
@@ -29,17 +32,13 @@ public void process(final Socket connection) {
         try (final var inputStream = connection.getInputStream();
              final var outputStream = connection.getOutputStream()) {
 
-            final var responseBody = "Hello world!";
-
-            final var response = String.join("\r\n",
-                    "HTTP/1.1 200 OK ",
-                    "Content-Type: text/html;charset=utf-8 ",
-                    "Content-Length: " + responseBody.getBytes().length + " ",
-                    "",
-                    responseBody);
+            Request request = RequestExtractor.extract(inputStream);
+            LoggingFilter.logUserInfoIfExists(request);
+            Response response = Handlers.handle(request);
 
             outputStream.write(response.getBytes());
             outputStream.flush();
+
         } catch (IOException | UncheckedServletException e) {
             log.error(e.getMessage(), e);
         }

tomcat/src/main/java/org/apache/coyote/http11/LoggingFilter.java

@@ -0,0 +1,25 @@
+package org.apache.coyote.http11;
+
+import org.apache.coyote.http11.message.Cookie;
+import org.apache.coyote.http11.message.Headers;
+import org.apache.coyote.http11.message.request.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggingFilter {
+
+    private static final Logger log = LoggerFactory.getLogger(LoggingFilter.class);
+
+    private LoggingFilter() {
+    }
+
+    public static void logUserInfoIfExists(Request request) {
+        Headers requestHeaders = request.getHeaders();
+        Cookie cookie = requestHeaders.getCookie();
+
+        if (cookie.hasKey("JSESSIONID")) {
+            String sessionId = cookie.getValue("JSESSIONID");
+            log.info("session {} is logged in.", sessionId);
+        }
+    }
+}