Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8E696200B80 for ; Wed, 14 Sep 2016 15:27:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8D2B9160ABA; Wed, 14 Sep 2016 13:27:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D1B0D160AB4 for ; Wed, 14 Sep 2016 15:27:11 +0200 (CEST) Received: (qmail 86306 invoked by uid 500); 14 Sep 2016 13:27:11 -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 86296 invoked by uid 99); 14 Sep 2016 13:27:11 -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; Wed, 14 Sep 2016 13:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB842E0243; Wed, 14 Sep 2016 13:27:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <99531e482f9c4614912b0beb2b2e6e0b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Using UriBuilder to deal with duplicate forward slashes Date: Wed, 14 Sep 2016 13:27:10 +0000 (UTC) archived-at: Wed, 14 Sep 2016 13:27:12 -0000 Repository: cxf Updated Branches: refs/heads/master 5eb67e159 -> 9810a8448 Using UriBuilder to deal with duplicate forward slashes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9810a844 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9810a844 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9810a844 Branch: refs/heads/master Commit: 9810a844802659199015755027eb51db37afad2b Parents: 5eb67e1 Author: Sergey Beryozkin Authored: Wed Sep 14 14:26:52 2016 +0100 Committer: Sergey Beryozkin Committed: Wed Sep 14 14:26:52 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java | 2 ++ .../rs/security/oauth2/services/AuthorizationMetadataService.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9810a844/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java index d1fb1f5..030548f 100644 --- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java +++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java @@ -71,12 +71,14 @@ public class JsonMapObjectReaderWriter { protected void toJsonInternal(Output out, Map map) { out.append("{"); + formatIfNeeded(out); for (Iterator> it = map.entrySet().iterator(); it.hasNext();) { Map.Entry entry = it.next(); out.append("\"").append(entry.getKey()).append("\""); out.append(":"); toJsonInternal(out, entry.getValue(), it.hasNext()); } + formatIfNeeded(out); out.append("}"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/9810a844/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java index 97c7a53..7e7d05b 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java @@ -25,6 +25,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; +import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter; @@ -76,7 +77,7 @@ public class AuthorizationMetadataService { if (endpointAddress.startsWith("https")) { return endpointAddress; } else { - return baseUri + endpointAddress; + return UriBuilder.fromUri(baseUri).path(endpointAddress).build().toString(); } }