-
Notifications
You must be signed in to change notification settings - Fork 309
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[톰캣 구현하기 - 3, 4단계] 땡칠(박성철) 미션 제출합니다. #471
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
a4b2bd7
refactor(Http11Processor): HTTP Version 관리를 Response로 위임
0chil 1f6ab90
refactor(HttpRequest): Request Line을 객체로 분리
0chil fa959af
feat: GET, POST를 담당하는 핸들러
0chil 04ee075
feat(Connector): Thread Pool 적용
0chil 7dff12a
feat(SessionManager): 발생할 수 있는 동시성 문제를 해결한다
0chil 9d3d82c
refactor: Handler 인터페이스를 request, response 로 수정한다
0chil a550e22
refactor: 쿠키, 세션 조회에 Optional 사용
0chil 16cc50b
refactor(Headers): 메서드 변수명 수정
0chil ef2ac0d
refactor(HttpResponse): 바디 길이 0일때, Content-Length 헤더 제외
0chil 93015f9
refactor: HttpResponse가 응답을 생성한다
0chil 5fdd9e8
refactor: Handler를 Controller로 재명명
0chil 5092d78
refactor: 컨트롤러 매핑 RequestMapping으로 분리, TargetPath 객체 분리
0chil 1c46ac7
fix: 실패하는 테스트 보완
0chil 5372bd0
refactor: RequestMapping 상수화
0chil 4e85edc
refactor: 핸들러 목록의 자료형을 Set으로 변경
0chil d8f979d
typo(HttpResponse): 변수명 headers2 -> headers
0chil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
tomcat/src/main/java/nextstep/jwp/handler/HelloController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package nextstep.jwp.handler; | ||
|
||
import org.apache.coyote.http11.HttpRequest; | ||
import org.apache.coyote.http11.HttpResponse; | ||
import org.apache.coyote.http11.TargetPath; | ||
import org.apache.coyote.http11.controller.Controller; | ||
import org.apache.coyote.http11.header.ContentType; | ||
|
||
public class HelloController implements Controller { | ||
|
||
private static final TargetPath SUPPORTED_PATH = new TargetPath("/"); | ||
|
||
@Override | ||
public boolean supports(HttpRequest httpRequest) { | ||
return httpRequest.getTarget().getPath().equals(SUPPORTED_PATH) && httpRequest.getMethod().isGet(); | ||
} | ||
|
||
@Override | ||
public void handle(HttpRequest httpRequest, HttpResponse httpResponse) { | ||
httpResponse.setContentType(new ContentType("text/html")); | ||
httpResponse.setBody("Hello world!"); | ||
} | ||
} |
78 changes: 78 additions & 0 deletions
78
tomcat/src/main/java/nextstep/jwp/handler/LoginController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
package nextstep.jwp.handler; | ||
|
||
import nextstep.jwp.db.InMemoryUserRepository; | ||
import nextstep.jwp.model.User; | ||
import org.apache.coyote.http11.HttpRequest; | ||
import org.apache.coyote.http11.HttpResponse; | ||
import org.apache.coyote.http11.TargetPath; | ||
import org.apache.coyote.http11.body.FormData; | ||
import org.apache.coyote.http11.controller.FileController; | ||
import org.apache.coyote.http11.controller.GetAndPostController; | ||
import org.apache.coyote.http11.header.Cookies; | ||
import org.apache.coyote.http11.session.Session; | ||
import org.apache.coyote.http11.session.SessionManager; | ||
|
||
import java.util.Optional; | ||
|
||
public class LoginController extends GetAndPostController { | ||
|
||
private static final String SESSION_KEY = "JSESSIONID"; | ||
private static final String SESSION_USER_KEY = "user"; | ||
|
||
private static final String UNAUTHORIZED_LOCATION = "/401"; | ||
private static final String MAIN_LOCATION = "/index"; | ||
|
||
private static final TargetPath SUPPORTED_PATH = new TargetPath("/login").autoComplete(); | ||
|
||
private final FileController fileHandler = new FileController(); | ||
|
||
@Override | ||
public boolean supports(HttpRequest httpRequest) { | ||
if (httpRequest.getMethod().isGet() || httpRequest.getMethod().isPost()) { | ||
return httpRequest.getTarget().getPath().autoComplete().equals(SUPPORTED_PATH); | ||
} | ||
return false; | ||
} | ||
|
||
@Override | ||
protected void doGet(final HttpRequest httpRequest, final HttpResponse httpResponse) { | ||
boolean isSignedIn = httpRequest.getSession(SESSION_KEY) | ||
.map(session -> session.hasAttribute(SESSION_USER_KEY)) | ||
.isPresent(); | ||
if (isSignedIn) { | ||
httpResponse.redirectTo(MAIN_LOCATION); | ||
} | ||
fileHandler.handle(httpRequest, httpResponse); | ||
} | ||
|
||
@Override | ||
protected void doPost(final HttpRequest httpRequest, final HttpResponse httpResponse) { | ||
FormData formData = FormData.of(httpRequest.getBody()); | ||
String account = formData.get("account"); | ||
String password = formData.get("password"); | ||
|
||
Optional<User> found = InMemoryUserRepository.findByAccount(account); | ||
if (found.isPresent()) { | ||
User user = found.get(); | ||
signIn(httpResponse, user, password); | ||
return; | ||
} | ||
httpResponse.redirectTo(UNAUTHORIZED_LOCATION); | ||
} | ||
|
||
private void signIn(final HttpResponse httpResponse, final User user, final String password) { | ||
if (user.checkPassword(password)) { | ||
Session session = new Session(); | ||
session.addAttribute(SESSION_USER_KEY, user); | ||
SessionManager.add(session); | ||
|
||
Cookies cookies = new Cookies(); | ||
cookies.add(SESSION_KEY, session.getId()); | ||
|
||
httpResponse.redirectTo(MAIN_LOCATION); | ||
httpResponse.setCookies(cookies); | ||
return; | ||
} | ||
httpResponse.redirectTo(UNAUTHORIZED_LOCATION); | ||
} | ||
} |
69 changes: 0 additions & 69 deletions
69
tomcat/src/main/java/nextstep/jwp/handler/LoginHandler.java
This file was deleted.
Oops, something went wrong.
43 changes: 43 additions & 0 deletions
43
tomcat/src/main/java/nextstep/jwp/handler/RegisterController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package nextstep.jwp.handler; | ||
|
||
import nextstep.jwp.db.InMemoryUserRepository; | ||
import nextstep.jwp.model.User; | ||
import org.apache.coyote.http11.HttpRequest; | ||
import org.apache.coyote.http11.HttpResponse; | ||
import org.apache.coyote.http11.TargetPath; | ||
import org.apache.coyote.http11.body.FormData; | ||
import org.apache.coyote.http11.controller.FileController; | ||
import org.apache.coyote.http11.controller.GetAndPostController; | ||
|
||
public class RegisterController extends GetAndPostController { | ||
|
||
private static final String MAIN_LOCATION = "/index"; | ||
private static final TargetPath SUPPORTED_PATH = new TargetPath("/register").autoComplete(); | ||
|
||
private final FileController fileHandler = new FileController(); | ||
|
||
@Override | ||
public boolean supports(HttpRequest httpRequest) { | ||
if (httpRequest.getMethod().isGet() || httpRequest.getMethod().isPost()) { | ||
return httpRequest.getTarget().getPath().autoComplete().equals(SUPPORTED_PATH); | ||
} | ||
return false; | ||
} | ||
|
||
@Override | ||
protected void doGet(final HttpRequest httpRequest, final HttpResponse httpResponse) { | ||
fileHandler.handle(httpRequest, httpResponse); | ||
} | ||
|
||
@Override | ||
protected void doPost(final HttpRequest httpRequest, final HttpResponse httpResponse) { | ||
FormData formData = FormData.of(httpRequest.getBody()); | ||
|
||
String account = formData.get("account"); | ||
String password = formData.get("password"); | ||
String email = formData.get("email"); | ||
|
||
InMemoryUserRepository.save(new User(account, password, email)); | ||
httpResponse.redirectTo(MAIN_LOCATION); | ||
} | ||
} |
29 changes: 0 additions & 29 deletions
29
tomcat/src/main/java/nextstep/jwp/handler/RegisterHandler.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
정확한지는 잘 모르겠는데 제가 이해한대로 우선 적어보았습니다.
히이로는
최대 ThradPool의 크기는 250, 모든 Thread가 사용 중인(Busy) 상태이면 100명까지 대기 상태로 만들려면 어떻게 할까?
라는 요구사항을 어떻게 반영해야한다고 생각하시나요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 저도 정확하게 땡칠과 같은 방식으로 이해하고 있습니다. 모든 쓰레드가 사용중일 떄 100개의 connection 요청들을 queueing하기 위해서 acceptCount로 ServerSocket을 생성할 때 OS에 저장되는 connection들에 대한 queue size를 100으로 설정해줍니다.
ThreadPool 생성 시 corePoolSize와 maximumPoolSize는 250으로 동일하게 설정했으니 시작부터 250개의 쓰레드가 생성되어 동작하면서 요청들을 처리하게 될 것 같습니다.
혹시 어떤 부분이 궁금하셨던건지 더 자세하게 따로 말씀해주시면 같이 고민해봐도 좋을 것 같습니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
답변해주신 내용이 바로 궁금한 부분이었습니다.
Accept Count가 OS가 queueing 할 크기(백로그 크기)를 결정하는 부분이라고 이해했어요!