Merge pull request #11 from nathan29849/feature/#7/css

feat: [#7] css, js, ico 등 html이 아닌 파일에 대해 GET 요청 처리

Author: nathan29849

src/main/java/handler/RequestHandler.java

@@ -13,7 +13,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Collection;
 import java.util.Map;
 import model.User;
 import org.slf4j.Logger;
@@ -42,7 +41,8 @@ public void run() {
             String url = requestUri.getPath();
 
             if (requestLine.getHttpMethod().equals(HttpMethod.GET)) {
-                if (URLDataBase.contains(url)) {
+                if (URLDataBase.contains(url) || url.contains(".css") || url.contains(".js")
+                    || url.contains(".woff") || url.contains(".ico")) {
                     httpResponse = HttpResponse.ok(url);
                 }
                 if (url.equals("/user/list")) {

src/main/java/http/response/HttpResponse.java

@@ -7,7 +7,6 @@
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Collection;
 import java.util.List;
 import model.User;
 
@@ -48,8 +47,12 @@ public static HttpResponse ok() {
 	public static HttpResponse ok(String viewName) throws IOException {
 		byte[] messageBody = Files.readAllBytes(new File("./webapp" + viewName).toPath());
 		StatusLine statusLine = new StatusLine(new HttpVersion("HTTP/1.1"), HttpResponseStatus.OK);
+		String[] urlTokens = viewName.split("\\.");
+		String extension = urlTokens[urlTokens.length - 1];
+
 		ResponseHeaders responseHeaders = new ResponseHeaders();
-		responseHeaders.setContentType("text/html;charset=utf-8");
+		responseHeaders.setContentType("text/"+extension+";charset=utf-8");
+		responseHeaders.setAccept("text/"+extension+", */*; q=0.1");
 		responseHeaders.setContentLength(messageBody.length);
 		ResponseMessageBody responseMessageBody = new ResponseMessageBody(messageBody);
 		return new HttpResponse(statusLine, responseHeaders, responseMessageBody);
@@ -103,6 +106,16 @@ public static HttpResponse found(String redirectURI, boolean cookie) {
 		return new HttpResponse(statusLine, responseHeaders);
 	}
 
+	public static HttpResponse notHTML(String extension, String viewName) throws IOException {
+		byte[] messageBody = Files.readAllBytes(new File("./webapp/" + viewName).toPath());
+		StatusLine statusLine = new StatusLine(new HttpVersion("HTTP/1.1"), HttpResponseStatus.OK);
+		ResponseHeaders responseHeaders = new ResponseHeaders();
+		responseHeaders.setAccept("text/"+extension+", */*; q=0.1");
+		responseHeaders.setContentLength(messageBody.length);
+		ResponseMessageBody responseMessageBody = new ResponseMessageBody(messageBody);
+		return new HttpResponse(statusLine, responseHeaders, responseMessageBody);
+	}
+
 	public void flush(OutputStream out) throws IOException {
 		DataOutputStream dos = new DataOutputStream(out);
 		dos.writeBytes(statusLine.toString() + " \r\n");

src/main/java/http/response/ResponseHeaders.java

@@ -31,6 +31,10 @@ public void setCookie(boolean cookie) {
 		headers.put("Set-Cookie", "logined=" + cookie + "; path=/;");
 	}
 
+	public void setAccept(String content) {
+		headers.put("Accept", content);
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();