Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 BE080173AB for ; Fri, 20 Mar 2015 21:30:33 +0000 (UTC) Received: (qmail 37170 invoked by uid 500); 20 Mar 2015 21:30:33 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 37063 invoked by uid 500); 20 Mar 2015 21:30:33 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 36328 invoked by uid 99); 20 Mar 2015 21:30:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 21:30:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DEB1CE194A; Fri, 20 Mar 2015 21:30:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhirajsb@apache.org To: commits@camel.apache.org Date: Fri, 20 Mar 2015 21:30:45 -0000 Message-Id: In-Reply-To: <932ba6327eda404d970684e76b714421@git.apache.org> References: <932ba6327eda404d970684e76b714421@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/17] camel git commit: CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x URISupport.createRemainingURI CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x URISupport.createRemainingURI Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bb3a9e9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bb3a9e9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bb3a9e9 Branch: refs/heads/camel-2.12.x Commit: 9bb3a9e982855bc01366fa149e0837839cb20aeb Parents: 65cd95c Author: Dhiraj Bokde Authored: Mon Feb 23 13:56:52 2015 -0800 Committer: Dhiraj Bokde Committed: Fri Mar 20 14:24:46 2015 -0700 ---------------------------------------------------------------------- .../component/salesforce/internal/client/DefaultRestClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9bb3a9e9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java index 0b06289..9a9f91b 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java @@ -19,12 +19,14 @@ package org.apache.camel.component.salesforce.internal.client; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.net.URI; import java.net.URISyntaxException; import java.net.URLEncoder; import java.util.List; import java.util.Map; import com.thoughtworks.xstream.XStream; + import org.apache.camel.component.salesforce.api.SalesforceException; import org.apache.camel.component.salesforce.api.dto.RestError; import org.apache.camel.component.salesforce.internal.PayloadFormat; @@ -344,7 +346,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient throws UnsupportedEncodingException, URISyntaxException { if (queryParams != null && !queryParams.isEmpty()) { - apexUrl = URISupport.appendParametersToURI(apexUrl, queryParams); + apexUrl = URISupport.createRemainingURI(new URI(apexUrl), queryParams).toString(); } return instanceUrl + SERVICES_APEXREST + apexUrl;