Formatting
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3eeba1d3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3eeba1d3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3eeba1d3 Branch: refs/heads/wicket-4774 Commit: 3eeba1d369ac534f8af4dd39fc51a3591bf4ddba Parents: 871d0d1 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu May 2 15:59:41 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu May 2 15:59:41 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/request/Url.java | 21 ++++----- .../java/org/apache/wicket/request/UrlTest.java | 32 +++++++------- 2 files changed, 25 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3eeba1d3/wicket-request/src/main/java/org/apache/wicket/request/Url.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java index 2e24b5c..33accd2 100755 --- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java @@ -712,14 +712,13 @@ public class Url implements Serializable } - result.append(path); - - final String queryString = getQueryString(charset); - if (queryString != null) - { - result.append('?').append(queryString); - } + + final String queryString = getQueryString(charset); + if (queryString != null) + { + result.append('?').append(queryString); + } return result.toString(); } @@ -735,7 +734,6 @@ public class Url implements Serializable return toString(mode, getCharset()); } - /** * Stringizes this url using {@link StringMode#LOCAL} and the specified charset * @@ -1160,9 +1158,9 @@ public class Url implements Serializable /** * return query string part of url in original encoding - * - * @since Wicket 7 - * the return value does not contain any "?" and could be null + * + * @since Wicket 7 + * the return value does not contain any "?" and could be null * @return query string (null if empty) */ public String getQueryString() @@ -1170,7 +1168,6 @@ public class Url implements Serializable return getQueryString(getCharset()); } - /** * Try to reduce url by eliminating '..' and '.' from the path where appropriate (this is * somehow similar to {@link java.io.File#getCanonicalPath()}). Either by different / unexpected http://git-wip-us.apache.org/repos/asf/wicket/blob/3eeba1d3/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java index 49df8de..1565cfe 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java @@ -44,7 +44,7 @@ public class UrlTest extends Assert private void checkQueryParams(Url url, String... params) { - List<QueryParameter> list = new ArrayList<QueryParameter>(); + List<QueryParameter> list = new ArrayList<>(); for (int i = 0; i < params.length; i += 2) { QueryParameter p = new QueryParameter(params[i], params[i + 1]); @@ -912,21 +912,21 @@ public class UrlTest extends Assert url.removeLeadingSegments(3); } - @Test - public void wicket_5114_allowtoStringFullWhenContainingTwoDots() - { - Url url = Url.parse("/mountPoint/whatever.../"); - url.setHost("wicketHost"); - assertEquals("//wicketHost/mountPoint/whatever.../", url.toString(StringMode.FULL)); - } - - @Test(expected = IllegalStateException.class) - public void wicket_5114_throwExceptionWhenToStringFullContainsRelativePathSegment() - { - Url url = Url.parse("/mountPoint/../whatever/"); - url.setHost("wicketHost"); - url.toString(StringMode.FULL); - } + @Test + public void wicket_5114_allowtoStringFullWhenContainingTwoDots() + { + Url url = Url.parse("/mountPoint/whatever.../"); + url.setHost("wicketHost"); + assertEquals("//wicketHost/mountPoint/whatever.../", url.toString(StringMode.FULL)); + } + + @Test(expected = IllegalStateException.class) + public void wicket_5114_throwExceptionWhenToStringFullContainsRelativePathSegment() + { + Url url = Url.parse("/mountPoint/../whatever/"); + url.setHost("wicketHost"); + url.toString(StringMode.FULL); + } @Test public void isContextAbsolute()
