[(imporve) greengerong#21]: Getting jsessionids with urls. (Add response to event handler before reponse prerender html)

greengerong · greengerong · commit f3db14bf9e9f · 2014-08-16T08:05:57.000+08:00
diff --git a/src/main/java/com/github/greengerong/PreRenderEventHandler.java b/src/main/java/com/github/greengerong/PreRenderEventHandler.java
@@ -4,12 +4,13 @@
 import org.apache.http.HttpResponse;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 public interface PreRenderEventHandler {
 
     String beforeRender(HttpServletRequest clientRequest);
 
-    void afterRender(HttpServletRequest clientRequest, HttpResponse prerenderResponse, String html);
+    void afterRender(HttpServletRequest clientRequest, HttpServletResponse clientResponse, HttpResponse prerenderResponse, String responseHtml);
 
     void destroy();
 }
diff --git a/src/main/java/com/github/greengerong/PrerenderSeoService.java b/src/main/java/com/github/greengerong/PrerenderSeoService.java
@@ -202,24 +202,24 @@ private void copyResponseHeaders(HttpResponse proxyResponse, HttpServletResponse
         }
     }
 
+    private String getResponseHtml(HttpResponse proxyResponse)
+            throws IOException {
+        HttpEntity entity = proxyResponse.getEntity();
+        return entity != null ? EntityUtils.toString(entity) : "";
+    }
+
     /**
      * Copy response body data (the entity) from the proxy to the servlet client.
      */
-    private String copyResponseEntity(HttpResponse proxyResponse, HttpServletResponse servletResponse)
+    private void responseEntity(String html, HttpServletResponse servletResponse)
             throws IOException {
-        HttpEntity entity = proxyResponse.getEntity();
-        if (entity != null) {
-            PrintWriter printWriter = servletResponse.getWriter();
-            try {
-                final String html = EntityUtils.toString(entity);
-                printWriter.write(html);
-                printWriter.flush();
-                return html;
-            } finally {
-                closeQuietly(printWriter);
-            }
+        PrintWriter printWriter = servletResponse.getWriter();
+        try {
+            printWriter.write(html);
+            printWriter.flush();
+        } finally {
+            closeQuietly(printWriter);
         }
-        return "";
     }
 
 
@@ -262,8 +262,8 @@ private boolean isInResources(final String url) {
         return from(prerenderConfig.getExtensionsToIgnore()).anyMatch(new Predicate<String>() {
             @Override
             public boolean apply(String item) {
-	        		return (url.indexOf('?') >= 0 ? url.substring(0, url.indexOf('?')) : url)
-	        				.toLowerCase().endsWith(item);
+                return (url.indexOf('?') >= 0 ? url.substring(0, url.indexOf('?')) : url)
+                        .toLowerCase().endsWith(item);
             }
         });
     }
@@ -298,23 +298,24 @@ private boolean proxyPrerenderedPageResponse(HttpServletRequest request, HttpSer
         final HttpGet getMethod = getHttpGet(apiUrl);
         copyRequestHeaders(request, getMethod);
         withPrerenderToken(getMethod);
-        CloseableHttpResponse proxyResponse = null;
+        CloseableHttpResponse prerenderServerResponse = null;
 
         try {
-            proxyResponse = httpClient.execute(getMethod);
-            response.setStatus(proxyResponse.getStatusLine().getStatusCode());
-            copyResponseHeaders(proxyResponse, response);
-            final String html = copyResponseEntity(proxyResponse, response);
-            afterRender(request, proxyResponse, html);
+            prerenderServerResponse = httpClient.execute(getMethod);
+            response.setStatus(prerenderServerResponse.getStatusLine().getStatusCode());
+            copyResponseHeaders(prerenderServerResponse, response);
+            final String html = getResponseHtml(prerenderServerResponse);
+            afterRender(request, response, prerenderServerResponse, html);
+            responseEntity(html, response);
             return true;
         } finally {
-            closeQuietly(proxyResponse);
+            closeQuietly(prerenderServerResponse);
         }
     }
 
-    private void afterRender(HttpServletRequest request, CloseableHttpResponse proxyResponse, String html) {
+    private void afterRender(HttpServletRequest clientRequest, HttpServletResponse clientResponse, CloseableHttpResponse prerenderServerResponse, String responseHtml) {
         if (preRenderEventHandler != null) {
-            preRenderEventHandler.afterRender(request, proxyResponse, html);
+            preRenderEventHandler.afterRender(clientRequest, clientResponse, prerenderServerResponse, responseHtml);
         }
     }
 
diff --git a/src/test/java/com/github/greengerong/PreRenderSEOFilterTest.java b/src/test/java/com/github/greengerong/PreRenderSEOFilterTest.java
@@ -18,6 +18,8 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Enumeration;
 import java.util.HashMap;
 
@@ -46,6 +48,8 @@ public class PreRenderSEOFilterTest {
 
     @Mock
     private HttpGet httpGet;
+    @Mock
+    private PrintWriter printWriter;
 
     @Before
     public void setUp() throws Exception {
@@ -99,6 +103,8 @@ public void should_handle_when_url_with_escaped_fragment_() throws Exception {
         when(servletRequest.getParameterMap()).thenReturn(map);
         when(statusLine.getStatusCode()).thenReturn(PrerenderSeoService.HTTP_OK);
         when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
+        when(servletResponse.getWriter()).thenReturn(printWriter);
+
         //when
         preRenderSEOFilter.doFilter(servletRequest, servletResponse, filterChain);
 
@@ -201,7 +207,7 @@ public void should_handle_when_user_agent_is_crawler_and_url_is_not_resource_and
         when(servletRequest.getParameterMap()).thenReturn(map);
         when(statusLine.getStatusCode()).thenReturn(PrerenderSeoService.HTTP_OK);
         when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
-
+        when(servletResponse.getWriter()).thenReturn(printWriter);
         //when
         preRenderSEOFilter.doFilter(servletRequest, servletResponse, filterChain);
 
@@ -231,6 +237,8 @@ public void should_handle_when_every_thing_is_ok_but_prerender_server_response_i
         when(servletRequest.getParameterMap()).thenReturn(map);
         when(statusLine.getStatusCode()).thenReturn(NOT_FOUND);
         when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
+        when(servletResponse.getWriter()).thenReturn(printWriter);
+
 
         //when
         preRenderSEOFilter.doFilter(servletRequest, servletResponse, filterChain);
@@ -266,6 +274,7 @@ public void should_handle_when_user_agent_is_crawler_and_url_is_not_resource_and
         when(servletRequest.getParameterMap()).thenReturn(map);
         when(statusLine.getStatusCode()).thenReturn(PrerenderSeoService.HTTP_OK);
         when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
+        when(servletResponse.getWriter()).thenReturn(printWriter);
 
         //when
         preRenderSEOFilter.doFilter(servletRequest, servletResponse, filterChain);
@@ -299,6 +308,7 @@ public void should_use_request_url_from_custom_header_if_available() throws Exce
         when(servletRequest.getParameterMap()).thenReturn(map);
         when(statusLine.getStatusCode()).thenReturn(PrerenderSeoService.HTTP_OK);
         when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
+        when(servletResponse.getWriter()).thenReturn(printWriter);
 
         //when
         preRenderSEOFilter.doFilter(servletRequest, servletResponse, filterChain);
