Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

Timestamp:

2024-04-22T20:59:26+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -152 +152 @@
     private boolean isNotImage(Map<String, List<String>> headers, int statusCode) {
         if (statusCode == 200 && headers.containsKey("Content-Type") && !headers.get("Content-Type").isEmpty()) {
-            String contentType = headers.get("Content-Type").stream().findAny().get();
+            String contentType = headers.get("Content-Type").stream().findAny().orElse(null);
             if (contentType != null && !contentType.startsWith("image") && !MVTFile.MIMETYPE.contains(contentType.toLowerCase(Locale.ROOT))) {
                 Logging.warn("Image not returned for tile: " + url + " content type was: " + contentType);
@@ -198 +198 @@
             }
 
-            switch(result) {
+            switch (result) {
             case SUCCESS:
                 handleNoTileAtZoom();