Changeset 9807 in josm for trunk

Timestamp:

2016-02-15T23:39:36+01:00 (9 years ago)

Author:

wiktorn

Message:

Make map returned by getHeaderFields() case insensitive.

RFC 2616, section 4.2, specifies that header names are case insensitive. This is properly handled by getHeaderField(...) in HttpUrlConnection, but in case of getHeaderFields() Map returned by Oracle JDK is case sensitive. By using case insentive map we avoid bigger refactoring of all usages, to use getHeaderField(...) where appropiate.

See #12235: Java Web Start cache returns all headers as lowercase, when real server return mixed case.

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

@@ -12 +12 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.TreeMap;
@@ -385 +387 @@
         /**
          * Returns an unmodifiable Map mapping header keys to a List of header values.
+         * As per RFC 2616, section 4.2 header names are case insensitive, so returned map is also case insensitive
          * @return unmodifiable Map mapping header keys to a List of header values
          * @see HttpURLConnection#getHeaderFields()
@@ -390 +393 @@
          */
         public Map<String, List<String>> getHeaderFields() {
-            return connection.getHeaderFields();
+            // returned map from HttpUrlConnection is case sensitive, use case insensitive TreeMap to conform to RFC 2616
+            Map<String, List<String>> ret = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            for(Entry<String, List<String>> e: connection.getHeaderFields().entrySet()) {
+                if (e.getKey() != null) {
+                    ret.put(e.getKey(), e.getValue());
+                }
+            }
+            return Collections.unmodifiableMap(ret);
         }
 

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

@@ -69 +69 @@
         assertThat(response.getHeaderField("Content-TYPE"), is("application/json"));
         assertThat(response.getHeaderFields().get("Content-Type"), is(Collections.singletonList("application/json")));
-        assertThat(response.getHeaderFields().get("Content-TYPE"), nullValue());
+        assertThat(response.getHeaderFields().get("Content-TYPE"), is(Collections.singletonList("application/json")));
         try (final InputStream in = response.getContent();
              final JsonReader json = JsonProvider.provider().createReader(in)) {