[ch06] 6.1 Updated servlets according to DispatcherServlet.

Signed-off-by: Dongho Sim <dhsim86@gmail.com>
dhsim86 · Mar 25, 2017 · df97074 · df97074
1 parent 6d803f6
commit df97074
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 82 deletions.
diff --git a/src/main/java/Lesson05/LoginServlet.java b/src/main/java/Lesson05/LoginServlet.java
@@ -21,10 +21,8 @@ public class LoginServlet extends HttpServlet {
     protected void doGet(
         HttpServletRequest request, HttpServletResponse response
     ) throws ServletException, IOException {
-        RequestDispatcher rd = request.getRequestDispatcher(
-            "/Lesson05/LogInForm.jsp"
-        );
-        rd.forward(request, response);
+
+        request.setAttribute("viewUrl", "/Lesson05/LogInForm.jsp");
     }
 
     @Override
@@ -47,13 +45,10 @@ protected void doPost(
                 HttpSession session = request.getSession();
                 session.setAttribute("member", member);
 
-                response.sendRedirect("../member/list");
+                request.setAttribute("viewUrl", "redirect:../member/list.do");
             }
             else {
-                RequestDispatcher rd = request.getRequestDispatcher(
-                        "/Lesson05/LogInFail.jsp"
-                );
-                rd.forward(request, response);
+                request.setAttribute("viewUrl", "/Lesson05/LogInFail.jsp");
             }
         }
         catch (Exception e) {

diff --git a/src/main/java/Lesson05/LogoutServlet.java b/src/main/java/Lesson05/LogoutServlet.java
@@ -22,6 +22,6 @@ protected void doGet(
         HttpSession session = request.getSession();
         session.invalidate();
 
-        response.sendRedirect("login");
+        request.setAttribute("viewUrl", "redirect:login.do");
     }
 }
diff --git a/src/main/java/Lesson05/MemberAddServlet.java b/src/main/java/Lesson05/MemberAddServlet.java
@@ -20,11 +20,7 @@ public class MemberAddServlet extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
 
-        RequestDispatcher rd = request.getRequestDispatcher(
-            "/Lesson05/MemberAdd.jsp"
-        );
-
-        rd.include(request, response);
+        request.setAttribute("viewUrl", "/Lesson05/MemberAdd.jsp");
     }
 
     @Override
@@ -36,22 +32,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             MemberDao memberDao = (MemberDao)sc.getAttribute("memberDao");
 
-            Member member = new Member()
-                .setEmail(request.getParameter("email"))
-                .setPassword(request.getParameter("password"))
-                .setName(request.getParameter("name"));
-
+            Member member = (Member)request.getAttribute("member");
             int result = memberDao.insert(member);
-            response.sendRedirect("list");
+
+            request.setAttribute("viewUrl", "redirect:list.do");
         }
         catch (Exception e) {
 
-            request.setAttribute("error", e);
-
-            RequestDispatcher rd = request.getRequestDispatcher(
-                "/Lesson05/Error.jsp"
-            );
-            rd.forward(request, response);
+            throw new ServletException(e);
         }
     }
 }
diff --git a/src/main/java/Lesson05/MemberDeleteServlet.java b/src/main/java/Lesson05/MemberDeleteServlet.java
@@ -27,17 +27,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             MemberDao memberDao = (MemberDao)sc.getAttribute("memberDao");
 
             int result = memberDao.delete(Integer.parseInt(request.getParameter("no")));
-
-            response.sendRedirect("list");
+            request.setAttribute("viewUrl", "redirect:list.do");
         }
         catch (Exception e) {
 
-            request.setAttribute("error", e);
-
-            RequestDispatcher rd = request.getRequestDispatcher(
-                "/Lesson05/Error.jsp"
-            );
-            rd.forward(request, response);
+            throw new ServletException(e);
         }
     }
 }
diff --git a/src/main/java/Lesson05/MemberListServlet.java b/src/main/java/Lesson05/MemberListServlet.java
@@ -25,22 +25,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             ServletContext sc = this.getServletContext();
 
             MemberDao memberDao = (MemberDao)sc.getAttribute("memberDao");
-
             request.setAttribute("memberList", memberDao.selectList());
-            response.setContentType("text/html; charset=UTF-8");
-
-            RequestDispatcher rd = request.getRequestDispatcher(
-                    "/Lesson05/MemberList.jsp"
-            );
-            rd.include(request, response);
+            request.setAttribute("viewUrl", "/Lesson05/MemberList.jsp");
         }
         catch (Exception e) {
 
-            request.setAttribute("error", e);
-            RequestDispatcher rd = request.getRequestDispatcher(
-                    "/Lesson05/Error.jsp"
-            );
-            rd.forward(request, response);
+            throw new ServletException(e);
         }
     }
 }
