Changeset 11115 in josm

Timestamp:

2016-10-11T19:05:20+02:00 (8 years ago)

Author:

simon04

Message:

fix #13785 - Use streams, add unit tests (patch by alno, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Changeset.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (added)

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

@@ -208 +208 @@
     public void setKeys(Map<String, String> keys) {
         CheckParameterUtil.ensureParameterNotNull(keys, "keys");
-        for (String value : keys.values()) {
-            if (value != null && value.length() > MAX_CHANGESET_TAG_LENGTH) {
+        keys.values().stream()
+                .filter(value -> (value != null && value.length() > MAX_CHANGESET_TAG_LENGTH))
+                .findFirst()
+                .ifPresent(value -> {
                 throw new IllegalArgumentException("Changeset tag value is too long: "+value);
-            }
-        }
+        });
         this.tags = keys;
     }

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

@@ -10 +10 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -183 +184 @@
      */
     public List<Changeset> getOpenChangesets() {
-        List<Changeset> ret = new ArrayList<>();
-        for (Changeset cs: cache.values()) {
-            if (cs.isOpen()) {
-                ret.add(cs);
-            }
-        }
-        return ret;
+        return cache.values().stream()
+                .filter(Changeset::isOpen)
+                .collect(Collectors.toList());
     }
 

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

@@ -3 +3 @@
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -117 +117 @@
     public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) {
         CheckParameterUtil.ensureParameterNotNull(cmt, "cmt");
-        Set<HistoryOsmPrimitive> ret = new HashSet<>();
-        for (Entry<PrimitiveId, ChangesetModificationType> entry: modificationTypes.entrySet()) {
-            if (entry.getValue().equals(cmt)) {
-                ret.add(primitives.get(entry.getKey()));
-            }
-        }
-        return ret;
+        return modificationTypes.entrySet().stream()
+                .filter(entry -> entry.getValue().equals(cmt))
+                .map(entry -> primitives.get(entry.getKey()))
+                .collect(Collectors.toSet());
     }
 

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

@@ -21 +21 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -420 +421 @@
         try {
             // QuadBuckets might be useful here (don't forget to do reindexing after some of rm is changed)
-            List<Relation> result = new ArrayList<>();
-            for (Relation r: relations) {
-                if (r.getBBox().intersects(bbox)) {
-                    result.add(r);
-                }
-            }
-            return result;
+            return relations.stream()
+                    .filter(r -> r.getBBox().intersects(bbox))
+                    .collect(Collectors.toList());
         } finally {
             lock.readLock().unlock();

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -226 +226 @@
         synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
-            for (PropertyChangeListener listener: listeners) {
+            listeners.forEach((listener) -> {
                 listener.propertyChange(evt);
+            });
             }
         }
-    }
 
     public final void setFrozen(boolean isFrozen) {
@@ -678 +678 @@
             if (row >= getEntries().size()) return false;
             T e1 = getEntries().get(row);
-            for (T e2: getOppositeEntries()) {
-                if (isEqualEntry(e1, e2)) return true;
+            return getOppositeEntries().stream().anyMatch(e2 -> isEqualEntry(e1, e2));
             }
-            return false;
-        }
 
         protected List<T> getEntries() {

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -180 +183 @@
         cache.removeChangesetCacheListener(listener);
     }
+
+    /**
+     * Unit test of method {@link ChangesetCache#getOpenChangesets}.
+     */
+    @Test
+    public void testGetOpenChangesets() {
+        final ChangesetCache cache = ChangesetCache.getInstance();
+        // empty cache => empty list
+        Assert.assertTrue(
+                "Empty cache should produce an empty list.",
+                cache.getOpenChangesets().isEmpty()
+        );
+
+        // cache with only closed changesets => empty list
+        Changeset closedCs = new Changeset(1);
+        closedCs.setOpen(false);
+        cache.update(closedCs);
+        Assert.assertTrue(
+                "Cache with only closed changesets should produce an empty list.",
+                cache.getOpenChangesets().isEmpty()
+        );
+
+        // cache with open and closed changesets => list with only the open ones
+        Changeset openCs = new Changeset(2);
+        openCs.setOpen(true);
+        cache.update(openCs);
+        Assert.assertEquals(
+                Collections.singletonList(openCs),
+                cache.getOpenChangesets()
+        );
+    }
 }