Changeset 16451 in josm for trunk

Timestamp:

2020-05-17T18:05:00+02:00 (5 years ago)

Author:

simon04

Message:

see #19251 - Java warning, FindBugs

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• PrimitiveData.java (modified) (1 diff)
• search/SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -91 +91 @@
     @Deprecated
     public static <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
-        return list.stream().filter(p -> type.getDataClass().isInstance(p)).map(p -> (T) p).collect(Collectors.toList());
+        return list.stream().filter(p -> type.getDataClass().isInstance(p)).collect(Collectors.toList());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -765 +765 @@
                 mv = osm.get(key);
                 if (!caseSensitive && mv == null) {
-                    mv = osm.keySet().stream().filter(key::equalsIgnoreCase).map(osm::get).findFirst().orElse(mv);
+                    mv = osm.keySet().stream().filter(key::equalsIgnoreCase).map(osm::get).findFirst().orElse(null);
                 }
             }