Changeset 15741 in josm

Timestamp:

2020-01-20T23:18:40+01:00 (5 years ago)

Author:

simon04

Message:

HttpClient: use cache by default

This is in accordance with java.net.URLConnection#getDefaultUseCaches(java.lang.String)

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

@@ -64 +64 @@
     private final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     private int maxRedirects = Config.getPref().getInt("socket.maxredirects", 5);
-    private boolean useCache;
+    private boolean useCache = true;
     private String reasonForRequest;
     private String outputMessage = tr("Uploading data ...");
@@ -614 +614 @@
 
     /**
-     * Determines whether not to set header {@code Cache-Control=no-cache}
+     * Determines whether not to set header {@code Cache-Control=no-cache}.
+     * By default, {@code useCache} is true, i.e., the header {@code Cache-Control=no-cache} is not sent.
+     *
      * @return whether not to set header {@code Cache-Control=no-cache}
      * @since 15229
@@ -657 +659 @@
 
     /**
-     * Sets whether not to set header {@code Cache-Control=no-cache}
+     * Sets whether not to set header {@code Cache-Control=no-cache}.
+     * By default, {@code useCache} is true, i.e., the header {@code Cache-Control=no-cache} is not sent.
      *
      * @param useCache whether not to set header {@code Cache-Control=no-cache}

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

@@ -117 +117 @@
             assertThat(root.getJsonObject("args").getString("foo"), is("bar"));
             assertThat(root.getString("url"), is("https://httpbin.org/get?foo=bar"));
+            assertThat(root.getJsonObject("headers").get("Cache-Control"), nullValue());
+            assertThat(root.getJsonObject("headers").get("Pragma"), nullValue());
         }
     }