From c7a913ef0b478ef842f6660bf94166465bbb91ba Mon Sep 17 00:00:00 2001
From: Taylor Smock <taylor.smock@kaart.com>
Date: Mon, 3 Feb 2020 15:35:57 -0700
Subject: [PATCH] Fix warnings from various tools

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
---
 .../mapwithai/backend/GetDataRunnable.java      |  2 --
 .../validation/tests/StreetAddressOrder.java    |  4 +---
 .../validation/tests/StreetAddressTest.java     | 17 ++++++++---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
index b84d5d1..e21dfb0 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
@@ -58,8 +58,6 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
     private final transient DataSet dataSet;
     private final transient ProgressMonitor monitor;
 
-    private static final Object LOCK = new Object();
-
     private static final int MAX_NUMBER_OF_BBOXES_TO_PROCESS = 1;
     private static final String SERVER_ID_KEY = "server_id";
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java
index 26dc4f7..33522c4 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java
@@ -139,10 +139,8 @@ public class StreetAddressOrder extends Test {
         way.setNodes(Collections.emptyList());
         List<T> badPrimitives = issueCentroids.stream().map(centroids::indexOf).map(primitives::get)
                 .collect(Collectors.toList());
-        Map<T, List<T>> badPrimitivesNeighborMap = badPrimitives.stream()
-                .map(p -> new Pair<T, List<T>>(p, getNeighbors(p, primitives)))
+        return badPrimitives.stream().map(p -> new Pair<T, List<T>>(p, getNeighbors(p, primitives)))
                 .collect(Collectors.toMap(p -> p.a, p -> p.b));
-        return badPrimitivesNeighborMap;
     }
 
     /**
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java
index 1600c7f..a6479e6 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -30,16 +31,16 @@ import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
 
 public class StreetAddressTest extends Test {
-    private static double BBOX_EXPANSION = 0.001;
-    private static String ADDR_STREET = "addr:street";
+    private static final double BBOX_EXPANSION = 0.001;
+    private static final String ADDR_STREET = "addr:street";
     /**
      * Classified highways in order of importance
      *
      * Copied from {@link org.openstreetmap.josm.data.validation.tests.Highways}
      */
-    public static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList("motorway", "motorway_link", "trunk",
-            "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link",
-            "unclassified", "residential", "living_street");
+    public static final List<String> CLASSIFIED_HIGHWAYS = Collections.unmodifiableList(
+            Arrays.asList("motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary",
+                    "secondary_link", "tertiary", "tertiary_link", "unclassified", "residential", "living_street"));
 
     public StreetAddressTest() {
         super(tr("Mismatched street/street addresses ({0})", MapWithAIPlugin.NAME),
@@ -93,7 +94,7 @@ public class StreetAddressTest extends Test {
                 max = entry.getValue();
                 likelyNames.clear();
                 likelyNames.add(entry.getKey());
-            } else if (entry.getValue() == max) {
+            } else if (max.equals(entry.getValue())) {
                 likelyNames.add(entry.getKey());
             }
         }
@@ -143,10 +144,8 @@ public class StreetAddressTest extends Test {
                 .filter(StreetAddressTest::hasStreetAddressTags).collect(Collectors.toList());
         List<Relation> addrRelations = way.getDataSet().searchRelations(bbox).parallelStream()
                 .filter(StreetAddressTest::hasStreetAddressTags).collect(Collectors.toList());
-        List<IPrimitive> nearbyAddresses = Stream.of(addrNodes, addrWays, addrRelations).flatMap(List::parallelStream)
+        return Stream.of(addrNodes, addrWays, addrRelations).flatMap(List::parallelStream)
                 .filter(prim -> StreetAddressTest.isNearestRoad(way, prim)).collect(Collectors.toList());
-
-        return nearbyAddresses;
     }
 
     /**