You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/11/30 01:42:39 UTC
svn commit: r1208159 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ rt/fr...
Author: dkulp
Date: Wed Nov 30 00:42:38 2011
New Revision: 1208159
URL: http://svn.apache.org/viewvc?rev=1208159&view=rev
Log:
Merged revisions 1206862 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1206862 | bimargulies | 2011-11-27 17:07:53 -0500 (Sun, 27 Nov 2011) | 1 line
CXF-3936: fix name of new param to be 'required'
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java?rev=1208159&r1=1208158&r2=1208159&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java Wed Nov 30 00:42:38 2011
@@ -44,7 +44,7 @@ public @interface Multipart {
* the {@link org.apache.cxf.jaxrs.provider.MultipartProvider}
* throws a {@link javax.ws.rs.WebApplicationException}
* with status 400. If this option is set to <strong>false</strong>,
- * the parameter is set to <strong>null</strong>.
+ * the parameter is set to <strong>null</strong> instead.
*/
- boolean errorIfMissing() default true;
+ boolean required() default true;
}
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java?rev=1208159&r1=1208158&r2=1208159&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java Wed Nov 30 00:42:38 2011
@@ -167,7 +167,7 @@ public class MultipartProvider extends A
Attachment multipart = AttachmentUtils.getMultipart(c, id, mt, infos);
if (multipart != null) {
return fromAttachment(multipart, c, t, anns);
- } else if (id != null && !id.errorIfMissing()) {
+ } else if (id != null && !id.required()) {
/*
* If user asked for a null, give them a null.
*/
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java?rev=1208159&r1=1208158&r2=1208159&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java Wed Nov 30 00:42:38 2011
@@ -150,7 +150,7 @@ public final class FormUtils {
|| cd.getParameter("name") == null) {
Multipart id = AnnotationUtils.getAnnotation(anns, Multipart.class);
- if (id == null || id.errorIfMissing()) {
+ if (id == null || id.required()) {
throw new WebApplicationException(400);
} else {
return;
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java?rev=1208159&r1=1208158&r2=1208159&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java Wed Nov 30 00:42:38 2011
@@ -109,7 +109,7 @@ public final class AttachmentUtils {
return a;
}
}
- if (id.errorIfMissing()) {
+ if (id.required()) {
org.apache.cxf.common.i18n.Message errorMsg =
new org.apache.cxf.common.i18n.Message("MULTTIPART_ID_NOT_FOUND",
BUNDLE,
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java?rev=1208159&r1=1208158&r2=1208159&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java Wed Nov 30 00:42:38 2011
@@ -147,7 +147,7 @@ public class MultipartStore {
@Path("/books/testnullpart")
@Consumes("multipart/form-data")
@Produces("text/plain")
- public String testNullPart(@Multipart(value = "someid", errorIfMissing = false) String value) {
+ public String testNullPart(@Multipart(value = "someid", required = false) String value) {
if (value != null) {
return value;
} else {