Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.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/cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -77 +77 @@
             TimeUnit.SECONDS,
             // make queue of LIFO type - so recently requested tiles will be loaded first (assuming that these are which user is waiting to see)
-            new LinkedBlockingDeque<Runnable>(),
+            new LinkedBlockingDeque<>(),
             Utils.newThreadFactory("JCS-downloader-%d", Thread.NORM_PRIORITY)
             );
@@ -323 +323 @@
         }
         try (InputStream fileInputStream = Files.newInputStream(file.toPath())) {
-            cacheData = createCacheEntry(Utils.readBytesFromStream(fileInputStream));
+            cacheData = createCacheEntry(fileInputStream.readAllBytes());
             cache.put(getCacheKey(), cacheData, attributes);
             return true;
@@ -394 +394 @@
                 byte[] raw;
                 if (urlConn.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    raw = Utils.readBytesFromStream(urlConn.getContent());
+                    raw = urlConn.getContent().readAllBytes();
                 } else {
                     raw = new byte[]{};