Merge pull request #276 from aheusingfeld/master

johnament · johnament · commit 923a9591953e · 2014-11-23T22:12:13.000-05:00
Optimized Async Servlet sample
diff --git a/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java b/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java
@@ -1,7 +1,5 @@
 package org.javaee7.servlet.async;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import javax.annotation.Resource;
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.servlet.AsyncContext;
@@ -12,6 +10,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * @author Arun Gupta
@@ -34,43 +33,31 @@ public class MyAsyncServlet extends HttpServlet {
      */
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (final PrintWriter out = response.getWriter()) {
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>Async Servlet</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>Async Servlet</h1>");
-            AsyncContext ac = request.startAsync();
+        AsyncContext ac = request.startAsync();
 
-            ac.addListener(new AsyncListener() {
-                @Override
-                public void onComplete(AsyncEvent event) throws IOException {
-                    System.out.println("onComplete");
-                }
+        ac.addListener(new AsyncListener() {
+            @Override
+            public void onComplete(AsyncEvent event) throws IOException {
+                event.getSuppliedResponse().getWriter().println("onComplete");
+            }
 
-                @Override
-                public void onTimeout(AsyncEvent event) throws IOException {
-                    System.out.println("onTimeout");
-                }
+            @Override
+            public void onTimeout(AsyncEvent event) throws IOException {
+                event.getSuppliedResponse().getWriter().println("onTimeout");
+                event.getAsyncContext().complete();
+            }
 
-                @Override
-                public void onError(AsyncEvent event) throws IOException {
-                    System.out.println("onError");
-                }
+            @Override
+            public void onError(AsyncEvent event) throws IOException {
+                event.getSuppliedResponse().getWriter().println("onError");
+            }
 
-                @Override
-                public void onStartAsync(AsyncEvent event) throws IOException {
-                    System.out.println("onStartAsync");
-                }
-            });
-            executor.submit(new MyAsyncService(ac));
-            out.println("Check \"server.log\" for output from Async Servlet");
-            out.println("</body>");
-            out.println("</html>");
-        }
+            @Override
+            public void onStartAsync(AsyncEvent event) throws IOException {
+                event.getSuppliedResponse().getWriter().println("onStartAsync");
+            }
+        });
+        executor.submit(new MyAsyncService(ac));
     }
 
     class MyAsyncService implements Runnable {
@@ -83,7 +70,11 @@ public MyAsyncService(AsyncContext ac) {
 
         @Override
         public void run() {
-            System.out.println("Running inside MyAsyncService");
+            try {
+                ac.getResponse().getWriter().println("Running inside MyAsyncService");
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
             ac.complete();
         }
     }
