Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-12-26T23:42:00+01:00 (9 years ago)

Author:

simon04

Message:

see #12231 - Use HttpClient instead of some Utils.openHttpConnection usages

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (8 diffs)

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

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.zip.GZIPInputStream;
@@ -20 +19 @@
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.io.Compression;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 
 /**
@@ -38 +38 @@
     private final Map<String, String> headers = new ConcurrentHashMap<>();
     private int maxRedirects = Main.pref.getInteger("socket.maxredirects", 5);
+    private boolean useCache;
+    private boolean keepAlive;
 
     private HttpClient(URL url, String requestMethod) {
@@ -70 +72 @@
             connection.setIfModifiedSince(ifModifiedSince);
         }
+        connection.setUseCaches(useCache);
+        if (!useCache) {
+            connection.setRequestProperty("Cache-Control", "no-cache");
+        }
+        if (!keepAlive) {
+            connection.setRequestProperty("Connection", "close");
+        }
         for (Map.Entry<String, String> header : headers.entrySet()) {
             connection.setRequestProperty(header.getKey(), header.getValue());
@@ -78 +87 @@
             try {
                 connection.connect();
+                Main.info("{0} {1} => {2}", requestMethod, url, connection.getResponseCode());
             } catch (IOException e) {
                 //noinspection ThrowableResultOfMethodCallIgnored
@@ -157 +167 @@
 
         /**
-         * Returns {@link #getContent()} wrapped in a buffered reader
+         * Returns {@link #getContent()} wrapped in a buffered reader.
+         *
+         * Detects Unicode charset in use utilizing {@link UTFInputStreamReader}.
          */
         public BufferedReader getContentReader() throws IOException {
-            return new BufferedReader(new InputStreamReader(getContent(), StandardCharsets.UTF_8));
+            return new BufferedReader(
+                    UTFInputStreamReader.create(getContent())
+            );
+        }
+
+        /**
+         * Fetches the HTTP response as String.
+         * @return the response
+         * @throws IOException
+         */
+        public String fetchContent() throws IOException {
+            try (Scanner scanner = new Scanner(getContentReader())) {
+                return scanner.useDelimiter("\\A").next();
+            }
         }
 
@@ -187 +212 @@
 
         /**
+         * Returns the {@code Content-Length} header.
+         */
+        public long getContentLength() {
+            return connection.getContentLengthLong();
+        }
+
+        /**
          * @see HttpURLConnection#disconnect()
          */
@@ -213 +245 @@
     public static HttpClient create(URL url, String requestMethod) {
         return new HttpClient(url, requestMethod);
+    }
+
+    /**
+     * Sets whether not to set header {@code Cache-Control=no-cache}
+     *
+     * @param useCache whether not to set header {@code Cache-Control=no-cache}
+     * @return {@code this}
+     * @see HttpURLConnection#setUseCaches(boolean)
+     */
+    public HttpClient useCache(boolean useCache) {
+        this.useCache = useCache;
+        return this;
+    }
+
+    /**
+     * Sets whether not to set header {@code Connection=close}
+     * <p/>
+     * This might fix #7640, see <a href='https://web.archive.org/web/20140118201501/http://www.tikalk.com/java/forums/httpurlconnection-disable-keep-alive'>here</a>.
+     *
+     * @param keepAlive whether not to set header {@code Connection=close}
+     * @return {@code this}
+     */
+    public HttpClient keepAlive(boolean keepAlive) {
+        this.keepAlive = keepAlive;
+        return this;
     }