cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1543453 - in /cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client: AbstractClient.java Client.java WebClient.java
Date Tue, 19 Nov 2013 15:24:02 GMT
Author: sergeyb
Date: Tue Nov 19 15:24:01 2013
New Revision: 1543453

URL: http://svn.apache.org/r1543453
Log:
[CXF-5399] Moving WebClient.query to Client

Modified:
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1543453&r1=1543452&r2=1543453&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Tue
Nov 19 15:24:01 2013
@@ -110,6 +110,15 @@ public abstract class AbstractClient imp
     protected AbstractClient(ClientState initialState) {
         this.state = initialState;
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public Client query(String name, Object ...values) {
+        addMatrixQueryParamsToBuilder(getCurrentBuilder(), name, ParameterType.QUERY, values);
+        return this;
+    }
+    
     /**
      * {@inheritDoc}
      */

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java?rev=1543453&r1=1543452&r2=1543453&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java Tue Nov 19
15:24:01 2013
@@ -113,6 +113,14 @@ public interface Client {
     Client cookie(Cookie cookie);
     
     /**
+     * Updates the current URI query parameters
+     * @param name query name
+     * @param values query values
+     * @return updated WebClient
+     */
+    Client query(String name, Object ...values);
+    
+    /**
      * Sets arbitrary HTTP Header
      * @param name header name
      * @param values list of header values

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1543453&r1=1543452&r2=1543453&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Tue Nov
19 15:24:01 2013
@@ -616,15 +616,9 @@ public class WebClient extends AbstractC
         return path(u.getRawPath());
     }
     
-    /**
-     * Updates the current URI query parameters
-     * @param name query name
-     * @param values query values
-     * @return updated WebClient
-     */
+    @Override
     public WebClient query(String name, Object ...values) {
-        addMatrixQueryParamsToBuilder(getCurrentBuilder(), name, ParameterType.QUERY, values);
-        return this;
+        return (WebClient)super.query(name, values);
     }
     
     /**



Mime
View raw message