Changeset 18652 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-02-09T09:47:37+01:00 (20 months ago)

Author:

stoecker

Message:

unify stripUrl() handling

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• tools/HttpClient.java (modified) (4 diffs)
• tools/TextUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -130 +130 @@
 import org.openstreetmap.josm.tools.MemoryManager.MemoryHandle;
 import org.openstreetmap.josm.tools.MemoryManager.NotEnoughMemoryException;
+import org.openstreetmap.josm.tools.TextUtils;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -432 +433 @@
                 String url = "";
                 try {
-                    url = tile.getUrl();
+                    url = TextUtils.stripUrl(tile.getUrl());
                 } catch (IOException e) {
                     // silence exceptions

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

@@ -34 +34 @@
 import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.TextUtils;
 
 /**
@@ -126 +127 @@
 
     /**
-     * Removed privacy related parts form output URL
-     * @param url Unmodified URL
-     * @return Stripped URL (privacy related issues removed)
-     */
-    private String stripUrl(URL url) {
-        return url.toString().replaceAll("(token|key|connectId)=[^&]+", "$1=...stripped...");
-    }
-
-    /**
      * Opens the HTTP connection.
      * @param progressMonitor progress monitor
@@ -158 +150 @@
                 final boolean hasReason = !Utils.isEmpty(reasonForRequest);
                 logRequest("{0} {1}{2} -> {3} {4} ({5}{6})",
-                        getRequestMethod(), stripUrl(getURL()), hasReason ? (" (" + reasonForRequest + ')') : "",
+                        getRequestMethod(), TextUtils.stripUrl(getURL().toString()), hasReason ? (" (" + reasonForRequest + ')') : "",
                         cr.getResponseVersion(), cr.getResponseCode(),
                         stopwatch,
@@ -176 +168 @@
                 }
             } catch (IOException | RuntimeException e) {
-                logRequest("{0} {1} -> !!! ({2})", requestMethod, stripUrl(url), stopwatch);
+                logRequest("{0} {1} -> !!! ({2})", requestMethod, TextUtils.stripUrl(url.toString()), stopwatch);
                 Logging.warn(e);
                 //noinspection ThrowableResultOfMethodCallIgnored

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

@@ -21 +21 @@
         return url.replace("/", "/\u200b").replace("&", "&\u200b");
     }
+
+    /**
+     * Remove privacy related parts form output URL
+     * @param url Unmodified URL
+     * @return Stripped URL (privacy related issues removed)
+     * @since 18652
+     */
+    public static String stripUrl(String url) {
+        return url.replaceAll("(token|key|connectId)=[^&]+", "$1=...stripped...");
+    }
+
 }