Author: johnh
Date: Wed Sep 10 15:41:24 2008
New Revision: 694049
URL: http://svn.apache.org/viewvc?rev=694049&view=rev
Log:
Removing now-unused APIs for storing rewritten HttpResponse content in its
"parent".
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
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/http/HttpResponseBuilder.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java?rev=694049&r1=694048&r2=694049&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
Wed Sep 10 15:41:24 2008
@@ -51,11 +51,6 @@
response = responseBuilder.create();
addResponseImpl(key.toString(), response);
-
- if (!request.getIgnoreCache() &&
- response.getRewritten() != null) {
- return response.getRewritten();
- }
}
return response;
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=694049&r1=694048&r2=694049&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
Wed Sep 10 15:41:24 2008
@@ -94,8 +94,6 @@
private final long date;
private final String encoding;
- private final HttpResponse rewritten;
-
/**
* Construct an HttpResponse from a builder (called by
HttpResponseBuilder.create).
*/
@@ -110,8 +108,6 @@
Map<String, String> metadataCopy = Maps.newHashMap(builder.getMetadata());
metadata = Collections.unmodifiableMap(metadataCopy);
- rewritten = builder.getRewritten();
-
// We want to modify the headers to ensure that the proper Content-Type
and Date headers
// have been set. This allows us to avoid these expensive calculations
from the cache.
date = getAndUpdateDate(headerCopy);
@@ -229,16 +225,6 @@
}
/**
- * Get the rewritten version of this content
- *
- * @return A rewritten HttpResponse
- * TODO: Remove when new rewriting interfaces are complete.
- */
- public HttpResponse getRewritten() {
- return rewritten;
- }
-
- /**
* @return consolidated cache expiration time or -1
*/
public long getCacheExpiration() {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java?rev=694049&r1=694048&r2=694049&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
Wed Sep 10 15:41:24 2008
@@ -50,7 +50,6 @@
headers.putAll(response.getHeaders());
metadata.putAll(response.getMetadata());
responseBytes = response.getResponseAsBytes();
- rewritten = response.getRewritten();
}
/**
