Author: sergeyb
Date: Tue Mar 26 09:29:24 2013
New Revision: 1461035
URL: http://svn.apache.org/r1461035
Log:
[CXF-4912] Getting multiple declared exceptions checked by the client proxy,
patch on behalf of Parwiz Rezai applied with minor modifications
Modified:
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Modified:
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1461035&r1=1461034&r2=1461035&view=diff
==============================================================================
---
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
(original)
+++
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Tue Mar 26 09:29:24 2013
@@ -275,13 +275,19 @@ public class ClientProxyImpl extends Abs
int status = r.getStatus();
if (status >= 300) {
- ResponseExceptionMapper<?> mapper = findExceptionMapper(m,
inMessage);
- if (mapper != null) {
- t = mapper.fromResponse(r);
- if (t != null) {
- throw t;
+ Class<?>[] exTypes = m.getExceptionTypes();
+ if (exTypes.length == 0) {
+ exTypes = new Class[]{WebApplicationException.class};
+ }
+ for (Class<?> exType : exTypes) {
+ ResponseExceptionMapper<?> mapper =
findExceptionMapper(inMessage, exType);
+ if (mapper != null) {
+ t = mapper.fromResponse(r);
+ if (t != null) {
+ throw t;
+ }
}
- }
+ }
if ((t == null) && (m.getReturnType() == Response.class) &&
(m.getExceptionTypes().length == 0)) {
return;
@@ -306,19 +312,9 @@ public class ClientProxyImpl extends Abs
}
}
- private static ResponseExceptionMapper<?> findExceptionMapper(Method m,
Message message) {
+ private static ResponseExceptionMapper<?> findExceptionMapper(Message
message, Class<?> exType) {
ClientProviderFactory pf = ClientProviderFactory.getInstance(message);
- Class<?>[] exTypes = m.getExceptionTypes();
- if (exTypes.length == 0) {
- exTypes = new Class[]{WebApplicationException.class};
- }
- for (Class<?> exType : exTypes) {
- ResponseExceptionMapper<?> mapper =
pf.createResponseExceptionMapper(exType);
- if (mapper != null) {
- return mapper;
- }
- }
- return null;
+ return pf.createResponseExceptionMapper(exType);
}
private MultivaluedMap<String, String>
setRequestHeaders(MultivaluedMap<String, String> headers,
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1461035&r1=1461034&r2=1461035&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Tue Mar 26 09:29:24 2013
@@ -288,6 +288,24 @@ public class BookStore {
}
@GET
+ @Path("multipleexceptions")
+ public Response getBookWithExceptions(@QueryParam("exception") boolean
notReturned)
+ throws BookNotFoundFault, BookNotReturnedException {
+ if (notReturned) {
+ throw new
WebApplicationException(Response.status(404).header("Status",
"notReturned").build());
+ } else {
+ throw new
WebApplicationException(Response.status(404).header("Status",
"notFound").build());
+ }
+ }
+
+ @GET
+ @Path("multipleexceptions2")
+ public Response getBookWithExceptions2(@QueryParam("exception") boolean
notReturned)
+ throws BookNotReturnedException, BookNotFoundFault {
+ return getBookWithExceptions(notReturned);
+ }
+
+ @GET
@Path("propogateExceptionVar/{i}")
public Book propogateExceptionWithVar() throws BookNotFoundFault {
return null;
@@ -1121,6 +1139,15 @@ public class BookStore {
return
echoBookNameAndHeader(httpHeaders.getRequestHeader("CustomHeader").get(0),
name);
}
+ @POST
+ @Path("/booksecho3")
+ @Consumes("text/plain")
+ @Produces("text/plain")
+ public Response echoBookNameAndHeader3(String name) {
+ return
echoBookNameAndHeader(httpHeaders.getRequestHeader("customheader").get(0),
name);
+ }
+
+
@GET
@Path("/cd/{CDId}/")
public CD getCD() {
@@ -1356,6 +1383,16 @@ public class BookStore {
return id1;
}
}
+
+ public static class BookNotReturnedException extends RuntimeException {
+
+ private static final long serialVersionUID = 4935423670510083220L;
+
+ public BookNotReturnedException(String errorMessage) {
+ super(errorMessage);
+ }
+
+ }
}
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1461035&r1=1461034&r2=1461035&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Tue Mar 26 09:29:24 2013
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -59,6 +60,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.apache.cxf.jaxrs.client.ResponseExceptionMapper;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
@@ -69,6 +71,7 @@ import org.apache.cxf.phase.AbstractPhas
import org.apache.cxf.phase.Phase;
import org.apache.cxf.systest.jaxrs.BookStore.BookInfo;
import org.apache.cxf.systest.jaxrs.BookStore.BookInfoInterface;
+import org.apache.cxf.systest.jaxrs.BookStore.BookNotReturnedException;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.BeforeClass;
@@ -469,6 +472,51 @@ public class JAXRSClientServerBookTest e
}
@Test
+ public void testBookWithMultipleExceptions() throws Exception {
+ List<Object> providers = new LinkedList<Object>();
+ providers.add(new NotReturnedExceptionMapper());
+ providers.add(new NotFoundExceptionMapper());
+ BookStore store = JAXRSClientFactory.create("http://localhost:"; +
PORT,
+ BookStore.class,
+ providers);
+ try {
+ store.getBookWithExceptions(true);
+ fail();
+ } catch (BookNotReturnedException ex) {
+ assertEquals("notReturned", ex.getMessage());
+ }
+ try {
+ store.getBookWithExceptions(false);
+ fail();
+ } catch (BookNotFoundFault ex) {
+ assertEquals("notFound", ex.getMessage());
+ }
+
+ }
+
+ @Test
+ public void testBookWithMultipleExceptions2() throws Exception {
+ List<Object> providers = new LinkedList<Object>();
+ providers.add(new NotReturnedExceptionMapper());
+ providers.add(new NotFoundExceptionMapper());
+ BookStore store = JAXRSClientFactory.create("http://localhost:"; +
PORT,
+ BookStore.class,
+ providers);
+ try {
+ store.getBookWithExceptions2(true);
+ fail();
+ } catch (BookNotReturnedException ex) {
+ assertEquals("notReturned", ex.getMessage());
+ }
+ try {
+ store.getBookWithExceptions2(false);
+ fail();
+ } catch (BookNotFoundFault ex) {
+ assertEquals("notFound", ex.getMessage());
+ }
+ }
+
+ @Test
public void testTempRedirectWebClient() throws Exception {
WebClient client = WebClient.create("http://localhost:"; + PORT +
"/bookstore/tempredirect");
Response r = client.type("*/*").get();
@@ -1206,6 +1254,15 @@ public class JAXRSClientServerBookTest e
}
@Test
+ public void testGetBookLowCaseHeader() throws Exception {
+ WebClient wc = WebClient.create("http://localhost:"; + PORT +
"/bookstore/booksecho3");
+ wc.type("text/plain").accept("text/plain").header("CustomHeader",
"custom");
+ String name = wc.post("book", String.class);
+ assertEquals("book", name);
+ assertEquals("custom",
wc.getResponse().getHeaderString("CustomHeader"));
+ }
+
+ @Test
public void testGetBookSimple() throws Exception {
WebClient wc = WebClient.create("http://localhost:"; + PORT +
"/simplebooks/simple");
Book book = wc.get(Book.class);
@@ -2103,4 +2160,29 @@ public class JAXRSClientServerBookTest e
}
}
+ public static class NotReturnedExceptionMapper implements
ResponseExceptionMapper<BookNotReturnedException> {
+
+ public BookNotReturnedException fromResponse(Response r) {
+ String status = r.getHeaderString("Status");
+ if ("notReturned".equals(status)) {
+ return new BookNotReturnedException(status);
+ } else {
+ return null;
+ }
+ }
+
+ }
+
+ public static class NotFoundExceptionMapper implements
ResponseExceptionMapper<BookNotFoundFault> {
+
+ public BookNotFoundFault fromResponse(Response r) {
+ String status = r.getHeaderString("Status");
+ if ("notFound".equals(status)) {
+ return new BookNotFoundFault(status);
+ } else {
+ return null;
+ }
+ }
+
+ }
}
