Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/tools/HttpClient.java

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

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

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

@@ -111 +111 @@
 
         if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
-            Main.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
+            Logging.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
             connection.setFixedLengthStreamingMode(requestBody.length);
             connection.setDoOutput(true);
@@ -125 +125 @@
                 connection.connect();
                 final boolean hasReason = reasonForRequest != null && !reasonForRequest.isEmpty();
-                Main.info("{0} {1}{2} -> {3}{4}",
+                Logging.info("{0} {1}{2} -> {3}{4}",
                         requestMethod, url, hasReason ? (" (" + reasonForRequest + ')') : "",
                         connection.getResponseCode(),
@@ -132 +132 @@
                                 : ""
                 );
-                if (Main.isDebugEnabled()) {
-                    Main.debug("RESPONSE: " + connection.getHeaderFields());
+                if (Logging.isDebugEnabled()) {
+                    Logging.debug("RESPONSE: {0}", connection.getHeaderFields());
                 }
                 if (DefaultAuthenticator.getInstance().isEnabled() && connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
@@ -139 +139 @@
                 }
             } catch (IOException e) {
-                Main.info("{0} {1} -> !!!", requestMethod, url);
-                Main.warn(e);
+                Logging.info("{0} {1} -> !!!", requestMethod, url);
+                Logging.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored
                 Main.addNetworkError(url, Utils.getRootCause(e));
@@ -154 +154 @@
                     url = new URL(url, redirectLocation);
                     maxRedirects--;
-                    Main.info(tr("Download redirected to ''{0}''", redirectLocation));
+                    Logging.info(tr("Download redirected to ''{0}''", redirectLocation));
                     return connect();
                 } else if (maxRedirects == 0) {
@@ -210 +210 @@
                     String content = this.fetchContent();
                     if (content.isEmpty()) {
-                        Main.debug("Server did not return any body");
+                        Logging.debug("Server did not return any body");
                     } else {
-                        Main.debug("Response body: ");
-                        Main.debug(this.fetchContent());
+                        Logging.debug("Response body: ");
+                        Logging.debug(this.fetchContent());
                     }
                 } else {
-                    Main.debug("Server returned content: {0} of length: {1}. Not printing.", contentType, this.getContentLength());
+                    Logging.debug("Server returned content: {0} of length: {1}. Not printing.", contentType, this.getContentLength());
                 }
             }
@@ -283 +283 @@
                 in = connection.getInputStream();
             } catch (IOException ioe) {
-                Main.debug(ioe);
+                Logging.debug(ioe);
                 in = Optional.ofNullable(connection.getErrorStream()).orElseGet(() -> new ByteArrayInputStream(new byte[]{}));
             }
@@ -291 +291 @@
             if (uncompress) {
                 final String contentType = getContentType();
-                Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
+                Logging.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
                 compression = Compression.forContentType(contentType);
             }
@@ -299 +299 @@
                         contentDisposition != null ? contentDisposition : "");
                 if (matcher.find()) {
-                    Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
+                    Logging.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
                     compression = Compression.byExtension(matcher.group(1));
                 }
@@ -661 +661 @@
                 Thread.sleep(100);
             } catch (InterruptedException ex) {
-                Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
+                Logging.warn("InterruptedException in " + HttpClient.class + " during cancel");
                 Thread.currentThread().interrupt();
             }