You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/02/22 11:39:18 UTC
svn commit: r1448978 - in /cxf/trunk:
rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Author: sergeyb
Date: Fri Feb 22 10:39:18 2013
New Revision: 1448978
URL: http://svn.apache.org/r1448978
Log:
[CXF-4848] Support for GenericEntity in WebClient
Modified:
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1448978&r1=1448977&r2=1448978&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Fri Feb 22 10:39:18 2013
@@ -38,6 +38,7 @@ import javax.ws.rs.client.Entity;
import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
@@ -765,7 +766,15 @@ public class WebClient extends AbstractC
Type inGenericType,
Class<?> responseClass,
Type outGenericType) {
-
+ if (body instanceof GenericEntity) {
+ GenericEntity<?> genericEntity = (GenericEntity<?>)body;
+ body = genericEntity.getEntity();
+ requestClass = genericEntity.getRawType();
+ if (inGenericType != null && genericEntity.getType() != inGenericType) {
+ throw new IllegalArgumentException("Illegal type");
+ }
+ inGenericType = genericEntity.getType();
+ }
MultivaluedMap<String, String> headers = prepareHeaders(responseClass, body);
resetResponse();
Response r = doChainedInvocation(httpMethod, headers, body, requestClass, inGenericType,
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=1448978&r1=1448977&r2=1448978&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 Fri Feb 22 10:39:18 2013
@@ -36,6 +36,7 @@ import javax.ws.rs.ProcessingException;
import javax.ws.rs.ServerErrorException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -319,6 +320,28 @@ public class JAXRSClientServerBookTest e
}
@Test
+ public void testPostCollectionGenericEntityWebClient() throws Exception {
+
+ String endpointAddress =
+ "http://localhost:" + PORT + "/bookstore/collections3";
+ WebClient wc = WebClient.create(endpointAddress);
+ wc.accept("application/xml").type("application/xml");
+ Book b1 = new Book("CXF in Action", 123L);
+ Book b2 = new Book("CXF Rocks", 124L);
+ List<Book> books = new ArrayList<Book>();
+ books.add(b1);
+ books.add(b2);
+ GenericEntity<List<Book>> genericCollectionEntity =
+ new GenericEntity<List<Book>>(books) {
+ };
+
+ Book book = wc.post(genericCollectionEntity, Book.class);
+ assertEquals(200, wc.getResponse().getStatus());
+ assertNotSame(b1, book);
+ assertEquals(b1.getName(), book.getName());
+ }
+
+ @Test
public void testPostCollectionOfBooksWebClient() throws Exception {
String endpointAddress =