Index: trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 10710)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java	(revision 10717)
@@ -32,5 +32,5 @@
         Collections.sort(ids, OsmWriter.byIdComparator);
 
-        final long[] longIds = ids.stream().mapToLong(x -> x.getUniqueId()).toArray();
+        final long[] longIds = ids.stream().mapToLong(NodeData::getUniqueId).toArray();
         assertArrayEquals(new long[] {
                 -3, -12, -20, -9223372036854775808L, 0, 2, 12, 65, 9223372036854775807L
Index: trunk/test/unit/org/openstreetmap/josm/tools/MemoryManagerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/MemoryManagerTest.java	(revision 10710)
+++ trunk/test/unit/org/openstreetmap/josm/tools/MemoryManagerTest.java	(revision 10717)
@@ -48,5 +48,5 @@
         assertTrue(testMemory.toString().startsWith("MemoryHandle"));
 
-        manager.allocateMemory("test2", 10, () -> new Object());
+        manager.allocateMemory("test2", 10, Object::new);
         assertEquals(available - 20, manager.getAvailableMemory());
 
@@ -62,5 +62,5 @@
     public void testUseAfterFree() throws NotEnoughMemoryException {
         MemoryManager manager = MemoryManager.getInstance();
-        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, () -> new Object());
+        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, Object::new);
         testMemory.free();
         testMemory.get();
@@ -74,5 +74,5 @@
     public void testFreeAfterFree() throws NotEnoughMemoryException {
         MemoryManager manager = MemoryManager.getInstance();
-        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, () -> new Object());
+        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, Object::new);
         testMemory.free();
         testMemory.free();
@@ -136,6 +136,6 @@
         assertTrue(manager.resetState().isEmpty());
 
-        manager.allocateMemory("test", 10, () -> new Object());
-        manager.allocateMemory("test2", 10, () -> new Object());
+        manager.allocateMemory("test", 10, Object::new);
+        manager.allocateMemory("test2", 10, Object::new);
         assertEquals(2, manager.resetState().size());
 
@@ -150,5 +150,5 @@
     public void testResetStateUseAfterFree() throws NotEnoughMemoryException {
         MemoryManager manager = MemoryManager.getInstance();
-        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, () -> new Object());
+        MemoryHandle<Object> testMemory = manager.allocateMemory("test", 10, Object::new);
 
         assertFalse(manager.resetState().isEmpty());