svn commit: r694073 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java

[jo...@apache.org]

Author: johnh
Date: Wed Sep 10 17:13:51 2008
New Revision: 694073

URL: http://svn.apache.org/viewvc?rev=694073&view=rev
Log:
Removing last of setRewritten() stuff.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java

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=694073&r1=694072&r2=694073&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 17:13:51 2008
@@ -32,8 +32,6 @@
   private Map<String, List<String>> headers = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
   private byte[] responseBytes = ArrayUtils.EMPTY_BYTE_ARRAY;
   private Map<String, String> metadata = Maps.newHashMap();
-  // TODO: This needs to be moved out of here..
-  private HttpResponse rewritten;
 
   public HttpResponseBuilder() {}
 
@@ -42,7 +40,6 @@
     headers.putAll(builder.headers);
     metadata.putAll(builder.metadata);
     responseBytes = builder.responseBytes;
-    rewritten = builder.rewritten;
   }
 
   public HttpResponseBuilder(HttpResponse response) {
@@ -172,17 +169,6 @@
   }
 
   /**
-   * Assigns the rewritten content for the response. This will be removed once better rewriting
-   * facilities are in place.
-   *
-   * @param rewritten The rewritten version of this response.
-   */
-  public HttpResponseBuilder setRewritten(HttpResponse rewritten) {
-    this.rewritten = rewritten;
-    return this;
-  }
-
-  /**
    * Adds a new piece of metadata to the response.
    */
   public HttpResponseBuilder setMetadata(String key, String value) {
@@ -213,8 +199,4 @@
   int getHttpStatusCode() {
     return httpStatusCode;
   }
-
-  HttpResponse getRewritten() {
-    return rewritten;
-  }
 }

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java?rev=694073&r1=694072&r2=694073&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java Wed Sep 10 17:13:51 2008
@@ -40,8 +40,7 @@
     HttpResponseBuilder builder = new HttpResponseBuilder()
         .setHttpStatusCode(HttpResponse.SC_NOT_FOUND)
         .setMetadata("foo", "bar")
-        .addHeader("Foo-bar", "baz")
-        .setRewritten(HttpResponse.notFound());
+        .addHeader("Foo-bar", "baz");
 
     HttpResponseBuilder builder2 = new HttpResponseBuilder(builder);
     assertEquals(builder.create(), builder2.create());