Changeset 9172 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.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/OsmServerReader.java (modified) (6 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
 
 import org.openstreetmap.josm.Main;
@@ -23 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.HttpClient;
 
 /**
@@ -129 +121 @@
                 throw new OsmTransferException(e);
             }
-            try {
-                // fix #7640, see http://www.tikalk.com/java/forums/httpurlconnection-disable-keep-alive
-                activeConnection = Utils.openHttpConnection(url, false);
-            } catch (Exception e) {
-                throw new OsmTransferException(tr("Failed to open connection to API {0}.", url.toExternalForm()), e);
-            }
-            Utils.setupURLConnection(activeConnection);
-            if (cancel) {
-                activeConnection.disconnect();
-                return null;
-            }
-
+
+            final HttpClient client = HttpClient.create(url);
+            client.setReasonForRequest(reason);
             if (doAuthenticate) {
-                addAuth(activeConnection);
+                addAuth(client);
             }
             if (cancel)
                 throw new OsmTransferCanceledException("Operation canceled");
-            if (Main.pref.getBoolean("osm-server.use-compression", true)) {
-                activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
-            }
 
             try {
-                if (reason != null && !reason.isEmpty()) {
-                    Main.info("GET " + url + " (" + reason + ')');
-                } else {
-                    Main.info("GET " + url);
-                }
-                activeConnection.connect();
+                activeConnection = client.connect();
             } catch (Exception e) {
                 Main.error(e);
@@ -165 +140 @@
             }
             try {
-                if (Main.isDebugEnabled()) {
-                    Main.debug("RESPONSE: "+activeConnection.getHeaderFields());
-                }
                 if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                     throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED, null, null);
@@ -174 +146 @@
                     throw new OsmTransferCanceledException("Proxy Authentication Required");
 
-                String encoding = activeConnection.getContentEncoding();
                 if (activeConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
                     String errorHeader = activeConnection.getHeaderField("Error");
-                    StringBuilder errorBody = new StringBuilder();
-                    try {
-                        InputStream i = fixEncoding(activeConnection.getErrorStream(), encoding);
-                        if (i != null) {
-                            BufferedReader in = new BufferedReader(new InputStreamReader(i, StandardCharsets.UTF_8));
-                            String s;
-                            while ((s = in.readLine()) != null) {
-                                errorBody.append(s);
-                                errorBody.append('\n');
-                            }
-                        }
-                    } catch (Exception e) {
-                        errorBody.append(tr("Reading error text failed."));
-                    }
-
-                    throw new OsmApiException(activeConnection.getResponseCode(), errorHeader, errorBody.toString(), url.toString());
+                    final String errorBody = activeConnection.fetchContent();
+                    throw new OsmApiException(activeConnection.getResponseCode(), errorHeader, errorBody, url.toString());
                 }
 
                 InputStream in = new ProgressInputStream(activeConnection, progressMonitor);
                 if (uncompressAccordingToContentDisposition) {
-                    in = uncompressAccordingToContentDisposition(in, activeConnection.getHeaderFields());
+                    activeConnection.uncompressAccordingToContentDisposition(true);
                 }
-                return fixEncoding(in, encoding);
+                return in;
             } catch (OsmTransferException e) {
                 throw e;
@@ -210 +167 @@
     }
 
-    private static InputStream fixEncoding(InputStream stream, String encoding) throws IOException {
-        if ("gzip".equalsIgnoreCase(encoding)) {
-            stream = new GZIPInputStream(stream);
-        } else if ("deflate".equalsIgnoreCase(encoding)) {
-            stream = new InflaterInputStream(stream, new Inflater(true));
-        }
-        return stream;
-    }
-
-    private InputStream uncompressAccordingToContentDisposition(InputStream stream, Map<String, List<String>> headerFields) throws IOException {
-        List<String> field = headerFields.get("Content-Disposition");
-        if (field != null && field.toString().contains(".gz\"")) {
-            return Compression.GZIP.getUncompressedInputStream(stream);
-        } else if (field != null && field.toString().contains(".bz2\"")) {
-            return Compression.BZIP2.getUncompressedInputStream(stream);
-        } else {
-            return stream;
-        }
-    }
-
     /**
      * Download OSM files from somewhere