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 A446C1023D for ; Mon, 15 Jul 2013 15:35:10 +0000 (UTC) Received: (qmail 40325 invoked by uid 500); 15 Jul 2013 15:35:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40201 invoked by uid 500); 15 Jul 2013 15:35:09 -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 40194 invoked by uid 99); 15 Jul 2013 15:35:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jul 2013 15:35:09 +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, 15 Jul 2013 15:35:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9F87E23888A6; Mon, 15 Jul 2013 15:34:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1503302 - in /cxf/branches/2.7.x-fixes: ./ 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, 15 Jul 2013 15:34:47 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130715153447.9F87E23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Jul 15 15:34:47 2013 New Revision: 1503302 URL: http://svn.apache.org/r1503302 Log: Merged revisions 1503291 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1503291 | sergeyb | 2013-07-15 16:20:15 +0100 (Mon, 15 Jul 2013) | 1 line [CXF-5130] Adding simple WebClient SyncInvoker link ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1503291 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1503302&r1=1503301&r2=1503302&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Mon Jul 15 15:34:47 2013 @@ -31,11 +31,13 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Future; +import javax.ws.rs.HttpMethod; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.AsyncInvoker; import javax.ws.rs.client.ClientException; import javax.ws.rs.client.Entity; import javax.ws.rs.client.InvocationCallback; +import javax.ws.rs.client.SyncInvoker; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.GenericEntity; @@ -1211,11 +1213,16 @@ public class WebClient extends AbstractC } } - // Async related code, consider pushing most of it to AbstractClient + // Link to JAX-RS 2.0 AsyncInvoker public AsyncInvoker async() { return new AsyncInvokerImpl(); } + // Link to JAX-RS 2.0 SyncInvoker + public SyncInvoker sync() { + return new SyncInvokerImpl(); + } + class ClientAsyncResponseInterceptor extends AbstractPhaseInterceptor { public ClientAsyncResponseInterceptor() { super(Phase.UNMARSHAL); @@ -1238,6 +1245,16 @@ public class WebClient extends AbstractC } } + + private void setEntityHeaders(Entity entity) { + type(entity.getMediaType()); + if (entity.getLanguage() != null) { + language(entity.getLanguage().toString()); + } + if (entity.getEncoding() != null) { + encoding(entity.getEncoding()); + } + } class AsyncInvokerImpl implements AsyncInvoker { @@ -1399,34 +1416,154 @@ public class WebClient extends AbstractC @Override public Future method(String name, Entity entity, Class responseType) { - setEntityHeaders(entity); + WebClient.this.setEntityHeaders(entity); return doInvokeAsync(name, entity.getEntity(), entity.getEntity().getClass(), null, responseType, responseType, null); } @Override public Future method(String name, Entity entity, GenericType responseType) { - setEntityHeaders(entity); + WebClient.this.setEntityHeaders(entity); return doInvokeAsync(name, entity.getEntity(), entity.getEntity().getClass(), null, responseType.getRawType(), responseType.getType(), null); } @Override public Future method(String name, Entity entity, InvocationCallback callback) { - setEntityHeaders(entity); + WebClient.this.setEntityHeaders(entity); return doInvokeAsyncCallback(name, entity.getEntity(), entity.getEntity().getClass(), null, callback); } - - private void setEntityHeaders(Entity entity) { - WebClient.this.type(entity.getMediaType()); - if (entity.getLanguage() != null) { - WebClient.this.language(entity.getLanguage().toString()); - } - if (entity.getEncoding() != null) { - WebClient.this.encoding(entity.getEncoding()); - } - } } + + class SyncInvokerImpl implements SyncInvoker { + + @Override + public Response delete() { + return method(HttpMethod.DELETE); + } + + @Override + public T delete(Class cls) { + return method(HttpMethod.DELETE, cls); + } + + @Override + public T delete(GenericType genericType) { + return method(HttpMethod.DELETE, genericType); + } + + @Override + public Response get() { + return method(HttpMethod.GET); + } + + @Override + public T get(Class cls) { + return method(HttpMethod.GET, cls); + } + + @Override + public T get(GenericType genericType) { + return method(HttpMethod.GET, genericType); + } + + @Override + public Response head() { + return method(HttpMethod.HEAD); + } + + @Override + public Response options() { + return method(HttpMethod.OPTIONS); + } + + @Override + public T options(Class cls) { + return method(HttpMethod.OPTIONS, cls); + } + + @Override + public T options(GenericType genericType) { + return method(HttpMethod.OPTIONS, genericType); + } + + @Override + public Response post(Entity entity) { + return method(HttpMethod.POST, entity); + } + + @Override + public T post(Entity entity, Class cls) { + return method(HttpMethod.POST, entity, cls); + } + + @Override + public T post(Entity entity, GenericType genericType) { + return method(HttpMethod.POST, genericType); + } + + @Override + public Response put(Entity entity) { + return method(HttpMethod.PUT, entity); + } + + @Override + public T put(Entity entity, Class cls) { + return method(HttpMethod.PUT, entity, cls); + } + + @Override + public T put(Entity entity, GenericType genericType) { + return method(HttpMethod.PUT, entity, genericType); + } + + @Override + public Response trace() { + return method("TRACE"); + } + + @Override + public T trace(Class cls) { + return method("TRACE", cls); + } + + @Override + public T trace(GenericType genericType) { + return method("TRACE", genericType); + } + + @Override + public Response method(String method) { + return method(method, Response.class); + } + + @Override + public T method(String method, Class cls) { + return invoke(method, null, cls); + } + + @Override + public T method(String method, GenericType genericType) { + return invoke(method, null, genericType); + } + + @Override + public Response method(String method, Entity entity) { + return method(method, entity, Response.class); + } + + @Override + public T method(String method, Entity entity, Class cls) { + WebClient.this.setEntityHeaders(entity); + return invoke(method, entity.getEntity(), cls); + } + + @Override + public T method(String method, Entity entity, GenericType genericType) { + WebClient.this.setEntityHeaders(entity); + return invoke(method, entity.getEntity(), genericType); + } + } } Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1503302&r1=1503301&r2=1503302&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java (original) +++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Mon Jul 15 15:34:47 2013 @@ -95,6 +95,15 @@ public class JAXRS20ClientServerBookTest } @Test + public void testGetBookSyncLink() { + String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple"; + WebClient wc = createWebClient(address); + Book book = wc.sync().get(Book.class); + assertEquals(124L, book.getId()); + validateResponse(wc); + } + + @Test public void testGetBookSyncWithAsync() { String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple"; doTestGetBook(address, true);