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

Timestamp:

2012-11-18T00:44:10+01:00 (11 years ago)

Author:

Don-vip

Message:

Single entry point in Utils to open HTTP connections

File:

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

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

@@ -30 +30 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -38 +37 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -325 +325 @@
             URL url = new URL(sb.toString());
             synchronized(this) {
-                connection = (HttpURLConnection)url.openConnection();
+                connection = Utils.openHttpConnection(url);
             }
             connection.setRequestMethod("GET");
             connection.setDoInput(true);
             connection.setDoOutput(false);
-            setHttpRequestParameters(connection);
             connection.connect();
             SessionId sessionId = extractOsmSession(connection);
@@ -355 +354 @@
             URL url = new URL(getAuthoriseUrl(requestToken));
             synchronized(this) {
-                connection = (HttpURLConnection)url.openConnection();
+                connection = Utils.openHttpConnection(url);
             }
             connection.setRequestMethod("GET");
@@ -361 +360 @@
             connection.setDoOutput(false);
             connection.setRequestProperty("Cookie", "_osm_session=" + sessionId.id + "; _osm_username=" + sessionId.userName);
-            setHttpRequestParameters(connection);
             connection.connect();
             sessionId.token = extractToken(connection);
@@ -380 +378 @@
             URL url = new URL(buildOsmLoginUrl());
             synchronized(this) {
-                connection = (HttpURLConnection)url.openConnection();
+                connection = Utils.openHttpConnection(url);
             }
             connection.setRequestMethod("POST");
@@ -401 +399 @@
             // make sure we can catch 302 Moved Temporarily below
             connection.setInstanceFollowRedirects(false);
-            setHttpRequestParameters(connection);
 
             connection.connect();
@@ -437 +434 @@
             URL url = new URL(buildOsmLogoutUrl());
             synchronized(this) {
-                connection = (HttpURLConnection)url.openConnection();
+                connection = Utils.openHttpConnection(url);
             }
             connection.setRequestMethod("GET");
             connection.setDoInput(true);
             connection.setDoOutput(false);
-            setHttpRequestParameters(connection);
             connection.connect();
-        }catch(MalformedURLException e) {
+        } catch(MalformedURLException e) {
             throw new OsmOAuthAuthorizationException(e);
         } catch(IOException e) {
@@ -484 +480 @@
             URL url = new URL(oauthProviderParameters.getAuthoriseUrl());
             synchronized(this) {
-                connection = (HttpURLConnection)url.openConnection();
+                connection = Utils.openHttpConnection(url);
             }
             connection.setRequestMethod("POST");
@@ -494 +490 @@
             connection.setRequestProperty("Cookie", "_osm_session=" + sessionId.id + "; _osm_username=" + sessionId.userName);
             connection.setInstanceFollowRedirects(false);
-            setHttpRequestParameters(connection);
 
             connection.connect();
@@ -520 +515 @@
             }
         }
-    }
-
-    protected void setHttpRequestParameters(HttpURLConnection connection) {
-        connection.setRequestProperty("User-Agent", Version.getInstance().getAgentString());
-        connection.setRequestProperty("Host", connection.getURL().getHost());
     }