Changeset 9172 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

2015-12-26T23:42:03+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - Use HttpClient for OSM API calls

This requires adaptors to the OAuth library: SignpostAdapters

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringReader;
@@ -42 +36 @@
 import org.openstreetmap.josm.io.Capabilities.CapabilitiesParser;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlParsingException;
@@ -617 +612 @@
     protected final String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor,
             boolean doAuthenticate, boolean fastFail) throws OsmTransferException {
-        StringBuilder responseBody = new StringBuilder();
         int retries = fastFail ? 0 : getMaxRetries();
 
@@ -623 +617 @@
             try {
                 url = new URL(new URL(getBaseUrl()), urlSuffix);
-                Main.info(requestMethod + ' ' + url + "... ");
-                Main.debug(requestBody);
-                // fix #5369, see http://www.tikalk.com/java/forums/httpurlconnection-disable-keep-alive
-                activeConnection = Utils.openHttpConnection(url, false);
-                activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect", 15)*1000);
+                final HttpClient client = HttpClient.create(url, requestMethod).keepAlive(false);
                 if (fastFail) {
-                    activeConnection.setReadTimeout(1000);
+                    client.setReadTimeout(1000);
                 }
-                activeConnection.setRequestMethod(requestMethod);
                 if (doAuthenticate) {
-                    addAuth(activeConnection);
+                    addAuth(client);
                 }
 
                 if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
-                    activeConnection.setDoOutput(true);
-                    activeConnection.setRequestProperty("Content-type", "text/xml");
-                    try (OutputStream out = activeConnection.getOutputStream()) {
-                        // It seems that certain bits of the Ruby API are very unhappy upon
-                        // receipt of a PUT/POST message without a Content-length header,
-                        // even if the request has no payload.
-                        // Since Java will not generate a Content-length header unless
-                        // we use the output stream, we create an output stream for PUT/POST
-                        // even if there is no payload.
-                        if (requestBody != null) {
-                            try (BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
-                                bwr.write(requestBody);
-                                bwr.flush();
-                            }
-                        }
-                    }
+                    // It seems that certain bits of the Ruby API are very unhappy upon
+                    // receipt of a PUT/POST message without a Content-length header,
+                    // even if the request has no payload.
+                    // Since Java will not generate a Content-length header unless
+                    // we use the output stream, we create an output stream for PUT/POST
+                    // even if there is no payload.
+                    client.setRequestBody(requestBody.getBytes(StandardCharsets.UTF_8));
                 }
 
-                activeConnection.connect();
+                activeConnection = client.connect();
                 Main.info(activeConnection.getResponseMessage());
                 int retCode = activeConnection.getResponseCode();
@@ -667 +647 @@
                 }
 
-                // populate return fields.
-                responseBody.setLength(0);
-
-                // If the API returned an error code like 403 forbidden, getInputStream will fail with an IOException.
-                InputStream i = getConnectionStream();
-                if (i != null) {
-                    // the input stream can be null if both the input and the error stream
-                    // are null. Seems to be the case if the OSM server replies a 401 Unauthorized, see #3887.
-                    String s;
-                    try (BufferedReader in = new BufferedReader(new InputStreamReader(i, StandardCharsets.UTF_8))) {
-                        while ((s = in.readLine()) != null) {
-                            responseBody.append(s);
-                            responseBody.append('\n');
-                        }
-                    }
-                }
+                final String responseBody = activeConnection.fetchContent();
+
                 String errorHeader = null;
                 // Look for a detailed error message from the server
@@ -693 +659 @@
                 activeConnection.disconnect();
 
-                if (Main.isDebugEnabled()) {
-                    Main.debug("RESPONSE: "+ activeConnection.getHeaderFields());
-                }
-
                 errorHeader = errorHeader == null ? null : errorHeader.trim();
-                String errorBody = responseBody.length() == 0 ? null : responseBody.toString().trim();
+                String errorBody = responseBody.length() == 0 ? null : responseBody.trim();
                 switch(retCode) {
                 case HttpURLConnection.HTTP_OK:
-                    return responseBody.toString();
+                    return responseBody;
                 case HttpURLConnection.HTTP_GONE:
                     throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
@@ -729 +691 @@
     }
 
-    private InputStream getConnectionStream() {
-        try {
-            return activeConnection.getInputStream();
-        } catch (IOException ioe) {
-            Main.warn(ioe);
-            return activeConnection.getErrorStream();
-        }
-    }
-
     /**
      * Replies the API capabilities.