diff --git a/src/main/java/Lesson05/MemberUpdateServlet.java b/src/main/java/Lesson05/MemberUpdateServlet.java
@@ -1,14 +1,12 @@
 package Lesson05;
 
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.sql.*;
 
 /**
  * Created by Dongho on 2017. 3. 7..
@@ -25,23 +23,12 @@ public void doGet(
             ServletContext sc = this.getServletContext();
 
             MemberDao memberDao = (MemberDao)sc.getAttribute("memberDao");
-
-            response.setContentType("text/html; charset=UTF-8");
             request.setAttribute("member", memberDao.selectOne(Integer.parseInt(request.getParameter("no"))));
-
-            RequestDispatcher rd = request.getRequestDispatcher(
-                "/Lesson05/MemberUpdate.jsp"
-            );
-            rd.include(request, response);
+            request.setAttribute("viewUrl", "/Lesson05/MemberUpdate.jsp");
         }
         catch (Exception e) {
 
-            request.setAttribute("error", e);
-
-            RequestDispatcher rd = request.getRequestDispatcher(
-                "/Lesson05/Error.jsp"
-            );
-            rd.forward(request, response);
+            throw new ServletException(e);
         }
     }
 
@@ -54,14 +41,11 @@ protected void doPost(
             ServletContext sc = this.getServletContext();
 
             MemberDao memberDao = (MemberDao)sc.getAttribute("memberDao");
-
-            Member member = new Member()
-                .setEmail(request.getParameter("email"))
-                .setName(request.getParameter("name"))
-                .setNo(Integer.parseInt(request.getParameter("no")));
+            Member member = (Member)request.getAttribute("member");
 
             int result = memberDao.update(member);
-            response.sendRedirect("list");
+
+            request.setAttribute("viewUrl", "redirect:list.do");
         }
         catch (Exception e) {
             throw new ServletException(e);

diff --git a/src/main/java/Lesson06/DispatcherServlet.java b/src/main/java/Lesson06/DispatcherServlet.java
@@ -38,7 +38,7 @@ else if ("/member/add.do".equals(servletPath)) {
                 if (request.getParameter("email") != null) {
                     request.setAttribute("member",
                         new Member().setEmail(request.getParameter("email"))
-                                    .setNo(Integer.parseInt(request.getParameter("no")))
+                                    .setPassword(request.getParameter("password"))
                                     .setName(request.getParameter("name"))
                     );
                 }
@@ -86,7 +86,7 @@ else if ("/auth/logout.do".equals(servletPath)) {
             request.setAttribute("error", e);
 
             RequestDispatcher requestDispatcher =
-                request.getRequestDispatcher("/Error.jsp");
+                request.getRequestDispatcher("/Lesson05/Error.jsp");
 
             requestDispatcher.forward(request, response);
         }

diff --git a/src/main/webapp/Lesson05/Header.jsp b/src/main/webapp/Lesson05/Header.jsp
@@ -22,7 +22,7 @@
         %>
         <%=member.getName()%>
         <a style="color:white;"
-           href="<%=request.getContextPath()%>/auth/logout">Logout</a>
+           href="<%=request.getContextPath()%>/auth/logout.do">Logout</a>
         <%
             }
         %>

diff --git a/src/main/webapp/Lesson05/LogInFail.jsp b/src/main/webapp/Lesson05/LogInFail.jsp
@@ -8,7 +8,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <!DOCTYPE html>
 <html>
-    <meta http-equiv="refresh" content="1;url=login">
+    <meta http-equiv="refresh" content="1;url=login.do">
 <head>
     <title>Login Failure</title>
 </head>

diff --git a/src/main/webapp/Lesson05/LogInForm.jsp b/src/main/webapp/Lesson05/LogInForm.jsp
@@ -13,7 +13,7 @@
 </head>
 <body>
     <h2>User Login</h2>
-    <form action="login" method="post">
+    <form action="login.do" method="post">
         email: <input type="text" name="email"><br>
         password: <input type="password" name="password"><br>
 

diff --git a/src/main/webapp/Lesson05/MemberAdd.jsp b/src/main/webapp/Lesson05/MemberAdd.jsp
@@ -15,7 +15,7 @@
     <jsp:include page="Header.jsp" />
     <h1>register member</h1>
 
-    <form action="add" method="post">
+    <form action="add.do" method="post">
 
         name: <input type="text" name="name"> <br>
         email: <input type="text" name="email"> <br>

diff --git a/src/main/webapp/Lesson05/MemberList.jsp b/src/main/webapp/Lesson05/MemberList.jsp
@@ -18,7 +18,7 @@
 <body>
     <jsp:include page="Header.jsp"/>
     <h1>Member List</h1>
-    <p><a href='add'> New Member </a></p>
+    <p><a href='add.do'> New Member </a></p>
     <jsp:useBean id="memberList"
                 scope="request"
                 class="java.util.ArrayList"
@@ -30,20 +30,20 @@
         for (Member member : dummyList) {
     %>
     <%=member.getNo()%>
-    <a href='update?no=<%=member.getNo()%>'><%=member.getName()%></a>
+    <a href='update.do?no=<%=member.getNo()%>'><%=member.getName()%></a>
     <%=member.getEmail()%>
     <%=member.getCreatedDate()%>
-    <a href='delete?no=<%=member.getNo()%>'>[Delete]</a><br>
+    <a href='delete.do?no=<%=member.getNo()%>'>[Delete]</a><br>
     <%
         }
     %>
 
     <c:forEach var="member" items="${memberList}">
         ${member.no}
-        <a href="update?no=${member.no}">${member.name}</a>
+        <a href="update.do?no=${member.no}">${member.name}</a>
         ${member.email}
         ${member.createdDate}
-        <a href="delete?no=${member.no}">[Delete]</a><br>
+        <a href="delete.do?no=${member.no}">[Delete]</a><br>
     </c:forEach>
 
     <jsp:include page="Tail.jsp"/>

diff --git a/src/main/webapp/Lesson05/MemberUpdate.jsp b/src/main/webapp/Lesson05/MemberUpdate.jsp
@@ -14,7 +14,7 @@
 <body>
     <h1>member info</h1>
 
-    <form action="update" method="post">
+    <form action="update.do" method="post">
 
         number: <input type="text" name="no" value="${member.no}" readonly><br>
         name: <input type="text" name="name" value="${member.name}"> <br>
@@ -23,9 +23,9 @@
 
         <input type="submit" value="save">
         <input type="button" value="delete"
-           onclick="location.href='delete?no=${member.no}'">
+           onclick="location.href='delete.do?no=${member.no}'">
         <input type="button" value="cancel"
-           onclick="location.href='list'">
+           onclick="location.href='list.do'">
 
     </form>
 </body>