Cleaned up programmatic login example

Signed-off-by: arjantijms <[email protected]>

Author: arjantijms

servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java

@@ -12,7 +12,7 @@
 /**
  * @author Arun Gupta
  */
-@WebServlet(urlPatterns = { "/LoginServlet" })
+@WebServlet("/LoginServlet")
 public class LoginServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;
@@ -25,9 +25,10 @@ public class LoginServlet extends HttpServlet {
      * @throws ServletException if a servlet-specific error occurs
      * @throws IOException if an I/O error occurs
      */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
+        
         String user = request.getParameter("user");
         String password = request.getParameter("password");
 
@@ -43,34 +44,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
     private void userDetails(PrintWriter out, HttpServletRequest request) {
         out.println("isUserInRole?" + request.isUserInRole("g1"));
         out.println("getRemoteUser?" + request.getRemoteUser());
-        out.println("getUserPrincipal?" + request.getUserPrincipal());
+        out.println("getUserPrincipal?" + (request.getUserPrincipal() != null? request.getUserPrincipal().getName() : null));
         out.println("getAuthType?" + request.getAuthType());
     }
 
-    /**
-     * Handles the HTTP <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /**
-     * Handles the HTTP <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
 }

servlet/security-programmatic/src/main/webapp/WEB-INF/web.xml

@@ -3,12 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
-    <servlet>
-        <display-name>index</display-name>
-        <servlet-name>index</servlet-name>
-        <jsp-file>/index.jsp</jsp-file>
-    </servlet>
-    
     <security-role>
         <role-name>g1</role-name>
     </security-role>

servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java

@@ -12,6 +12,8 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.xml.sax.SAXException;
@@ -29,6 +31,8 @@ public class LoginServletTest {
 
     @ArquillianResource
     private URL base;
+    
+    WebClient webClient;
 
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
@@ -39,12 +43,23 @@ public static WebArchive createDeployment() {
             addClass(LoginServlet.class).
             addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml")));
     }
+    
+    @Before
+    public void setup() {
+        webClient = new WebClient();
+    }
+    
+    @After
+    public void tearDown() {
+        webClient.getCookieManager().clearCookies();
+        webClient.close();
+    }
 
     @Test
     public void testUnauthenticatedRequest() throws IOException, SAXException {
-        WebClient webClient = new WebClient();
         HtmlPage page = webClient.getPage(base + "/LoginServlet");
         String responseText = page.asText();
+        
         System.out.println("testUnauthenticatedRequest:\n" + responseText + "\n");
 
         assertTrue(responseText.contains("isUserInRole?false"));
@@ -55,14 +70,13 @@ public void testUnauthenticatedRequest() throws IOException, SAXException {
 
     @Test
     public void testAuthenticatedRequest() throws IOException, SAXException {
-        WebClient webClient = new WebClient();
         HtmlPage page = webClient.getPage(base + "/LoginServlet?user=u1&password=p1");
         String responseText = page.asText();
+        
         System.out.println("testAuthenticatedRequest:\n" + responseText + "\n");
 
         assertTrue(responseText.contains("isUserInRole?true"));
         assertTrue(responseText.contains("getRemoteUser?u1"));
         assertTrue(responseText.contains("getUserPrincipal?u1"));
-        assertTrue(responseText.contains("getAuthType?BASIC"));
     }
 }