Various errorprone fixes

Signed-off-by: Taylor Smock <tsmock@fb.com>

Author: tsmock

src/main/java/org/openstreetmap/josm/plugins/mapillary/cache/Caches.java

@@ -215,6 +215,21 @@ public V get(@Nonnull String url, @Nonnull Supplier<V> supplier) {
             return newReturnObject;
         }
 
+        /**
+         * Given a URL, get and cache the response if not already present in a non-blocking manner
+         *
+         * @param url The url to get
+         * @param pool The ForkJoinPool to use
+         * @param supplier The supplier to get the object with
+         * @return A future with the object, when it completes.
+         */
+        public Future<V> get(@Nonnull String url, @Nonnull ForkJoinPool pool, @Nonnull Supplier<V> supplier) {
+            if (this.cacheAccess.get(url) != null) {
+                return CompletableFuture.completedFuture(this.cacheAccess.get(url));
+            }
+            return pool.submit(() -> get(url, supplier));
+        }
+
         /**
          * Check an object for issues
          *
@@ -242,21 +257,6 @@ private String checkReturnObject(V returnObject) {
             return UNKNOWN_MAPILLARY_EXCEPTION;
         }
 
-        /**
-         * Given a URL, get and cache the response if not already present in a non-blocking manner
-         *
-         * @param url The url to get
-         * @param pool The ForkJoinPool to use
-         * @param supplier The supplier to get the object with
-         * @return A future with the object, when it completes.
-         */
-        public Future<V> get(@Nonnull String url, @Nonnull ForkJoinPool pool, @Nonnull Supplier<V> supplier) {
-            if (this.cacheAccess.get(url) != null) {
-                return CompletableFuture.completedFuture(this.cacheAccess.get(url));
-            }
-            return pool.submit(() -> get(url, supplier));
-        }
-
         /**
          * Get the underlying cache
          *

src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/DataMouseListener.java

@@ -58,7 +58,7 @@ public void mouseClicked(MouseEvent e) {
      * @param layer The layer we found
      * @param searchBBox The bbox to search
      */
