svn commit: r1086434 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java

[zh...@apache.org]

Author: zhoresh
Date: Mon Mar 28 22:45:56 2011
New Revision: 1086434

URL: http://svn.apache.org/viewvc?rev=1086434&view=rev
Log:
Use default TTL for js and proxy url requests in GadgetHandler | http://codereview.appspot.com/4273124/

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1086434&r1=1086433&r2=1086434&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Mon Mar 28 22:45:56 2011
@@ -221,8 +221,10 @@ public class GadgetsHandlerService {
       }
       content = response.toJsString();
       if (response.isProxyCacheable()) {
-        expireMs = timeSource.currentTimeMillis() + (HttpUtil.getDefaultTtl() * 1000);
+        expireMs = getDefaultExpiration();
       }
+    } else {
+      expireMs = getDefaultExpiration();
     }
     return createJsResponse(request.getUrl(), servedUri, content, fields, expireMs);
   }
@@ -343,10 +345,17 @@ public class GadgetsHandlerService {
       expireMs = httpResponse.getCacheExpiration();
     } else if (proxyUri.getRefresh() != null) {
       expireMs = timeSource.currentTimeMillis() + proxyUri.getRefresh() * 1000;
+    } else {
+      // Use default ttl:
+      return getDefaultExpiration();
     }
     return expireMs;
   }
 
+  protected long getDefaultExpiration() {
+    return timeSource.currentTimeMillis() + (HttpUtil.getDefaultTtl() * 1000);
+  }
+
   /**
    * GadgetContext for metadata request. Used by the gadget processor
    */

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java?rev=1086434&r1=1086433&r2=1086434&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java Mon Mar 28 22:45:56 2011
@@ -302,7 +302,8 @@ public class GadgetsHandlerServiceTest e
     assertEquals(expectedUri, uriCapture.getValue());
     assertEquals(resUri, response.getJsUrl());
     assertNull(response.getJsContent());
-    assertNull(response.getExpireTimeMs());
+    assertEquals(timeSource.currentTimeMillis() + HttpUtil.getDefaultTtl() * 1000,
+        response.getExpireTimeMs().longValue());
     verify();
   }
 
@@ -341,7 +342,7 @@ public class GadgetsHandlerServiceTest e
         response.getExpireTimeMs().longValue());
     verify();
   }
-  
+
   @Test(expected = ProcessingException.class)
   public void testGetJsDataWithException() throws Exception {
     List<String> fields = ImmutableList.of("jscontent");
@@ -418,6 +419,7 @@ public class GadgetsHandlerServiceTest e
     assertEquals("Date", response.getProxyContent().getHeaders().get(0).getName());
     assertEquals("header", response.getProxyContent().getHeaders().get(1).getName());
     assertEquals("hval", response.getProxyContent().getHeaders().get(1).getValue());
+    assertEquals(1000001L, response.getExpireTimeMs().longValue());
   }
 
   @Test
@@ -444,6 +446,8 @@ public class GadgetsHandlerServiceTest e
     assertEquals(CONTAINER, pUri.getContainer());
     assertEquals(resUri, response.getProxyUrl());
     assertNull(response.getProxyContent());
+    assertEquals(timeSource.currentTimeMillis() + HttpUtil.getDefaultTtl() * 1000,
+        response.getExpireTimeMs().longValue());
     verify();
   }
 
@@ -475,7 +479,9 @@ public class GadgetsHandlerServiceTest e
     Capture<List<ProxyUri>> uriCapture = new Capture<List<ProxyUri>>();
     expect(proxyUriManager.make(capture(uriCapture), EasyMock.anyInt()))
         .andReturn(ImmutableList.of(resUri));
-    HttpResponse httpResponse = new HttpResponse("response");
+    HttpResponseBuilder builder = new HttpResponseBuilder();
+    builder.setExpirationTime(20000).setContent("response");
+    HttpResponse httpResponse = builder.create();
     expect(proxyHandler.fetch(EasyMock.isA(ProxyUri.class))).andReturn(httpResponse);
     replay();
     GadgetsHandlerApi.ProxyResponse response = gadgetHandler.getProxy(request);
@@ -485,6 +491,7 @@ public class GadgetsHandlerServiceTest e
     assertNull(response.getProxyUrl());
     assertEquals("response",
         new String(Base64.decodeBase64(response.getProxyContent().getContentBase64())));
+    assertEquals(20000L, response.getExpireTimeMs().longValue());
     verify();
   }