Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5B8A7BF9 for ; Wed, 21 Dec 2011 13:11:41 +0000 (UTC) Received: (qmail 47633 invoked by uid 500); 21 Dec 2011 13:11:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47581 invoked by uid 500); 21 Dec 2011 13:11:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 47574 invoked by uid 99); 21 Dec 2011 13:11:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 13:11:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 13:11:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 01166238897D for ; Wed, 21 Dec 2011 13:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221709 - in /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs: model/wadl/WadlGenerator.java utils/ResourceUtils.java Date: Wed, 21 Dec 2011 13:11:18 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111221131119.01166238897D@eris.apache.org> Author: sergeyb Date: Wed Dec 21 13:11:18 2011 New Revision: 1221709 URL: http://svn.apache.org/viewvc?rev=1221709&view=rev Log: [CXF-3903] Fixing a regression to do with converting Multipart params to FormParams too early for the benefit of WADLGenerator Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1221709&r1=1221708&r2=1221709&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Wed Dec 21 13:11:18 2011 @@ -85,6 +85,7 @@ import org.apache.cxf.jaxb.JAXBUtils; import org.apache.cxf.jaxrs.JAXRSServiceImpl; import org.apache.cxf.jaxrs.ext.Oneway; import org.apache.cxf.jaxrs.ext.RequestHandler; +import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.apache.cxf.jaxrs.ext.xml.XMLSource; import org.apache.cxf.jaxrs.impl.HttpHeadersImpl; import org.apache.cxf.jaxrs.impl.UriInfoImpl; @@ -590,11 +591,19 @@ public class WadlGenerator implements Re protected void doWriteParam(StringBuilder sb, Parameter pm, Class type, Type genericType, String paramName, Annotation[] anns, boolean isJson) { + ParameterType pType = pm.getType(); + boolean isForm = isFormParameter(pm, type, anns); + if (paramName == null && isForm) { + Multipart m = AnnotationUtils.getAnnotation(anns, Multipart.class); + if (m != null) { + paramName = m.value(); + } + } sb.append(""); } else { sb.append(">"); - for (Parameter pm : ori.getParameters()) { - if (pm.getType() == ParameterType.FORM) { - writeParam(sb, pm, ori, false); + List params = ori.getParameters(); + for (int i = 0; i < params.size(); i++) { + if (isFormParameter(params.get(i), + getMethod(ori).getParameterTypes()[i], + getMethod(ori).getParameterAnnotations()[i])) { + writeParam(sb, params.get(i), ori, false); } } sb.append(""); @@ -967,7 +979,9 @@ public class WadlGenerator implements Re for (Parameter p : ori.getParameters()) { if (p.getType() == ParameterType.FORM || p.getType() == ParameterType.REQUEST_BODY - && getMethod(ori).getParameterTypes()[p.getIndex()] == MultivaluedMap.class) { + && (getMethod(ori).getParameterTypes()[p.getIndex()] == MultivaluedMap.class + || AnnotationUtils.getAnnotation(getMethod(ori).getParameterAnnotations()[p.getIndex()], + Multipart.class) != null)) { return true; } } @@ -975,14 +989,23 @@ public class WadlGenerator implements Re } private Class getFormClass(OperationResourceInfo ori) { - for (Parameter p : ori.getParameters()) { - if (p.getType() == ParameterType.FORM) { + List params = ori.getParameters(); + for (int i = 0; i < params.size(); i++) { + if (isFormParameter(params.get(i), + getMethod(ori).getParameterTypes()[i], + getMethod(ori).getParameterAnnotations()[i])) { return null; } } return MultivaluedMap.class; } + private boolean isFormParameter(Parameter pm, Class type, Annotation[] anns) { + return ParameterType.FORM == pm.getType() || ParameterType.REQUEST_BODY == pm.getType() + && AnnotationUtils.getAnnotation(anns, Multipart.class) != null + && InjectionUtils.isPrimitive(type); + } + // TODO : can we reuse this block with JAXBBinding somehow ? public boolean addSchemaDocument(SchemaCollection col, Document d, Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1221709&r1=1221708&r2=1221709&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java Wed Dec 21 13:11:18 2011 @@ -73,7 +73,6 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.jaxb.JAXBUtils; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.apache.cxf.jaxrs.lifecycle.PerRequestResourceProvider; import org.apache.cxf.jaxrs.lifecycle.ResourceProvider; import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; @@ -318,18 +317,9 @@ public final class ResourceUtils { return new Parameter(ParameterType.MATRIX, index, m.value(), isEncoded, dValue); } - Parameter formParam = null; FormParam f = AnnotationUtils.getAnnotation(anns, FormParam.class); if (f != null) { - formParam = new Parameter(ParameterType.FORM, index, f.value(), isEncoded, dValue); - } else { - Multipart multipart = AnnotationUtils.getAnnotation(anns, Multipart.class); - if (multipart != null && InjectionUtils.isPrimitive(type)) { - formParam = new Parameter(ParameterType.FORM, index, multipart.value(), isEncoded, dValue); - } - } - if (formParam != null) { - return formParam; + return new Parameter(ParameterType.FORM, index, f.value(), isEncoded, dValue); } HeaderParam h = AnnotationUtils.getAnnotation(anns, HeaderParam.class);