You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mo...@apache.org on 2015/11/08 18:15:25 UTC
[26/50] wicket git commit: WICKET-6010 UrlEncoder#FULL_PATH is no
longer used in Wicket
WICKET-6010 UrlEncoder#FULL_PATH is no longer used in Wicket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5d51aedc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5d51aedc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5d51aedc
Branch: refs/heads/lambdas
Commit: 5d51aedc42de72728f72c66f84339d2b96a2d235
Parents: 660023c
Author: Sven Meier <sv...@apache.org>
Authored: Fri Oct 23 12:48:55 2015 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Wed Oct 28 14:36:56 2015 +0100
----------------------------------------------------------------------
.../apache/wicket/util/encoding/UrlEncoder.java | 37 ++------------------
.../wicket/util/encoding/UrlEncoderTest.java | 4 +--
2 files changed, 4 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d51aedc/wicket-util/src/main/java/org/apache/wicket/util/encoding/UrlEncoder.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/encoding/UrlEncoder.java b/wicket-util/src/main/java/org/apache/wicket/util/encoding/UrlEncoder.java
index fb26bc4..d03b7f1 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/encoding/UrlEncoder.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/encoding/UrlEncoder.java
@@ -49,11 +49,7 @@ public class UrlEncoder
/**
* path type
*/
- PATH,
- /**
- * full path type
- */
- FULL_PATH
+ PATH
}
// list of what not to decode
@@ -79,16 +75,6 @@ public class UrlEncoder
public static final UrlEncoder PATH_INSTANCE = new UrlEncoder(Type.PATH);
/**
- * Encoder used to encode all path segments. Querystring will be excluded.<br/>
- * <br/>
- *
- * For example: http://org.acme/foo/thispart/orthispart?butnot=thispart
- */
- public static final UrlEncoder FULL_PATH_INSTANCE = new UrlEncoder(Type.FULL_PATH);
-
- private final Type type;
-
- /**
* Allow subclass to call constructor.
*
* @param type
@@ -144,7 +130,6 @@ public class UrlEncoder
* query =( pchar / "/" / "?" )
*/
- this.type = type;
// unreserved
dontNeedEncoding = new BitSet(256);
int i;
@@ -216,18 +201,6 @@ public class UrlEncoder
// don't encode semicolon because it is used in ;jsessionid=
dontNeedEncoding.set(';');
break;
-
- // same as path, but '/' will not be encoded
- case FULL_PATH :
- // encode ' ' with a % instead of + in path portion
-
- // path component sub-delim values we do not need to escape
- dontNeedEncoding.set('&');
- dontNeedEncoding.set('=');
- dontNeedEncoding.set('+');
-
- dontNeedEncoding.set('/');
- break;
}
}
@@ -270,18 +243,12 @@ public class UrlEncoder
throw new RuntimeException(new UnsupportedEncodingException(charsetName));
}
- boolean stopEncoding = false;
for (int i = 0; i < s.length();)
{
int c = s.charAt(i);
- if ((stopEncoding == false) && (c == '?' && type == Type.FULL_PATH))
- {
- stopEncoding = true;
- }
-
// System.out.println("Examining character: " + c);
- if (stopEncoding || dontNeedEncoding.get(c))
+ if (dontNeedEncoding.get(c))
{
if (c == ' ')
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d51aedc/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
index 4cbbfce..c88e74d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
@@ -33,7 +33,7 @@ public class UrlEncoderTest extends Assert
public void encodeApostrophe()
{
assertEquals("someone%27s%20bad%20url",
- UrlEncoder.FULL_PATH_INSTANCE.encode("someone's bad url", CharEncoding.UTF_8));
+ UrlEncoder.PATH_INSTANCE.encode("someone's bad url", CharEncoding.UTF_8));
}
/**
@@ -53,6 +53,6 @@ public class UrlEncoderTest extends Assert
public void dontStopOnNullByte() throws Exception
{
assertEquals("someone%27s%20badNULL%20url",
- UrlEncoder.FULL_PATH_INSTANCE.encode("someone's bad\0 url", CharEncoding.UTF_8));
+ UrlEncoder.PATH_INSTANCE.encode("someone's bad\0 url", CharEncoding.UTF_8));
}
}