Repository: cxf Updated Branches: refs/heads/3.1.x-fixes f4d5a6cf1 -> f0f937e51
[CXF-6901] Fixing an issue with resolving the query templates Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f0f937e5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f0f937e5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f0f937e5 Branch: refs/heads/3.1.x-fixes Commit: f0f937e5174d10e70b9681ddf56870904d9e020a Parents: f4d5a6c Author: Sergey Beryozkin <[email protected]> Authored: Mon May 16 13:05:19 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 16 13:06:50 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 2 +- .../java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f0f937e5/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java index 261351b..e9084ad 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java @@ -291,7 +291,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable { ? Collections.<String>emptySet() : new HashSet<String>(); for (String var : uniqueVars) { - boolean resolvedPathVarHasToBeEncoded = !isQuery && alreadyResolvedTsPathEnc.containsKey(var); + boolean resolvedPathVarHasToBeEncoded = alreadyResolvedTsPathEnc.containsKey(var); boolean varValueHasToBeEncoded = resolvedPathVarHasToBeEncoded || alreadyResolvedTs.containsKey(var); Map<String, Object> resolved = !varValueHasToBeEncoded ? alreadyResolvedTsEnc http://git-wip-us.apache.org/repos/asf/cxf/blob/f0f937e5/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java index 2bf7829..f574701 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java @@ -265,6 +265,13 @@ public class UriBuilderImplTest extends Assert { .build("valueA", "valueB"); assertEquals("/index.jsp?a=valueA&b=valueB", uri.toString()); } + + @Test + public void testResolveTemplateInQuery() { + String uri = UriBuilder.fromPath("my/path").queryParam("qp", + "{param}").resolveTemplate("param", "value").toTemplate(); + assertEquals("my/path?qp=value", uri.toString()); + } @Test(expected = IllegalArgumentException.class) public void testQueryParamWithMissingTemplateValues() {
