Skip to content

Commit 4912d8f

Browse files
committed
refactor: 오탈자, post 흐름 수정
1 parent 3ea3a61 commit 4912d8f

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

app/src/main/java/nextstep/jwp/controller/AbstractController.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package nextstep.jwp.controller;
22

33
import java.io.IOException;
4-
import nextstep.jwp.http.HttpMethod;
54
import nextstep.jwp.http.HttpRequest;
65
import nextstep.jwp.http.HttpResponse;
76

87
public abstract class AbstractController implements Controller {
98

109
@Override
1110
public void service(final HttpRequest httpRequest, final HttpResponse httpResponse) throws IOException {
12-
if (httpRequest.getHttpMethod().equals(HttpMethod.GET)) {
13-
doGet(httpRequest, httpResponse);
14-
} else if (httpRequest.getHttpMethod().equals(HttpMethod.POST)) {
11+
if (httpRequest.isPost()) {
1512
doPost(httpRequest, httpResponse);
13+
} else {
14+
doGet(httpRequest, httpResponse);
1615
}
1716
}
1817

app/src/main/java/nextstep/jwp/http/HttpHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public String getAllHeaders() {
5050
return headerSet.toString();
5151
}
5252

53-
public boolean contains(final String key){
53+
public boolean contains(final String key) {
5454
return headers.containsKey(key);
5555
}
5656
}

app/src/main/java/nextstep/jwp/http/HttpRequest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,15 @@ public String getBodyDataByKey(final String key) {
6868
return bodyParams.get(key);
6969
}
7070

71-
public boolean contains(final String key){
71+
public boolean contains(final String key) {
7272
return headers.contains(key);
7373
}
7474

7575
public HttpCookie getCookie() {
7676
return new HttpCookie(headers.getHeaderDataByKey("Cookie"));
7777
}
78+
79+
public boolean isPost() {
80+
return requestLine.isPost();
81+
}
7882
}

app/src/main/java/nextstep/jwp/http/RequestLine.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ public String getHttpVersion() {
6969
return httpVersion;
7070
}
7171

72-
public boolean isQueryParamsEmpty() {
73-
return queryParams.isEmpty();
74-
}
75-
7672
public boolean isPost() {
7773
return httpMethod.equals(HttpMethod.POST);
7874
}

app/src/main/java/nextstep/jwp/service/LoginService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private void userLogin(final HttpRequest httpRequest, final HttpResponse httpRes
3535
}
3636
}
3737

38-
private void sessionCheck(final HttpRequest httpRequest, final HttpResponse httpResponse, final String jsessionId) throws IOException {
38+
private void sessionCheck(final HttpRequest httpRequest, final HttpResponse httpResponse, final String jsessionId) {
3939
if (cookieCheck(httpRequest)) {
4040
jsessionIdCheck(httpRequest, httpResponse, jsessionId);
4141
return;
@@ -45,13 +45,13 @@ private void sessionCheck(final HttpRequest httpRequest, final HttpResponse http
4545

4646
private void jsessionIdCheck(final HttpRequest httpRequest, final HttpResponse httpResponse, final String jsessionId) {
4747
HttpCookie httpCookie = httpRequest.getCookie();
48-
if (!httpCookie.containsKey("JSESSIONID")) {
48+
if (!httpCookie.containsKey(JSESSIONID)) {
4949
setJsessionid(httpResponse, jsessionId);
5050
}
5151
}
5252

5353
private void setJsessionid(final HttpResponse httpResponse, final String jsessionId) {
54-
httpResponse.addHeader("Set-Cookie", String.format("JSESSIONID=%s", jsessionId));
54+
httpResponse.addHeader("Set-Cookie", String.format("%s=%s", JSESSIONID, jsessionId));
5555
}
5656

5757
private void sessionMappingClient(final HttpRequest httpRequest, final String jsessionId) {

0 commit comments

Comments
 (0)