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 B03CA187D2 for ; Wed, 15 Jul 2015 14:34:27 +0000 (UTC) Received: (qmail 23328 invoked by uid 500); 15 Jul 2015 14:34:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23268 invoked by uid 500); 15 Jul 2015 14:34:27 -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 23257 invoked by uid 99); 15 Jul 2015 14:34:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jul 2015 14:34:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 689D8DFFF0; Wed, 15 Jul 2015 14:34:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <8c94d2a4c20b40b6a8e684dd60bb8e28@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Adding a local transport test with Jackson Date: Wed, 15 Jul 2015 14:34:27 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a5f83ebe4 -> 02ec499af Adding a local transport test with Jackson Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/02ec499a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02ec499a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02ec499a Branch: refs/heads/3.0.x-fixes Commit: 02ec499af6967608692f0c534805c3260aa65d01 Parents: a5f83eb Author: Sergey Beryozkin Authored: Wed Jul 15 17:32:41 2015 +0300 Committer: Sergey Beryozkin Committed: Wed Jul 15 17:33:53 2015 +0300 ---------------------------------------------------------------------- .../org/apache/cxf/systest/jaxrs/BookStore.java | 7 +++++- .../systest/jaxrs/JAXRSLocalTransportTest.java | 24 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/02ec499a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java index 01a5c75..2684b98 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java @@ -157,7 +157,12 @@ public class BookStore { public void preDestroy() { //System.out.println("PreDestroy called"); } - + @GET + @Path("/booktype") + @Produces("application/json") + public BookType getBookType() { + return new BookType("root", 124L); + } @GET @Path("/") public Book getBookRoot() { http://git-wip-us.apache.org/repos/asf/cxf/blob/02ec499a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java index 05229fd..0245cb9 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java @@ -21,10 +21,13 @@ package org.apache.cxf.systest.jaxrs; import java.net.URI; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.ws.rs.core.Response; +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; + import org.apache.cxf.endpoint.Server; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.interceptor.Interceptor; @@ -55,6 +58,7 @@ public class JAXRSLocalTransportTest extends AbstractBusClientServerTestBase { new SingletonResourceProvider(new BookStore(), true)); sf.setResourceProvider(BookStoreSpring.class, new SingletonResourceProvider(new BookStoreSpring(), true)); + sf.setProvider(new JacksonJsonProvider()); List> outInts = new ArrayList>(); outInts.add(new CustomOutInterceptor()); sf.setOutInterceptors(outInts); @@ -82,6 +86,15 @@ public class JAXRSLocalTransportTest extends AbstractBusClientServerTestBase { Book book = localProxy.getBook("123"); assertEquals(123L, book.getId()); } + @Test + public void testProxyPipedDispatchGetBookType() throws Exception { + BookStore localProxy = + JAXRSClientFactory.create("local://books", + BookStore.class, + Collections.singletonList(new JacksonJsonProvider())); + BookType book = localProxy.getBookType(); + assertEquals(124L, book.getId()); + } @Test public void testProxyServerInFaultMapped() throws Exception { @@ -191,6 +204,17 @@ public class JAXRSLocalTransportTest extends AbstractBusClientServerTestBase { } @Test + public void testWebClientDirectDispatchBookType() throws Exception { + WebClient localClient = WebClient.create("local://books", + Collections.singletonList(new JacksonJsonProvider())); + + WebClient.getConfig(localClient).getRequestContext().put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE); + localClient.path("bookstore/booktype"); + BookType book = localClient.get(BookType.class); + assertEquals(124L, book.getId()); + } + + @Test public void testWebClientPipedDispatch() throws Exception { WebClient localClient = WebClient.create("local://books"); localClient.accept("text/xml");