Changeset 8304 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

Timestamp:

2015-05-01T21:47:18+02:00 (9 years ago)

Author:

Don-vip

Message:

simplify URL encoding/decoding

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -9 +9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -251 +249 @@
 
     protected String buildPostRequest(Map<String,String> parameters) throws OsmOAuthAuthorizationException {
-        try {
-            StringBuilder sb = new StringBuilder();
-
-            for(Iterator<Entry<String,String>> it = parameters.entrySet().iterator(); it.hasNext();) {
-                Entry<String,String> entry = it.next();
-                String value = entry.getValue();
-                value = (value == null) ? "" : value;
-                sb.append(entry.getKey()).append("=").append(URLEncoder.encode(value, "UTF-8"));
-                if (it.hasNext()) {
-                    sb.append("&");
-                }
-            }
-            return sb.toString();
-        } catch(UnsupportedEncodingException e) {
-            throw new OsmOAuthAuthorizationException(e);
-        }
+        StringBuilder sb = new StringBuilder();
+
+        for(Iterator<Entry<String,String>> it = parameters.entrySet().iterator(); it.hasNext();) {
+            Entry<String,String> entry = it.next();
+            String value = entry.getValue();
+            value = (value == null) ? "" : value;
+            sb.append(entry.getKey()).append("=").append(Utils.encodeUrl(value));
+            if (it.hasNext()) {
+                sb.append("&");
+            }
+        }
+        return sb.toString();
     }