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 F2B4E10EB5 for ; Tue, 19 Nov 2013 15:24:32 +0000 (UTC) Received: (qmail 7924 invoked by uid 500); 19 Nov 2013 15:24:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 7812 invoked by uid 500); 19 Nov 2013 15:24: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 7805 invoked by uid 99); 19 Nov 2013 15:24:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 15:24: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; Tue, 19 Nov 2013 15:24:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4DC4E2388A3D; Tue, 19 Nov 2013 15:24:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131119152402.4DC4E2388A3D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); } /**