cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r740082 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
Date Mon, 02 Feb 2009 19:17:30 GMT
Author: sergeyb
Date: Mon Feb  2 19:17:29 2009
New Revision: 740082

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

........
  r739990 | sergeyb | 2009-02-02 14:18:15 +0000 (Mon, 02 Feb 2009) | 2 lines
  
  CXF-1991 : 3rd patch from Andrzej Michalec, thanks !
........

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/impl/UriBuilderImpl.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  2 19:17:29 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
+/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

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/impl/UriBuilderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java?rev=740082&r1=740081&r2=740082&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
Mon Feb  2 19:17:29 2009
@@ -48,9 +48,9 @@
     private int port;
     private String host;
     private List<PathSegment> paths;
-    private MultivaluedMap<String, String> matrix;
     private String fragment;
-    private MultivaluedMap<String, String> query;
+    private MultivaluedMap<String, String> query = new MetadataMap<String, String>();
+    private MultivaluedMap<String, String> matrix = new MetadataMap<String, String>();
 
     /**
      * Creates builder with empty URI.
@@ -133,6 +133,7 @@
     public UriBuilder clone() {
         return new UriBuilderImpl(build());
     }
+
     // CHECKSTYLE:ON
 
     @Override
@@ -155,7 +156,14 @@
 
     @Override
     public UriBuilder matrixParam(String name, String value) throws IllegalArgumentException
{
-        matrix.putSingle(name, value);
+        if (name == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        if (value != null) {
+            matrix.add(name, value);
+        } else {
+            matrix.remove(name);
+        }
         return this;
     }
 
@@ -240,22 +248,40 @@
 
     @Override
     public UriBuilder queryParam(String name, String value) throws IllegalArgumentException
{
-        if (query == null) {
-            query = new MetadataMap<String, String>();
+        if (name == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        if (value != null) {
+            query.add(name, value);
+        } else {
+            query.remove(name);
         }
-        query.add(name, value);
         return this;
     }
 
     @Override
     public UriBuilder replaceMatrixParams(String m) throws IllegalArgumentException {
-        matrix = JAXRSUtils.getStructuredParams(m, ";", true);
+        if (m == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        MultivaluedMap<String, String> values = JAXRSUtils.getStructuredParams(m, ";",
true);
+        for (Map.Entry<String, List<String>> entry : values.entrySet()) {
+            matrix.put(entry.getKey(), entry.getValue());
+        }
+        
         return this;
     }
 
     @Override
     public UriBuilder replaceQueryParams(String q) throws IllegalArgumentException {
-        this.query = JAXRSUtils.getStructuredParams(q, "&", true);
+        if (q == null) {
+            throw new IllegalArgumentException("name is null");
+        }
+        MultivaluedMap<String, String> values = JAXRSUtils.getStructuredParams(q, "&",
true);
+        for (Map.Entry<String, List<String>> entry : values.entrySet()) {
+            query.put(entry.getKey(), entry.getValue());
+        }
+        
         return this;
     }
 
@@ -321,6 +347,9 @@
         port = uri.getPort();
         host = uri.getHost();
         paths = JAXRSUtils.getPathSegments(uri.getPath(), false);
+        if (!paths.isEmpty()) {
+            matrix = paths.get(paths.size() - 1).getMatrixParameters();
+        }
         fragment = uri.getFragment();
         query = JAXRSUtils.getStructuredParams(uri.getQuery(), "&", true);
         userInfo = uri.getUserInfo();
@@ -338,25 +367,37 @@
                 sb.append(p);
             }
         }
+        if (!matrix.isEmpty()) {
+            sb.append(';');
+            sb.append(buildParams(matrix, ';'));
+        }
         return sb.toString();
     }
 
     private String buildQuery() {
+        return buildParams(query, '&');
+    }
+
+    
+    /**
+     * Builds param string for query part or matrix part of URI.
+     * 
+     * @param map query or matrix multivalued map
+     * @param separator params separator, '&' for query ';' for matrix
+     * @return stringified params.
+     */
+    private String buildParams(MultivaluedMap<String, String> map, char separator)
{
         StringBuilder b = new StringBuilder();
-        if (query == null) {
-            return null;
-        }
-        
-        for (Iterator<Map.Entry<String, List<String>>> it = query.entrySet().iterator();
it.hasNext();) {
+        for (Iterator<Map.Entry<String, List<String>>> it = map.entrySet().iterator();
it.hasNext();) {
             Map.Entry<String, List<String>> entry = it.next();
-            b.append(entry.getKey()).append('=').append(entry.getValue().get(0));
-            if (it.hasNext()) {
-                b.append('&');
+            for (Iterator<String> sit = entry.getValue().iterator(); sit.hasNext();)
{
+                String val = sit.next();
+                b.append(entry.getKey()).append('=').append(val);
+                if (sit.hasNext() || it.hasNext()) {
+                    b.append(separator);
+                }
             }
         }
         return b.length() > 0 ? b.toString() : null;
     }
-
-
-
 }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java?rev=740082&r1=740081&r2=740082&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
Mon Feb  2 19:17:29 2009
@@ -78,7 +78,7 @@
         URI newUri = new UriBuilderImpl(uri).path("/{a}").build("{foo}");
         assertEquals("URI is not built correctly", new URI("http://zzz/%7Bfoo%7D"), newUri);
     }
