Author: sergeyb
Date: Tue Jan 25 16:28:45 2011
New Revision: 1063340
URL: http://svn.apache.org/viewvc?rev=1063340&view=rev
Log:
[CXF-3288] Cloning ResponseBuilder during Client.getResponse() calls
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1063340&r1=1063339&r2=1063340&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Tue Jan 25 16:28:45 2011
@@ -253,7 +253,7 @@ public class AbstractClient implements C
if (state.getResponseBuilder() == null) {
return null;
}
- return state.getResponseBuilder().build();
+ return state.getResponseBuilder().clone().build();
}
/**
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1063340&r1=1063339&r2=1063340&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Tue Jan 25 16:28:45 2011
@@ -57,6 +57,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.EntityTag;
import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
@@ -392,6 +393,15 @@ public class BookStore {
}
@GET
+ @Path("/books/response/{bookId}/")
+ @Produces("application/xml")
+ public Response getBookAsResponse(@PathParam("bookId") String id) throws
BookNotFoundFault {
+ Book entity = doGetBook(id);
+ EntityTag etag = new EntityTag(Integer.toString(entity.hashCode()));
+ return Response.ok().tag(etag).entity(entity).build();
+ }
+
+ @GET
@Path("/books/{bookId}/cglib")
@Produces("application/xml")
public Book getBookCGLIB(@PathParam("bookId") String id) throws
BookNotFoundFault {
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1063340&r1=1063339&r2=1063340&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Tue Jan 25 16:28:45 2011
@@ -80,6 +80,21 @@ public class JAXRSClientServerBookTest e
assertEquals(123L, book.getId());
}
+ @Test
+ public void testGetBookResponseAndETag() throws Exception {
+
+ String endpointAddress =
+ "http://localhost:"; + PORT + "/bookstore/books/response/123";
+ WebClient wc = WebClient.create(endpointAddress);
+ Book book = wc.get(Book.class);
+ assertEquals(200, wc.getResponse().getStatus());
+ assertEquals(123L, book.getId());
+ MultivaluedMap<String, Object> headers =
wc.getResponse().getMetadata();
+ assertTrue(headers.size() > 0);
+ Object etag = headers.getFirst("ETag");
+ assertNotNull(etag);
+ }
+
@Test
public void testOnewayWebClient() throws Exception {
