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/10/18 20:28:37 UTC
svn commit: r1533583 - in /cxf/branches/2.7.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: sergeyb
Date: Fri Oct 18 18:28:36 2013
New Revision: 1533583
URL: http://svn.apache.org/r1533583
Log:
Merged revisions 1533576 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1533576 | sergeyb | 2013-10-18 19:15:45 +0100 (Fri, 18 Oct 2013) | 1 line
[CXF-5337] Relaxing HttpCondiit to allow DELETE with bodies
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1533576
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1533583&r1=1533582&r2=1533583&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Oct 18 18:28:36 2013
@@ -172,7 +172,7 @@ public abstract class HTTPConduit
private static final String HTTP_POST_METHOD = "POST";
private static final String HTTP_PUT_METHOD = "PUT";
private static final Set<String> KNOWN_HTTP_VERBS_WITH_NO_CONTENT =
- new HashSet<String>(Arrays.asList(new String[]{"GET", "DELETE", "HEAD", "OPTIONS", "TRACE"}));
+ new HashSet<String>(Arrays.asList(new String[]{"GET", "HEAD", "OPTIONS", "TRACE"}));
/**
* This constant is the Message(Map) key for a list of visited URLs that
* is used in redirect loop protection.
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1533583&r1=1533582&r2=1533583&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Fri Oct 18 18:28:36 2013
@@ -215,6 +215,14 @@ public class BookStore {
return book;
}
+ @DELETE
+ @Path("/deletebody")
+ @Produces("application/xml")
+ @Consumes("application/xml")
+ public Book deleteBodyBook(Book book) {
+ return book;
+ }
+
@POST
@Path("/emptyform")
@Produces("text/plain")
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java?rev=1533583&r1=1533582&r2=1533583&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java Fri Oct 18 18:28:36 2013
@@ -70,6 +70,16 @@ public class JAXRSAsyncClientTest extend
}
@Test
+ public void testDeleteWithBody() throws Exception {
+ String address = "http://localhost:" + PORT + "/bookstore/deletebody";
+ WebClient wc = WebClient.create(address);
+ wc.type("application/xml").accept("application/xml");
+ WebClient.getConfig(wc).getRequestContext().put("use.async.http.conduit", true);
+ Book book = wc.invoke("DELETE", new Book("Delete", 123L), Book.class);
+ assertEquals("Delete", book.getName());
+ }
+
+ @Test
public void testRetrieveBookCustomMethodAsync() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/retrieve";
WebClient wc = WebClient.create(address);