-    
+
     @Test
     public void testBuildValuesPct() throws Exception {
         URI uri = new URI("http://zzz");
@@ -96,8 +96,7 @@
         new UriBuilderImpl(uri).path("/{b}/{a}/{b}").build(immutable);
     }
 
-    
-    
+
     @Test
     public void testAddPath() throws Exception {
         URI uri = new URI("http://foo/bar");
@@ -204,4 +203,95 @@
             .queryParam("n2", "v2").fragment("fragment").build();
         assertEquals("URI is not built correctly", uri, newUri);
     }
+
+    
+    @Test
+    public void testReplaceQuery() throws Exception {
+        URI uri = new URI("http://foo/bar?p1=v1");
+        URI newUri = new UriBuilderImpl(uri).replaceQueryParams("p1=nv1").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=nv1"), newUri);
+    }
+
+    @Test
+    public void testReplaceQuery2() throws Exception {
+        URI uri = new URI("http://foo/bar");
+        URI newUri = new UriBuilderImpl(uri).replaceQueryParams("p1=nv1").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=nv1"), newUri);
+    }
+
+    
+    @Test
+    public void testQueryParamVal() throws Exception {
+        URI uri = new URI("http://foo/bar?p1=v1");
+        URI newUri = new UriBuilderImpl(uri).queryParam("p2", "v2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=v1&p2=v2"),
newUri);
+    }
+
+    @Test
+    public void testQueryParamSameNameDiffVal() throws Exception {
+        URI uri = new URI("http://foo/bar?p1=v1");
+        URI newUri = new UriBuilderImpl(uri).queryParam("p1", "v2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=v1&p1=v2"),
newUri);
+    }
+
+        
+    @Test
+    public void testReplaceQueryParamExisting() throws Exception {
+        URI uri = new URI("http://foo/bar?p1=v1");
+        URI newUri = new UriBuilderImpl(uri).replaceQueryParams("p1=nv1").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=nv1"), newUri);
+    }
+
+    @Test
+    public void testReplaceQueryParamExistingMulti() throws Exception {
+        URI uri = new URI("http://foo/bar?p1=v1&p2=v2");
+        URI newUri = new UriBuilderImpl(uri).replaceQueryParams("p1=nv1&p1=nv2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar?p1=nv1&p1=nv2&p2=v2"),
newUri);
+    }
+
+    
+
+    @Test
+    public void testReplaceMatrix2() throws Exception {
+        URI uri = new URI("http://foo/bar/");
+        URI newUri = new UriBuilderImpl(uri).replaceMatrixParams("p1=nv1").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar/;p1=nv1"), newUri);
+    }
+
+    @Test
+    public void testMatrixParamNewNameAndVal() throws Exception {
+        URI uri = new URI("http://foo/bar;p1=v1");
+        URI newUri = new UriBuilderImpl(uri).matrixParam("p2", "v2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar;p1=v1;p2=v2"),
newUri);
+    }
+
+    @Test
+    public void testMatrixParamSameNameDiffVal() throws Exception {
+        URI uri = new URI("http://foo/bar;p1=v1");
+        URI newUri = new UriBuilderImpl(uri).matrixParam("p1", "v2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar;p1=v1;p1=v2"),
newUri);
+    }
+
+    
+    @Test
+    public void testReplaceMatrixParamExisting() throws Exception {
+        URI uri = new URI("http://foo/bar;p1=v1");
+        URI newUri = new UriBuilderImpl(uri).replaceMatrixParams("p1=nv1").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar;p1=nv1"), newUri);
+    }
+
+    @Test
+    public void testReplaceMatrixParamExistingMulti() throws Exception {
+        URI uri = new URI("http://foo/bar;p1=v1;p2=v2");
+        URI newUri = new UriBuilderImpl(uri).replaceMatrixParams("p1=nv1;p1=nv2").build();
+        assertEquals("URI is not built correctly", new URI("http://foo/bar;p1=nv1;p1=nv2;p2=v2"),
newUri);
+    }
+
+    @Test
+    public void testMatrixNonFinalPathSegment() throws Exception {
+        URI uri = new URI("http://blah/foo;p1=v1/bar");
+        URI newUri = new UriBuilderImpl(uri).build();
+        assertEquals("URI is not built correctly", new URI("http://blah/foo/bar"), newUri);
+    }
+    
 }



Mime
View raw message