Author: sergeyb
Date: Fri Jan 16 02:59:50 2009
New Revision: 734970
URL: http://svn.apache.org/viewvc?rev=734970&view=rev
Log:
Merged revisions 734965 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r734965 | sergeyb | 2009-01-16 10:43:25 +0000 (Fri, 16 Jan 2009) | 1 line
If WebApplicationException is thrown by custom parameter class then rethrow it
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 16 02:59:50 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,734367,734772
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,734367,734772,734965
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java?rev=734970&r1=734969&r2=734970&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
Fri Jan 16 02:59:50 2009
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.impl.PathSegmentImpl;
import org.apache.cxf.message.Message;
@@ -122,4 +123,12 @@
return sb.toString();
}
+ public static Response.Status getParameterFailureStatus(ParameterType
pType) {
+ if (pType == ParameterType.MATRIX || pType == ParameterType.PATH
+ || pType == ParameterType.QUERY) {
+ return Response.Status.NOT_FOUND;
+ }
+ return Response.Status.BAD_REQUEST;
+ }
+
}
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=734970&r1=734969&r2=734970&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Fri Jan 16 02:59:50 2009
@@ -172,11 +172,13 @@
return c.newInstance(new Object[]{value});
} catch (NoSuchMethodException ex) {
// try valueOf
- } catch (Exception ex) {
+ } catch (WebApplicationException ex) {
+ throw ex;
+ } catch (Exception ex) {
LOG.severe(new
org.apache.cxf.common.i18n.Message("CLASS_CONSTRUCTOR_FAILURE",
BUNDLE,
pClass.getName()).toString());
- throw new WebApplicationException(ex, getFailureStatus(pType));
+ throw new WebApplicationException(ex,
HttpUtils.getParameterFailureStatus(pType));
}
// check for valueOf(String) static methods
@@ -233,7 +235,7 @@
LOG.severe(new
org.apache.cxf.common.i18n.Message("CLASS_VALUE_OF_FAILURE",
BUNDLE,
pClass.getName()).toString());
- throw new WebApplicationException(t, getFailureStatus(pType));
+ throw new WebApplicationException(t,
HttpUtils.getParameterFailureStatus(pType));
}
return null;
}
@@ -500,12 +502,4 @@
InjectionUtils.injectContextField(cri, f, o, value, true);
}
}
-
- public static Response.Status getFailureStatus(ParameterType pType) {
- if (pType == ParameterType.MATRIX || pType == ParameterType.PATH
- || pType == ParameterType.QUERY) {
- return Response.Status.NOT_FOUND;
- }
- return Response.Status.BAD_REQUEST;
- }
}
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java?rev=734970&r1=734969&r2=734970&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
Fri Jan 16 02:59:50 2009
@@ -19,6 +19,8 @@
package org.apache.cxf.jaxrs.utils;
+import javax.ws.rs.core.Response;
+
import org.junit.Assert;
import org.junit.Test;
@@ -36,4 +38,20 @@
}
+ @Test
+ public void testParameterErrorStatus() {
+ assertEquals(Response.Status.NOT_FOUND,
+ HttpUtils.getParameterFailureStatus(ParameterType.PATH));
+ assertEquals(Response.Status.NOT_FOUND,
+ HttpUtils.getParameterFailureStatus(ParameterType.QUERY));
+ assertEquals(Response.Status.NOT_FOUND,
+
HttpUtils.getParameterFailureStatus(ParameterType.MATRIX));
+ assertEquals(Response.Status.BAD_REQUEST,
+
HttpUtils.getParameterFailureStatus(ParameterType.HEADER));
+ assertEquals(Response.Status.BAD_REQUEST,
+ HttpUtils.getParameterFailureStatus(ParameterType.FORM));
+ assertEquals(Response.Status.BAD_REQUEST,
+
HttpUtils.getParameterFailureStatus(ParameterType.COOKIE));
+ }
+
}
