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 5E08DF2BC for ; Fri, 22 Mar 2013 15:59:30 +0000 (UTC) Received: (qmail 57336 invoked by uid 500); 22 Mar 2013 15:59:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57269 invoked by uid 500); 22 Mar 2013 15:59:30 -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 57262 invoked by uid 99); 22 Mar 2013 15:59:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 15:59:30 +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; Fri, 22 Mar 2013 15:59:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3831F2388962; Fri, 22 Mar 2013 15:59:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459856 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/ tools/wadl... Date: Fri, 22 Mar 2013 15:59:04 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322155905.3831F2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Mar 22 15:59:04 2013 New Revision: 1459856 URL: http://svn.apache.org/r1459856 Log: Merged revisions 1459728,1459855 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1459728 | sergeyb | 2013-03-22 11:25:35 +0000 (Fri, 22 Mar 2013) | 1 line [CXF-4912] Initial support for the wadl parameter validation ........ r1459855 | sergeyb | 2013-03-22 15:54:12 +0000 (Fri, 22 Mar 2013) | 1 line [CXF-4915] Optimizing HttpHeaders to create a single extra Map only ........ Added: cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/ValidateWadlTest.java - copied unchanged from r1459728, cxf/trunk/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/ValidateWadlTest.java cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/invalidParamStyle.xml - copied unchanged from r1459728, cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/invalidParamStyle.xml Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1459728,1459855 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java?rev=1459856&r1=1459855&r2=1459856&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java Fri Mar 22 15:59:04 2013 @@ -26,12 +26,12 @@ import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -41,6 +41,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxrs.utils.HttpUtils; import org.apache.cxf.jaxrs.utils.JAXRSUtils; import org.apache.cxf.message.Message; @@ -75,13 +76,13 @@ public class HttpHeadersImpl implements private Message message; - private MultivaluedMap headers; - - @SuppressWarnings("unchecked") + private Map> headers; public HttpHeadersImpl(Message message) { this.message = message; - this.headers = new MetadataMap( - (Map>)message.get(Message.PROTOCOL_HEADERS), true, true); + this.headers = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS)); + if (headers == null) { + headers = Collections.emptyMap(); + } } public List getAcceptableMediaTypes() { @@ -126,11 +127,6 @@ public class HttpHeadersImpl implements } } - private boolean splitIndividualValue() { - Object property = message.getContextualProperty(HEADER_SPLIT_PROPERTY); - return MessageUtils.isTrue(property); - } - public Locale getLanguage() { List values = getListValues(HttpHeaders.CONTENT_LANGUAGE); return values.size() == 0 ? null : HttpUtils.getLocale(values.get(0).trim()); @@ -142,11 +138,12 @@ public class HttpHeadersImpl implements } public MultivaluedMap getRequestHeaders() { - Map> newHeaders = new LinkedHashMap>(); + Map> newHeaders = + new TreeMap>(String.CASE_INSENSITIVE_ORDER); for (Map.Entry> entry : headers.entrySet()) { newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey())); } - return new MetadataMap(newHeaders, true, true); + return new MetadataMap(Collections.unmodifiableMap(newHeaders), false); } public List getAcceptableLanguages() { @@ -185,20 +182,19 @@ public class HttpHeadersImpl implements if (values == null || values.isEmpty() || values.get(0) == null) { return Collections.emptyList(); } - if (HttpUtils.isDateRelatedHeader(name)) { + boolean splitIndividualValue + = MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY)); + if (!splitIndividualValue + || HttpUtils.isDateRelatedHeader(name)) { return values; } - String sep = HttpHeaders.COOKIE.equalsIgnoreCase(name) ? getCookieSeparator() : DEFAULT_SEPARATOR; List ls = new LinkedList(); for (String value : values) { if (value == null) { continue; } - if (splitIndividualValue()) { - ls.addAll(getHeaderValues(name, value, sep)); - } else { - ls.add(value); - } + String sep = HttpHeaders.COOKIE.equalsIgnoreCase(name) ? getCookieSeparator() : DEFAULT_SEPARATOR; + ls.addAll(getHeaderValues(name, value, sep)); } return ls; } Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java?rev=1459856&r1=1459855&r2=1459856&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java Fri Mar 22 15:59:04 2013 @@ -46,7 +46,11 @@ public class MetadataMap implement } public MetadataMap(Map> store) { - this(store, false, false); + this(store, true); + } + + public MetadataMap(Map> store, boolean copy) { + this(store, copy, false, false); } public MetadataMap(boolean readOnly, boolean caseInsensitive) { Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java?rev=1459856&r1=1459855&r2=1459856&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java Fri Mar 22 15:59:04 2013 @@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.impl; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -189,6 +190,17 @@ public class HttpHeadersImplTest extends } @Test + public void testGetContentTypeLowCase() throws Exception { + + Message m = new MessageImpl(); + m.put(Message.PROTOCOL_HEADERS, + Collections.singletonMap("content-type", + Collections.singletonList("text/plain"))); + HttpHeaders h = new HttpHeadersImpl(m); + assertEquals("text/plain", h.getRequestHeaders().getFirst("Content-Type")); + } + + @Test public void testGetDate() throws Exception { Message m = new MessageImpl(); Modified: cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java?rev=1459856&r1=1459855&r2=1459856&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java (original) +++ cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java Fri Mar 22 15:59:04 2013 @@ -95,6 +95,7 @@ import org.apache.cxf.jaxrs.utils.JAXRSU import org.apache.cxf.jaxrs.utils.ResourceUtils; import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.staxutils.StaxUtils; +import org.apache.cxf.tools.common.ToolException; import org.apache.ws.commons.schema.XmlSchema; public class SourceGenerator { @@ -120,6 +121,7 @@ public class SourceGenerator { FormParam.class)); private static final Map> HTTP_METHOD_ANNOTATIONS; private static final Map> PARAM_ANNOTATIONS; + private static final String PLAIN_PARAM_STYLE = "plain"; private static final Set RESOURCE_LEVEL_PARAMS; private static final Map AUTOBOXED_PRIMITIVES_MAP; private static final Map XSD_SPECIFIC_TYPE_MAP; @@ -919,7 +921,8 @@ public class SourceGenerator { for (int i = 0; i < inParamEls.size(); i++) { Element paramEl = inParamEls.get(i); - Class paramAnn = PARAM_ANNOTATIONS.get(paramEl.getAttribute("style")); + + Class paramAnn = getParamAnnotation(paramEl.getAttribute("style")); if (paramAnn == QueryParam.class && form) { paramAnn = FormParam.class; } @@ -1002,6 +1005,18 @@ public class SourceGenerator { } } + private Class getParamAnnotation(String paramStyle) { + Class paramAnn = PARAM_ANNOTATIONS.get(paramStyle); + if (paramAnn == null) { + String error = "Unsupported parameter style: " + paramStyle; + if (PLAIN_PARAM_STYLE.equals(paramStyle)) { + error += ", plain style parameters have to be wrapped by representations"; + } + throw new ToolException(error); + } + return paramAnn; + } + private void generateEnumClass(String clsName, List options, File src, String classPackage) { StringBuilder sbImports = new StringBuilder(); StringBuilder sbCode = new StringBuilder();