Added uitilty method to MapUtils for appending and encoding parameters

scribejava · Mar 13, 2011 · 16b3475 · 16b3475
1 parent 22367de
commit 16b3475
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/main/java/org/scribe/extractors/BaseStringExtractorImpl.java b/src/main/java/org/scribe/extractors/BaseStringExtractorImpl.java
@@ -32,11 +32,11 @@ public String extract(OAuthRequest request)
   private String getSortedAndEncodedParams(OAuthRequest request)
   {
     Map<String, String> params = new HashMap<String, String>();
-    params.putAll(request.getQueryStringParams());
-    params.putAll(request.getBodyParams());
-    params.putAll(request.getOauthParameters());
+    MapUtils.decodeAndAppendEntries(request.getQueryStringParams(), params);
+    MapUtils.decodeAndAppendEntries(request.getBodyParams(), params);
+    MapUtils.decodeAndAppendEntries(request.getOauthParameters(), params);
     params = MapUtils.sort(params);
-    return URLUtils.percentEncode(URLUtils.formURLEncodeMap(params));
+    return URLUtils.percentEncode(URLUtils.concatSortedPercentEncodedParams(params));
   }
 
   private void checkPreconditions(OAuthRequest request)

diff --git a/src/main/java/org/scribe/utils/MapUtils.java b/src/main/java/org/scribe/utils/MapUtils.java
@@ -33,4 +33,19 @@ private static List<String> getSortedKeys(Map<String, String> map)
     Collections.sort(keys);
     return keys;
   }
+
+  /**
+   * Form-urlDecodes and appends all keys from the source {@link Map} to the
+   * target {@link Map}
+   *
+   * @param source Map from where the keys get copied and decoded
+   * @param target Map where the decoded keys are copied to
+   */
+  public static void decodeAndAppendEntries(Map<String, String> source, Map<String, String> target)
+  {
+    for (String key: source.keySet())
+    {
+      target.put(URLUtils.percentEncode(key), URLUtils.percentEncode(source.get(key)));
+    }
+  }
 }
diff --git a/src/main/java/org/scribe/utils/URLUtils.java b/src/main/java/org/scribe/utils/URLUtils.java
@@ -139,6 +139,7 @@ public static String appendParametersToQueryString(String url, Map<String, Strin
    * @param params key-value map
    * @return querystring-like String
    */
+  // TODO Move to MapUtils
   public static String concatSortedPercentEncodedParams(Map<String, String> params)
   {
     StringBuilder result = new StringBuilder();
@@ -156,6 +157,7 @@ public static String concatSortedPercentEncodedParams(Map<String, String> params
    * @param queryString querystring-like String
    * @return a map with the form-urldecoded parameters
    */
+  // TODO Move to MapUtils
   public static Map<String, String> queryStringToMap(String queryString)
   {
     Map<String, String> result = new HashMap<String, String>();