Changeset 9170 in josm

Timestamp:

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

Author:

simon04

Message:

see #12231 - Deprecate Utils.open* functions

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/Compression.java (modified) (1 diff)
• tools/Utils.java (modified) (8 diffs)

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

@@ -108 +108 @@
      *
      * @throws IOException if any I/O error occurs
+     * @deprecated Use {@link org.openstreetmap.josm.tools.HttpClient} instead
      */
+    @Deprecated
     public static InputStream getUncompressedURLInputStream(URL url) throws IOException {
         return Utils.openURLAndDecompress(url, true);

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

@@ -765 +765 @@
      * @throws java.io.IOException if an I/O exception occurs.
      * @since 5587
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static HttpURLConnection openHttpConnection(URL httpURL) throws IOException {
         if (httpURL == null || !HTTP_PREFFIX_PATTERN.matcher(httpURL.getProtocol()).matches()) {
@@ -785 +787 @@
      * @throws java.io.IOException if an I/O exception occurs.
      * @since 5867
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static InputStream openURL(URL url) throws IOException {
-        return openURLAndDecompress(url, false);
+        return HttpClient.create(url).connect().getContent();
     }
 
@@ -798 +802 @@
      * @throws IOException if an I/O exception occurs.
      * @since 6421
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static InputStream openURLAndDecompress(final URL url, final boolean decompress) throws IOException {
-        final URLConnection connection = setupURLConnection(url.openConnection());
-        final InputStream in = connection.getInputStream();
-        if (decompress) {
-            switch (connection.getHeaderField("Content-Type")) {
-            case "application/zip":
-                return getZipInputStream(in);
-            case "application/x-gzip":
-                return getGZipInputStream(in);
-            case "application/x-bzip2":
-                return getBZip2InputStream(in);
-            }
-        }
-        return in;
+        return HttpClient.create(url).connect().uncompress(decompress).getContent();
     }
 
@@ -868 +862 @@
      * @return {@code connection}, with updated properties
      * @since 5887
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static URLConnection setupURLConnection(URLConnection connection) {
         if (connection != null) {
@@ -884 +880 @@
      * @throws java.io.IOException if an I/O exception occurs.
      * @since 5868
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static BufferedReader openURLReader(URL url) throws IOException {
-        return openURLReaderAndDecompress(url, false);
+        return HttpClient.create(url).connect().getContentReader();
     }
 
@@ -897 +895 @@
      * @throws IOException if an I/O exception occurs.
      * @since 6421
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static BufferedReader openURLReaderAndDecompress(final URL url, final boolean decompress) throws IOException {
-        return new BufferedReader(new InputStreamReader(openURLAndDecompress(url, decompress), StandardCharsets.UTF_8));
+        return HttpClient.create(url).connect().uncompress(decompress).getContentReader();
     }
 
@@ -909 +909 @@
      * @throws java.io.IOException if an I/O exception occurs.
      * @since 5587
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static HttpURLConnection openHttpConnection(URL httpURL, boolean keepAlive) throws IOException {
         HttpURLConnection connection = openHttpConnection(httpURL);
@@ -935 +937 @@
      * @throws IOException if an I/O exception occurs
      * @since 8650
-     */
+     * @deprecated Use {@link HttpClient} instead
+     */
+    @Deprecated
     public static HttpURLConnection openHttpConnection(URL httpURL, boolean keepAlive, boolean followRedirects) throws IOException {
         HttpURLConnection connection = openHttpConnection(httpURL, keepAlive);