Some cleanup of the Servlet samples

Added test for cookie sample

Signed-off-by: arjantijms <arjan.tijms@gmail.com>

Author: arjantijms

servlet/async-servlet/pom.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.javaee7</groupId>
 		<artifactId>servlet</artifactId>
 		<version>1.0-SNAPSHOT</version>
 	</parent>
-	
+
 	<artifactId>servlet-async-servlet</artifactId>
 	<packaging>war</packaging>
-	
+
 	<name>Java EE 7 Sample: servlet - async-servlet</name>
 </project>

servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java

@@ -39,6 +39,8 @@
  */
 package org.javaee7.servlet.async;
 
+import java.io.IOException;
+
 import javax.annotation.Resource;
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.servlet.AsyncContext;
@@ -49,32 +51,30 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * @author Arun Gupta
  */
 @WebServlet(urlPatterns = "/MyAsyncServlet", asyncSupported = true)
 public class MyAsyncServlet extends HttpServlet {
 
-    //    @Resource(lookup="java:comp/DefaultManagedExecutorService")
+    private static final long serialVersionUID = 3709640331218336841L;
+    
     @Resource
     ManagedExecutorService executor;
 
     /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-     * methods.
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
      *
      * @param request servlet request
      * @param response servlet response
      * @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 {
-        AsyncContext ac = request.startAsync();
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        AsyncContext asyncContext = request.startAsync();
 
-        ac.addListener(new AsyncListener() {
+        asyncContext.addListener(new AsyncListener() {
             @Override
             public void onComplete(AsyncEvent event) throws IOException {
                 event.getSuppliedResponse().getWriter().println("onComplete");
@@ -96,29 +96,29 @@ public void onStartAsync(AsyncEvent event) throws IOException {
                 event.getSuppliedResponse().getWriter().println("onStartAsync");
             }
         });
-        executor.submit(new MyAsyncService(ac));
+        
+        executor.submit(new MyAsyncService(asyncContext));
     }
 
     class MyAsyncService implements Runnable {
 
-        AsyncContext ac;
+        AsyncContext asyncContext;
 
-        public MyAsyncService(AsyncContext ac) {
-            this.ac = ac;
+        public MyAsyncService(AsyncContext asyncContext) {
+            this.asyncContext = asyncContext;
         }
 
         @Override
         public void run() {
             try {
-                ac.getResponse().getWriter().println("Running inside MyAsyncService");
+                asyncContext.getResponse().getWriter().println("Running inside MyAsyncService");
             } catch (IOException e) {
                 throw new IllegalStateException(e);
             }
-            ac.complete();
+            asyncContext.complete();
         }
     }
 
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
     /**
      * Handles the HTTP <code>GET</code> method.
      *
@@ -128,8 +128,7 @@ public void run() {
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         processRequest(request, response);
     }
 
@@ -142,8 +141,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         processRequest(request, response);
     }
 
@@ -155,5 +153,5 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     @Override
     public String getServletInfo() {
         return "Short description";
-    }// </editor-fold>
+    }
 }

servlet/cookies/pom.xml

@@ -8,9 +8,11 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
   </parent>
+
     <groupId>org.javaee7</groupId>
     <artifactId>servlet-cookies</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
+
     <name>Java EE 7 Sample: servlet - cookies</name>
 </project>

servlet/cookies/src/main/java/org/javaee7/servlet/cookies/ClientCookieServlet.java

@@ -0,0 +1,114 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.javaee7.servlet.cookies;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author Arun Gupta
+ */
+@WebServlet(urlPatterns = { "/ClientCookieServlet" })
+public class ClientCookieServlet extends HttpServlet {
+
+    private static final long serialVersionUID = -1944396991856607131L;
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     *
+     * @param request servlet request
+     * @param response servlet response
+     * @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 {
+        response.setContentType("text/html;charset=UTF-8");
+        
+        try (PrintWriter out = response.getWriter()) {
+            out.println("<!DOCTYPE html>");
+            out.println("<html>");
+            out.println("<head>");
+            out.println("<title>Servlet ClientCookieServlet</title>");
+            out.println("</head>");
+            out.println("<body>");
+            out.println("<h1>Servlet ClientCookieServlet at " + request.getContextPath() + "</h1>");
+            
+            
+            out.println("<script type=\"text/javascript\">");
+            out.println("document.write(document.cookie);");
+            out.println("</script>");
+          
+            out.println("</body>");
+            out.println("</html>");
+        }
+    }
+
+    /**
+     * 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/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java

@@ -41,9 +41,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+
 import javax.servlet.ServletException;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServlet;
@@ -54,21 +53,21 @@
  * @author Arun Gupta
  */
 @WebServlet(urlPatterns = { "/TestServlet" })
-@MultipartConfig(location = "/tmp")
 public class TestServlet extends HttpServlet {
 
+    private static final long serialVersionUID = -1944396991856607131L;
+
     /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-     * methods.
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
      *
      * @param request servlet request
      * @param response servlet response
      * @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 {
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
+        
         try (PrintWriter out = response.getWriter()) {
             out.println("<!DOCTYPE html>");
             out.println("<html>");
@@ -77,33 +76,36 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("</head>");
             out.println("<body>");
             out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
-            SessionCookieConfig cookies = request.getServletContext().getSessionCookieConfig();
-            out.println("Found cookie: " + cookies.getName());
+            
+            if (request.getCookies() != null) {
+                for (Cookie cookie : request.getCookies()) {
+                    out.println("Found cookie: " + cookie.getName());
+                }
+            }
 
+            // General cookie
             Cookie cookie = new Cookie("myCookieKey", "myCookieValue");
             cookie.setMaxAge(60);
             response.addCookie(cookie);
+            
             out.println("<br><br>Set a new cookie");
 
+            // Http only cookie
             cookie = new Cookie("myHttpOnlyCookieKey", "myHttpOnlyCookieValue");
             cookie.setHttpOnly(true);
             cookie.setMaxAge(60);
             response.addCookie(cookie);
+            
             out.println("<br>Set a new HTTPOnly Cookie<br><br>");
             out.println("Check what cookies are visible by");
-            out.println("<a href=\"http://"
-                + request.getServerName()
-                + ":"
-                + request.getServerPort()
-                + request.getContextPath()
-                + "/index-cookies.jsp\">clicking here</a>");
+            out.println("<a href=\"http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath()
+                    + "/index-cookies.jsp\">clicking here</a>");
 
             out.println("</body>");
             out.println("</html>");
         }
     }
 
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
     /**
      * Handles the HTTP <code>GET</code> method.
      *
@@ -113,8 +115,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         processRequest(request, response);
     }
 
@@ -127,8 +128,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
      * @throws IOException if an I/O error occurs
      */
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-        throws ServletException, IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         processRequest(request, response);
     }
 
@@ -140,6 +140,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     @Override
     public String getServletInfo() {
         return "Short description";
-    }// </editor-fold>
+    }
 
 }