Changeset 9169 in josm for trunk/src

Timestamp:

2015-12-26T23:41:54+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - HttpClient: add support to uncompress streams

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/Compression.java (modified) (1 diff)
• tools/HttpClient.java (modified) (3 diffs)

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

@@ -50 +50 @@
                 ? ZIP
                 : NONE;
+    }
+
+    /**
+     * Determines the compression type based on the content type (MIME type).
+     * @param contentType the content type
+     * @return the compression type
+     */
+    public static Compression forContentType(String contentType) {
+        switch (contentType) {
+        case "application/zip":
+            return ZIP;
+        case "application/x-gzip":
+            return GZIP;
+        case "application/x-bzip2":
+            return BZIP2;
+        default:
+            return NONE;
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.io.Compression;
 
 /**
@@ -115 +116 @@
         private final HttpURLConnection connection;
         private final int responseCode;
+        private boolean uncompress;
 
         private Response(HttpURLConnection connection) throws IOException {
             this.connection = connection;
             this.responseCode = connection.getResponseCode();
+        }
+
+        /**
+         * Sets whether {@link #getContent()} should uncompress the input stream if necessary.
+         *
+         * @param uncompress whether the input stream should be uncompressed if necessary
+         * @return {@code this}
+         */
+        public Response uncompress(boolean uncompress) {
+            this.uncompress = uncompress;
+            return this;
         }
 
@@ -135 +148 @@
                 in = connection.getErrorStream();
             }
-            return "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            if (uncompress) {
+                return Compression.forContentType(getContentType()).getUncompressedInputStream(in);
+            } else {
+                return in;
+            }
         }