Changeset 15742 in josm

Timestamp:

2020-01-20T23:18:42+01:00 (4 years ago)

Author:

simon04

Message:

HttpClient: add support for Content-Encoding: deflate

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/HttpClient.java (modified) (3 diffs)
• test/functional/org/openstreetmap/josm/tools/HttpClientTest.java (modified) (1 diff)

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

@@ -23 +23 @@
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
 
 import org.openstreetmap.josm.data.validation.routines.DomainValidator;
@@ -112 +113 @@
         }
         this.requestMethod = requestMethod;
-        this.headers.put("Accept-Encoding", "gzip");
+        this.headers.put("Accept-Encoding", "gzip, deflate");
     }
 
@@ -376 +377 @@
             InputStream in = getInputStream();
             in = new ProgressInputStream(in, getContentLength(), monitor);
-            in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            in = "gzip".equalsIgnoreCase(getContentEncoding())
+                    ? new GZIPInputStream(in)
+                    : "deflate".equalsIgnoreCase(getContentEncoding())
+                    ? new InflaterInputStream(in)
+                    : in;
             Compression compression = Compression.NONE;
             if (uncompress) {

trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

@@ -316 +316 @@
     public void testTakesTooLong() throws IOException {
         HttpClient.create(new URL("https://httpbin.org/delay/1")).setReadTimeout(500).connect(progress);
+    }
+
+    /**
+     * Test reading Deflate-encoded data.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testDeflate() throws IOException {
+        final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/deflate")).connect(progress);
+        assertThat(response.getResponseCode(), is(200));
+        try (InputStream in = response.getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
+            assertThat(json.readObject().getBoolean("deflated"), is(true));
+        }
+    }
+
+    /**
+     * Test reading Gzip-encoded data.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testGzip() throws IOException {
+        final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/gzip")).connect(progress);
+        assertThat(response.getResponseCode(), is(200));
+        try (InputStream in = response.getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
+            assertThat(json.readObject().getBoolean("gzipped"), is(true));
+        }
     }