cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r756777 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ rt/frontend/jaxrs/src/main...
Date Fri, 20 Mar 2009 21:52:43 GMT
Author: sergeyb
Date: Fri Mar 20 21:52:43 2009
New Revision: 756777

URL: http://svn.apache.org/viewvc?rev=756777&view=rev
Log:
Merged revisions 756693 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r756693 | sergeyb | 2009-03-20 17:59:55 +0000 (Fri, 20 Mar 2009) | 1 line
  
  JAXRS : case-insensitive retrieval of http headers
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
  (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
  (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 20 21:52:43 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,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743825,743965,743967,744104-744138,744175,744195,744237,744756,745214,745243,745472,745474,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,746947,747026,747070,747217,74
 7386,747390,747406-747407,747454,747649,747766,747806-747846,747986,748159,748192-748193,748223,748305,748313,748597,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749596,749767,749771,749799,749890,749963,750010,750059-750060,750302,750522,750591,750663,750689,750935,750948,751067-751110,751233,751527,751567,751576,751607,751732,751740,751787,751828,751840,751972-751974,752099,752122,752132,752136,752280,752435,752520,752558,752613,752680,752728,752753,752849,752880-752881,752883,752961,752970,752992,753205,753274,753293,753333,753335,753338,753388,755153,755514,755806
+/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,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743825,743965,743967,744104-744138,744175,744195,744237,744756,745214,745243,745472,745474,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,746947,747026,747070,747217,74
 7386,747390,747406-747407,747454,747649,747766,747806-747846,747986,748159,748192-748193,748223,748305,748313,748597,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749596,749767,749771,749799,749890,749963,750010,750059-750060,750302,750522,750591,750663,750689,750935,750948,751067-751110,751233,751527,751567,751576,751607,751732,751740,751787,751828,751840,751972-751974,752099,752122,752132,752136,752280,752435,752520,752558,752613,752680,752728,752753,752849,752880-752881,752883,752961,752970,752992,753205,753274,753293,753333,753335,753338,753388,755153,755514,755806,756693

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 20 21:52:43 2009
@@ -1 +1 @@
-/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java:743825,744104-744138,745472,745474,746947,747026,747070,747390,747407,747806-747846,748193,748597,749596,749963,750010,750522,750663,750948,752099,752280,752435,752520,752970,753274,753333,755514,755806
+/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java:743825,744104-744138,745472,745474,746947,747026,747070,747390,747407,747806-747846,748193,748597,749596,749963,750010,750522,750663,750948,752099,752280,752435,752520,752970,753274,753333,755514,755806,756693

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 20 21:52:43 2009
@@ -1 +1 @@
-/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java:743825,744104-744138,745472,745474,746947,747026,747070,747390,747407,747806-747846,748193,748597,749596,749963,750010,750522,750663,750948,752099,752280,752435,752520,752970,753274,753333,755514,755806
+/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java:743825,744104-744138,745472,745474,746947,747026,747070,747390,747407,747806-747846,748193,748597,749596,749963,750010,750522,750663,750948,752099,752280,752435,752520,752970,753274,753333,755514,755806,756693

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Fri Mar 20 21:52:43 2009
@@ -317,7 +317,8 @@
         }
         if (mbr != null) {
             try {
-                return mbr.readFrom(cls, type, anns, contentType, r.getMetadata(), conn.getInputStream());
+                return mbr.readFrom(cls, type, anns, contentType, 
+                       new MetadataMap<String, Object>(r.getMetadata(), true, true),
conn.getInputStream());
             } catch (Exception ex) {
                 throw new WebApplicationException();
             }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
Fri Mar 20 21:52:43 2009
@@ -343,8 +343,12 @@
     protected Response doInvoke(String httpMethod, Object body, Class<?> responseClass)
{
         
         MultivaluedMap<String, String> headers = getHeaders();
-        if (body != null && headers.getFirst(HttpHeaders.CONTENT_TYPE) == null) {
-            headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_TYPE.toString());
+        if (body != null) {
+            if (headers.getFirst(HttpHeaders.CONTENT_TYPE) == null) {
+                headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_TYPE.toString());
+            }
+        } else {
+            headers.putSingle(HttpHeaders.CONTENT_TYPE, WILDCARD.toString());
         }
         if (responseClass != null && headers.getFirst(HttpHeaders.ACCEPT) == null)
{
             headers.putSingle(HttpHeaders.ACCEPT, MediaType.APPLICATION_XML_TYPE.toString());

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
Fri Mar 20 21:52:43 2009
@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,31 +38,24 @@
 
 public class HttpHeadersImpl implements HttpHeaders {
 
-    private Message m;
     private MultivaluedMap<String, String> headers;
     
     @SuppressWarnings("unchecked")
     public HttpHeadersImpl(Message message) {
-        this.m = message;
-        Map<String, List<String>> mHeaders = (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS);
-        this.headers = mHeaders == null ? new MetadataMap<String, String>()
-                                        : new MetadataMap<String, String>(mHeaders);
+        this.headers = new MetadataMap<String, String>(
+            (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS),
true, true);
     }
     
     public List<MediaType> getAcceptableMediaTypes() {
-        String lValues = headers.getFirst(HttpHeaders.ACCEPT);
-        if (lValues == null) {
+        List<String> lValues = headers.get(HttpHeaders.ACCEPT);
+        if (lValues == null || lValues.isEmpty()) {
             return Collections.emptyList();
         }
-        return JAXRSUtils.sortMediaTypes(lValues); 
+        return JAXRSUtils.sortMediaTypes(lValues.get(0)); 
     }
 
     public Map<String, Cookie> getCookies() {
-        List<String> values = headers.get(HttpHeaders.COOKIE);
-        if (values == null || values.isEmpty()) {
-            return Collections.emptyMap();
-        }
-        String[] cs =  values.get(0).split(",");
+        List<String> cs = getListValues(HttpHeaders.COOKIE);
         Map<String, Cookie> cl = new HashMap<String, Cookie>(); 
         for (String c : cs) {
             Cookie cookie = Cookie.valueOf(c);
@@ -71,31 +65,27 @@
     }
 
     public String getLanguage() {
-        String l = headers.getFirst(HttpHeaders.CONTENT_LANGUAGE);
-        return l == null ? "UTF-8" : l;
+        List<String> values = getListValues(HttpHeaders.CONTENT_LANGUAGE);
+        return values.size() == 0 ? null : values.get(0);
     }
 
     public MediaType getMediaType() {
-        String value = (String)m.get(Message.CONTENT_TYPE);
-        return value == null ? MediaType.valueOf("*/*") : MediaType.valueOf(value);
+        List<String> values = getListValues(HttpHeaders.CONTENT_TYPE);
+        return values.size() == 0 ? null : MediaType.valueOf(values.get(0));
     }
 
     public MultivaluedMap<String, String> getRequestHeaders() {
-        // should we really worry about immutability given that the Message does not ?
-        MultivaluedMap<String, String> map = new MetadataMap<String, String>();
-        for (String key : headers.keySet()) {
-            map.put(key, getRequestHeader(key));
+        Map<String, List<String>> newHeaders = new LinkedHashMap<String, List<String>>();
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            newHeaders.put(entry.getKey(), getListValues(entry.getKey()));
         }
-        return map;
+        return new MetadataMap<String, String>(newHeaders, true, true);
     }
 
     public List<String> getAcceptableLanguages() {
-        List<String> values = headers.get(HttpHeaders.ACCEPT_LANGUAGE);
-        if (values == null || values.isEmpty()) {
-            return Collections.emptyList();
-        }
+        List<String> ls = getListValues(HttpHeaders.ACCEPT_LANGUAGE);
+        
         List<String> newLs = new ArrayList<String>(); 
-        String[] ls =  values.get(0).split(",");
         Map<String, Float> prefs = new HashMap<String, Float>();
         for (String l : ls) {
             String[] pair = l.split(";");
@@ -112,7 +102,7 @@
                 prefs.put(locale, 1F);
             }
         }
-        if (newLs.size() == 1) {
+        if (newLs.size() <= 1) {
             return newLs;
         }
         Collections.sort(newLs, new AcceptLanguageComparator(prefs));
@@ -121,18 +111,26 @@
     }
 
     public List<String> getRequestHeader(String name) {
-        List<String> values = headers.get(name); 
+        return getListValues(name);
+    }
+
+    private List<String> getListValues(String headerName) {
+        List<String> values = headers.get(headerName);
         if (values == null || values.isEmpty()) {
             return Collections.emptyList();
         }
-        List<String> hValues = new ArrayList<String>();
         String[] ls =  values.get(0).split(",");
-        for (String s : ls) {
-            hValues.add(s.trim());
+        if (ls.length == 1) {
+            return Collections.singletonList(ls[0].trim());
+        } else {
+            List<String> newValues = new ArrayList<String>();
+            for (String v : ls) {
+                newValues.add(v.trim());
+            }
+            return newValues;
         }
-        return hValues;
     }
-
+    
     private static class AcceptLanguageComparator implements Comparator<String> {
         private Map<String, Float> prefs;
         

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
Fri Mar 20 21:52:43 2009
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,7 @@
 
 public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
 
+    private boolean caseInsensitive;
     private Map<K, List<V>> m;
     
     public MetadataMap() {
@@ -37,13 +39,29 @@
     }
     
     public MetadataMap(Map<K, List<V>> store) {
+        this(store, false, false);
+    }
+    
+    public MetadataMap(Map<K, List<V>> store, boolean readOnly, boolean caseInsensitive)
{
+        
+        if (!readOnly && caseInsensitive) {
+            throw new IllegalArgumentException(
+                "Case-insensitive keys are only supported for read-only maps at the moment");
+        }
+        this.caseInsensitive = caseInsensitive;
         
         this.m = new LinkedHashMap<K, List<V>>();
         if (store != null) {
             for (Map.Entry<K, List<V>> entry : store.entrySet()) {
-                m.put(entry.getKey(), new ArrayList<V>(entry.getValue()));
+                List<V> values = new ArrayList<V>(entry.getValue());
+                m.put(entry.getKey(), readOnly 
+                      ? Collections.unmodifiableList(values) : values);
             }
         }
+        if (readOnly) {
+            this.m = Collections.unmodifiableMap(m);
+        }
+        
     }
     
     public void add(K key, V value) {
@@ -56,7 +74,7 @@
     }
 
     public V getFirst(K key) {
-        List<V> data = m.get(key);
+        List<V> data = get(key);
         return data == null ? null : data.get(0);
     }
 
@@ -71,7 +89,15 @@
     }
 
     public boolean containsKey(Object key) {
-        return m.containsKey(key);
+        if (!caseInsensitive) {
+            return m.containsKey(key);
+        }
+        for (K theKey : m.keySet()) {
+            if (theKey.toString().toLowerCase().equals(key.toString().toLowerCase())) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public boolean containsValue(Object value) {
@@ -83,7 +109,15 @@
     }
 
     public List<V> get(Object key) {
-        return m.get(key);
+        if (!caseInsensitive) {
+            return m.get(key);
+        }
+        for (Map.Entry<K, List<V>> entry : m.entrySet()) {
+            if (entry.getKey().toString().toLowerCase().equals(key.toString().toLowerCase()))
{
+                return entry.getValue();
+            }
+        }
+        return null;
     }
 
     public boolean isEmpty() {
@@ -128,5 +162,4 @@
         return m.toString();
     }
     
-     
 }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
Fri Mar 20 21:52:43 2009
@@ -164,6 +164,6 @@
         }
         MediaType mt = mc.getHttpHeaders().getMediaType();        
 
-        return mt.isCompatible(MULTIPART_FORM_DATA_TYPE);
+        return mt != null && mt.isCompatible(MULTIPART_FORM_DATA_TYPE);
     }
 }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
Fri Mar 20 21:52:43 2009
@@ -122,6 +122,9 @@
             return false;
         }
         MediaType mt = mc.getHttpHeaders().getMediaType();
+        if (mt == null) {
+            return false;
+        }
         return mt.getType().equals("multipart") && (mt.getSubtype().equals("related")

             || mt.getSubtype().equals("mixed") || mt.getSubtype().equals("alternative"));
     }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
Fri Mar 20 21:52:43 2009
@@ -26,6 +26,7 @@
 
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.message.Message;
@@ -61,6 +62,17 @@
         assertEquals(hs.getFirst("Content-Type"), "*/*");
     }
 
+    public void testMediaType() throws Exception {
+        
+        Message m = control.createMock(Message.class);
+        m.get(Message.PROTOCOL_HEADERS);
+        EasyMock.expectLastCall().andReturn(createHeaders());
+        control.replay();
+        HttpHeaders h = new HttpHeadersImpl(m);
+        assertEquals(MediaType.valueOf("*/*"), h.getMediaType());
+    }
+    
+    @Test
     public void testGetHeader() throws Exception {
         
         Message m = control.createMock(Message.class);
@@ -86,7 +98,7 @@
         EasyMock.expectLastCall().andReturn(createHeaders());
         control.replay();
         HttpHeaders h = new HttpHeadersImpl(m);
-        assertEquals("UTF-8", h.getLanguage());
+        assertNull(h.getLanguage());
     }
     
         
@@ -153,4 +165,32 @@
         hs.put(name, list);
         return hs;
     }
+    
+    @Test
+    public void testUnmodifiableRequestHeaders() throws Exception {
+        
+        Message m = control.createMock(Message.class);
+        m.get(Message.PROTOCOL_HEADERS);
+        MetadataMap<String, String> headers = 
+            createHeader(HttpHeaders.ACCEPT_LANGUAGE, 
+                         "en;q=0.7, en-gb;q=0.8, da");
+        EasyMock.expectLastCall().andReturn(headers);
+        control.replay();
+        HttpHeaders h = new HttpHeadersImpl(m);
+        List<String> languages = h.getAcceptableLanguages();
+        assertEquals(3, languages.size());
+        languages.clear();
+        languages = h.getAcceptableLanguages();
+        assertEquals(3, languages.size());
+        
+        MultivaluedMap<String, String> rHeaders  = h.getRequestHeaders();
+        List<String> acceptL = rHeaders.get(HttpHeaders.ACCEPT_LANGUAGE);
+        assertEquals(3, acceptL.size());
+        try {
+            rHeaders.clear();
+            fail();
+        } catch (UnsupportedOperationException ex) {
+            // expected
+        }
+    }
 }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
