Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C52B4DAAA for ; Mon, 24 Sep 2012 12:23:49 +0000 (UTC) Received: (qmail 61853 invoked by uid 500); 24 Sep 2012 12:23:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 61719 invoked by uid 500); 24 Sep 2012 12:23:48 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 61697 invoked by uid 99); 24 Sep 2012 12:23:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 12:23:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 12:23:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 39674238899C; Mon, 24 Sep 2012 12:23:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1389328 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Date: Mon, 24 Sep 2012 12:23:03 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120924122303.39674238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Sep 24 12:23:02 2012 New Revision: 1389328 URL: http://svn.apache.org/viewvc?rev=1389328&view=rev Log: Adding a test for post async call, and adding a shortcut to WebClient Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1389328&r1=1389327&r2=1389328&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Mon Sep 24 12:23:02 2012 @@ -383,6 +383,16 @@ public class WebClient extends AbstractC } /** + * Does HTTP Async POST invocation and returns Future. + * Shortcut for async().get(InvocationCallback) + * @param callback invocation callback + * @return the future + */ + public Future post(Object body, InvocationCallback callback) { + return doInvokeAsyncCallback("POST", body, body.getClass(), getClass(), callback); + } + + /** * Does HTTP invocation and returns a collection of typed objects * @param httpMethod HTTP method * @param body request body, can be null Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1389328&r1=1389327&r2=1389328&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Mon Sep 24 12:23:02 2012 @@ -31,6 +31,7 @@ import javax.ws.rs.client.ClientRequestC import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseContext; import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.client.Entity; import javax.ws.rs.client.InvocationCallback; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -117,6 +118,17 @@ public class JAXRS20ClientServerBookTest return wc; } + private WebClient createWebClientPost(String address) { + List providers = new ArrayList(); + providers.add(new ClientHeaderRequestFilter()); + providers.add(new ClientHeaderResponseFilter()); + providers.add(new ClientReaderInterceptor()); + providers.add(new ClientWriterInterceptor()); + WebClient wc = WebClient.create(address, providers); + WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L); + return wc; + } + private void doTestGetBookAsync(String address, boolean asyncInvoker) throws InterruptedException, ExecutionException { @@ -138,6 +150,27 @@ public class JAXRS20ClientServerBookTest validateResponse(wc); } + private void doTestPostBookAsyncHandler(String address) + throws InterruptedException, ExecutionException { + + WebClient wc = createWebClientPost(address); + + final Holder holder = new Holder(); + final InvocationCallback callback = new InvocationCallback() { + public void completed(Book response) { + holder.value = response; + } + public void failed(ClientException error) { + } + }; + + Future future = wc.post(new Book("async", 126L), callback); + Book book = future.get(); + assertSame(book, holder.value); + assertEquals(124L, book.getId()); + validatePostResponse(wc); + } + private void doTestGetBookAsyncResponse(String address, boolean asyncInvoker) throws InterruptedException, ExecutionException { @@ -168,7 +201,13 @@ public class JAXRS20ClientServerBookTest assertEquals("http://localhost/redirect", response.getHeaderString(HttpHeaders.LOCATION)); } - + private void validatePostResponse(WebClient wc) { + validateResponse(wc); + Response response = wc.getResponse(); + assertEquals("serverRead", response.getHeaderString("ServerReaderInterceptor")); + assertEquals("clientWrite", response.getHeaderString("ClientWriterInterceptor")); + assertEquals("clientRead", response.getHeaderString("ClientReaderInterceptor")); + } @Test public void testClientFiltersLocalResponse() { @@ -188,21 +227,25 @@ public class JAXRS20ClientServerBookTest @Test public void testPostBook() { String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple"; - List providers = new ArrayList(); - providers.add(new ClientHeaderRequestFilter()); - providers.add(new ClientHeaderResponseFilter()); - providers.add(new ClientReaderInterceptor()); - providers.add(new ClientWriterInterceptor()); - WebClient wc = WebClient.create(address, providers); - WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L); + WebClient wc = createWebClientPost(address); Book book = wc.post(new Book("Book", 126L), Book.class); assertEquals(124L, book.getId()); - validateResponse(wc); - - Response response = wc.getResponse(); - assertEquals("serverRead", response.getHeaderString("ServerReaderInterceptor")); - assertEquals("clientWrite", response.getHeaderString("ClientWriterInterceptor")); - assertEquals("clientRead", response.getHeaderString("ClientReaderInterceptor")); + validatePostResponse(wc); + } + + @Test + public void testPostBookAsync() throws Exception { + String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple"; + WebClient wc = createWebClientPost(address); + Future future = wc.async().post(Entity.xml(new Book("Book", 126L)), Book.class); + assertEquals(124L, future.get().getId()); + validatePostResponse(wc); + } + + @Test + public void testPostBookAsyncHandler() throws Exception { + String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple"; + doTestPostBookAsyncHandler(address); } private static class ClientCacheRequestFilter implements ClientRequestFilter {