svn commit: r680423 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/http/HttpResponse.java main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java

[beaton]

Author: beaton
Date: Mon Jul 28 10:58:06 2008
New Revision: 680423

URL: http://svn.apache.org/viewvc?rev=680423&view=rev
Log:
Address the easy comments from Kevin's review of the OAuth caching change.

The rest I've taken to shindig-dev for discussion.

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=680423&r1=680422&r2=680423&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 Mon Jul 28 10:58:06 2008
@@ -338,6 +338,7 @@
   public void setNoCache() {
     this.headers.put("Cache-Control", Lists.newArrayList("no-cache"));
     this.headers.put("Pragma", Lists.newArrayList("no-cache"));
+    this.headers.remove("Expires");
   }
 
   /**

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java?rev=680423&r1=680422&r2=680423&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
 Mon Jul 28 10:58:06 2008
@@ -146,7 +146,8 @@
   private final boolean bypassSpecCache;
   
   /**
-   * HTTP cache.
+   * Cache for HTTP responses, probably shared across multiple different
+   * fetchers.
    */
   private HttpCache cache;
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?rev=680423&r1=680422&r2=680423&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
 Mon Jul 28 10:58:06 2008
@@ -256,6 +256,16 @@
     assertEquals(-1, response.getCacheTtl());
   }
 
+  public void testSetNoCache() {
+    int time = roundToSeconds(System.currentTimeMillis());
+    addHeader("Expires", DateUtil.formatDate(1000L * time));
+    HttpResponse response = new HttpResponse(200, null, headers);
+    response.setNoCache();
+    assertNull(response.getHeader("Expires"));
+    assertEquals("no-cache", response.getHeader("Pragma"));
+    assertEquals("no-cache", response.getHeader("Cache-Control"));
+  }
+
   public void testNullHeaderNamesStripped() {
     addHeader(null, "dummy");
     HttpResponse response = new HttpResponse(200, null, headers);