Fri Mar 20 21:52:43 2009
@@ -62,6 +62,33 @@
         assertEquals("GetFirst value is wrong", "bar", m.getFirst("baz"));
     }
     
+    @Test
+    public void testCopyAndUpdate() {
+        MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+        m.add("baz", "bar");
+        MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m);
+        m.remove("baz");
+        m.add("baz", "foo");
+        assertEquals("bar", m2.getFirst("baz"));
+        assertEquals("foo", m.getFirst("baz"));
+        
+    }
+    
+    @Test(expected = UnsupportedOperationException.class)
+    public void testReadOnly() {
+        MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+        m.add("baz", "bar");
+        MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true,
false);
+        m2.remove("baz");
+    }
     
-
+    public void testCaseInsensitive() {
+        MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+        m.add("Baz", "bar");
+        MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true,
true);
+        assertEquals("bar", m2.getFirst("baZ"));
+        assertEquals("bar", m2.getFirst("Baz"));
+        assertTrue(m2.containsKey("BaZ"));
+        assertTrue(m2.containsKey("Baz"));
+    }
 }

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=756777&r1=756776&r2=756777&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Fri Mar 20 21:52:43 2009
@@ -737,7 +737,7 @@
         GetMethod get = new GetMethod(address);
         get.setRequestHeader("Accept", acceptType);
         get.setRequestHeader("Accept-Language", "da;q=0.8,en");
-        get.setRequestHeader("BOOK", "1,2,3");
+        get.setRequestHeader("Book", "1,2,3");
         HttpClient httpClient = new HttpClient();
         try {
             int result = httpClient.executeMethod(get);



Mime
View raw message