-    private void mouseClickedInner(final MouseEvent e, final MVTLayer layer, final BBox searchBBox) {
+    private static void mouseClickedInner(final MouseEvent e, final MVTLayer layer, final BBox searchBBox) {
         Collection<VectorNode> nodes = layer.getData().searchNodes(searchBBox).stream().distinct()
             .filter(AbstractPrimitive::isVisible).collect(Collectors.toList());
         if (!nodes.isEmpty()) {

src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/imageinfo/ImageInfoPanel.java

@@ -198,10 +198,6 @@ public static synchronized void destroyInstance() {
         instance = null;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.openstreetmap.josm.gui.dialogs.ToggleDialog#stateChanged()
-     */
     @Override
     protected void stateChanged() {
         super.stateChanged();
@@ -210,6 +206,13 @@ protected void stateChanged() {
         }
     }
 
+    @Override
+    public synchronized void selectionChanged(final DataSelectionListener.SelectionChangeEvent event) {
+        final Collection<OsmPrimitive> sel = event.getSelection();
+        Logging.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size()));
+        addMapillaryTagAction.setTarget(sel != null && sel.size() == 1 ? sel.iterator().next() : null);
+    }
+
     @Override
     public synchronized void selectionChanged(
         final IDataSelectionListener.SelectionChangeEvent<VectorPrimitive, VectorNode, VectorWay, VectorRelation, VectorDataSet> selectionChanged) {
@@ -298,17 +301,6 @@ private void selectedImageChanged(@Nullable INode oldImage, @Nullable INode newI
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
-     */
-    @Override
-    public synchronized void selectionChanged(final DataSelectionListener.SelectionChangeEvent event) {
-        final Collection<OsmPrimitive> sel = event.getSelection();
-        Logging.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size()));
-        addMapillaryTagAction.setTarget(sel != null && sel.size() == 1 ? sel.iterator().next() : null);
-    }
-
     @Override
     public void destroy() {
         if (!destroyed) {

src/main/java/org/openstreetmap/josm/plugins/mapillary/model/ImageDetection.java

@@ -79,19 +79,6 @@ public enum Options {
 
     private DetectionVerification.TYPE approvalType;
 
-    /**
-     * Get the detections for an image key
-     *
-     * @param key The image key
-     * @param listener The consumer to notify when the detections are downloaded
-     * @return A ForkJoinTask (just in case it needs to be cancelled)
-     */
-    public static ImageDetectionForkJoinTask getDetections(long key,
-        BiConsumer<Long, List<ImageDetection<?>>> listener) {
-        return (ImageDetectionForkJoinTask) MapillaryUtils.getForkJoinPool()
-            .submit(new ImageDetectionForkJoinTask(key, listener));
-    }
-
     /**
      * Get detections at some later time
      *
@@ -120,6 +107,19 @@ public static void getDetectionsLaterOptional(final long key,
         }
     }
 
+    /**
+     * Get the detections for an image key
+     *
+     * @param key The image key
+     * @param listener The consumer to notify when the detections are downloaded
+     * @return A ForkJoinTask (just in case it needs to be cancelled)
+     */
+    public static ImageDetectionForkJoinTask getDetections(long key,
+        BiConsumer<Long, List<ImageDetection<?>>> listener) {
+        return (ImageDetectionForkJoinTask) MapillaryUtils.getForkJoinPool()
+            .submit(new ImageDetectionForkJoinTask(key, listener));
+    }
+
     /**
      * Get the detections for an image key
      *

src/main/java/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryImageUtils.java

@@ -24,6 +24,7 @@
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.cache.CacheEntry;
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.IWay;
@@ -53,10 +54,7 @@ public final class MapillaryImageUtils {
 
     /**
      * A pattern to look for strings that are only numbers -- mostly used during switchover from v3 to v4 API
-     *
-     * @deprecated Figure out if this needs to be kept
      */
-    @Deprecated
     private static final Pattern NUMBERS = Pattern.compile("\\d+");
 
     /**
@@ -137,18 +135,7 @@ public static double getAngle(@Nonnull INode img) {
     public static Future<BufferedImageCacheEntry> getImage(@Nonnull INode image) {
         if (MapillaryImageUtils.IS_DOWNLOADABLE.test(image)) {
             CompletableFuture<BufferedImageCacheEntry> completableFuture = new CompletableFuture<>();
-            CacheUtils.submit(image, (entry, attributes, result) -> {
-                if (entry instanceof BufferedImageCacheEntry) {
-                    // Using the BufferedImageCacheEntry may speed up processing, if the image is already loaded.
-                    completableFuture.complete((BufferedImageCacheEntry) entry);
-                } else if (entry != null && entry.getContent() != null) {
-                    // Fall back. More expensive if the image has already been loaded twice.
-                    completableFuture.complete(new BufferedImageCacheEntry(entry.getContent()));
-                } else {
-                    completableFuture.completeExceptionally(
-                        new NullPointerException("MapillaryImageUtils#getImage did not have required information"));
-                }
-            });
+            CacheUtils.submit(image, (entry, attributes, result) -> cacheImageFuture(completableFuture, entry));
             return completableFuture;
         } else if (getKey(image) > 0) {
             try {
@@ -167,6 +154,26 @@ public static Future<BufferedImageCacheEntry> getImage(@Nonnull INode image) {
         return CompletableFuture.completedFuture(null);
     }
 
+    /**
+     * Complete a future with an entry. This should be called on a separate thread when the entry is ready.
+     *
+     * @param completableFuture The future to complete when the data is downloaded
+     * @param entry The entry to put in the future
+     */
+    private static void cacheImageFuture(CompletableFuture<BufferedImageCacheEntry> completableFuture,
+        CacheEntry entry) {
+        if (entry instanceof BufferedImageCacheEntry) {
+            // Using the BufferedImageCacheEntry may speed up processing, if the image is already loaded.
+            completableFuture.complete((BufferedImageCacheEntry) entry);
+        } else if (entry != null && entry.getContent() != null) {
+            // Fall back. More expensive if the image has already been loaded twice.
+            completableFuture.complete(new BufferedImageCacheEntry(entry.getContent()));
+        } else {
+            completableFuture.completeExceptionally(
+                new NullPointerException("MapillaryImageUtils#getImage did not have required information"));
+        }
+    }
+
     /**
      * Get the captured at time
      *
@@ -267,16 +274,6 @@ public static Future<Void> downloadImageDetails(@Nonnull INode... images) {
         }, MapillaryUtils.getForkJoinPool());
     }
 
-    /**
-     * Check if the node has one of the Mapillary keys
-     *
-     * @param node The node to check
-     * @return {@code true} if the node is for an image
-     */
-    public static boolean isImage(@Nullable IPrimitive node) {
-        return node instanceof INode && node.hasKey(ImageProperties.ID.toString());
-    }
-
     /**
      * Get image details for some specific keys
      *
@@ -295,13 +292,26 @@ private static void downloadImageDetails(long... keys) {
                     return null;
                 }
             });
+            if (cacheData == null) {
+                return;
+            }
             try (JsonReader reader = Json
                 .createReader(new ByteArrayInputStream(cacheData.getBytes(StandardCharsets.UTF_8)))) {
                 JsonDecoder.decodeData(reader.readObject(), JsonImageDetailsDecoder::decodeImageInfos);
             }
         }
     }
 
+    /**
+     * Check if the node has one of the Mapillary keys
+     *
+     * @param node The node to check
+     * @return {@code true} if the node is for an image
+     */
+    public static boolean isImage(@Nullable IPrimitive node) {
+        return node instanceof INode && node.hasKey(ImageProperties.ID.toString());
+    }
+
     /**
      * Get the organization for an image
      *

src/main/java/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java

@@ -42,7 +42,6 @@
  */
 public final class MapillaryUtils {
 
-    private static final double MIN_ZOOM_SQUARE_SIDE = 0.002;
     private static final Map<String, ForkJoinPool> forkJoinPool = new HashMap<>();
     private static final long[] EMPTY_LONG = new long[0];