Changeset 33066 in osm for applications/editors

Timestamp:

2016-11-17T08:29:38+01:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: fix ISE: Duplicate key - #josm13991

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (2 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -18 +18 @@
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -194 +195 @@
     public static Map<String, String> getWikidataForArticles(String wikipediaLang, List<String> articles) {
         if (articles.size() > 50) {
-            return partitionList(articles, 50).stream()
+            final List<String> withoutDuplicates = new ArrayList<>(new TreeSet<>(articles));
+            return partitionList(withoutDuplicates, 50).stream()
                     .flatMap(chunk -> getWikidataForArticles(wikipediaLang, chunk).entrySet().stream())
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -8 +8 @@
 import org.wikipedia.data.WikipediaEntry;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static org.hamcrest.CoreMatchers.hasItem;
@@ -115 +120 @@
 
     @Test
+    public void testTicket13991() throws Exception {
+        final Map<String, String> map = WikipediaApp.getWikidataForArticles("en",
+                Stream.iterate("London", x -> x).limit(100).collect(Collectors.toList()));
+        assertThat(map, is(Collections.singletonMap("London", "Q84")));
+    }
+
+    @Test
     public void testGetLabelForWikidata() throws Exception {
         assertThat(WikipediaApp.getLabelForWikidata("Q1741", Locale.GERMAN), is("Wien"));