Updated Branches: refs/heads/master eabdfe2d9 -> 622aec556
Modify Strings2.urlDecode to input a string. This is consistent with urlEncode. Also consistently use urlDecoder in DecodingMultimap for values. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/622aec55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/622aec55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/622aec55 Branch: refs/heads/master Commit: 622aec5566a155fd277b125f7a5754b5720a75fe Parents: eabdfe2 Author: Diwaker Gupta <[email protected]> Authored: Thu Aug 1 09:36:40 2013 -0700 Committer: Andrew Phillips <[email protected]> Committed: Thu Aug 22 20:43:32 2013 -0400 ---------------------------------------------------------------------- core/src/main/java/org/jclouds/http/Uris.java | 7 +++++-- core/src/main/java/org/jclouds/util/Strings2.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/622aec55/core/src/main/java/org/jclouds/http/Uris.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/Uris.java b/core/src/main/java/org/jclouds/http/Uris.java index 69d0de3..455f07f 100644 --- a/core/src/main/java/org/jclouds/http/Uris.java +++ b/core/src/main/java/org/jclouds/http/Uris.java @@ -392,13 +392,16 @@ public final class Uris { private final Multimap<String, Object> delegate = LinkedHashMultimap.create(); private final Function<Object, Object> urlDecoder = new Function<Object, Object>() { public Object apply(Object in) { - return urlDecode(in); + if (in == null) { + return null; + } + return urlDecode(in.toString()); } }; @Override public boolean put(String key, Object value) { - return super.put(urlDecode(key), urlDecode(value)); + return super.put(urlDecode(key), urlDecoder.apply(value)); } @Override http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/622aec55/core/src/main/java/org/jclouds/util/Strings2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/util/Strings2.java b/core/src/main/java/org/jclouds/util/Strings2.java index 2a47286..c4561ac 100644 --- a/core/src/main/java/org/jclouds/util/Strings2.java +++ b/core/src/main/java/org/jclouds/util/Strings2.java @@ -112,11 +112,11 @@ public class Strings2 { * @throws IllegalStateException * if encoding isn't {@code UTF-8} */ - public static String urlDecode(@Nullable Object in) { + public static String urlDecode(@Nullable String in) { if (in == null) return null; try { - return URLDecoder.decode(in.toString(), "UTF-8"); + return URLDecoder.decode(in, "UTF-8"); } catch (UnsupportedEncodingException e) { throw new IllegalStateException("Bad encoding on input: " + in, e); }
