Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 349ab460e -> f30091818
[CXF-6638] Fixing a merge and a test in 2.7.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3009181 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3009181 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3009181 Branch: refs/heads/2.7.x-fixes Commit: f30091818d98350a4dfcfb06cd8fc624ecd5c6f8 Parents: 349ab46 Author: Sergey Beryozkin <[email protected]> Authored: Tue Oct 13 17:15:53 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Oct 13 17:15:53 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/systest/jaxrs/BookStore.java | 9 +++++++++ .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 14 -------------- 2 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f3009181/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 3e4b0a9..6195701 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 @@ -89,6 +89,7 @@ import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.jaxrs.ext.Nullable; import org.apache.cxf.jaxrs.ext.Oneway; +import org.apache.cxf.jaxrs.ext.PATCH; import org.apache.cxf.jaxrs.ext.StreamingResponse; import org.apache.cxf.jaxrs.ext.search.QueryContext; import org.apache.cxf.jaxrs.ext.search.SearchCondition; @@ -253,6 +254,14 @@ public class BookStore { return book; } + @PATCH + @Path("/patch") + @Produces("application/xml") + @Consumes("application/xml") + public Response patchBook(Book book) { + return Response.ok(book).build(); + } + @DELETE @Path("/deletebody") @Produces("application/xml") http://git-wip-us.apache.org/repos/asf/cxf/blob/f3009181/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java index 9355b0e..9e91e52 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java @@ -85,20 +85,6 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase { } @Test - public void testPatchBookInputStream() throws Exception { - String address = "http://localhost:"; + PORT + "/bookstore/patch"; - WebClient wc = WebClient.create(address); - wc.type("application/xml"); - WebClient.getConfig(wc).getRequestContext().put("use.async.http.conduit", true); - Book book = wc.invoke("PATCH", - new ByteArrayInputStream( - "<Book><name>Patch</name><id>123</id></Book>".getBytes()), - Book.class); - assertEquals("Patch", book.getName()); - wc.close(); - } - - @Test public void testDeleteWithBody() throws Exception { String address = "http://localhost:"; + PORT + "/bookstore/deletebody"; WebClient wc = WebClient.create(address);
