day: convert Mainland China to China

nonstop-story · Mar 25, 2020 · 4772ea7 · 4772ea7
1 parent 31611d9
commit 4772ea7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/nonstop/covid19/api/Day.java b/src/main/java/com/nonstop/covid19/api/Day.java
@@ -22,6 +22,10 @@ public String getCountry() {
         return country;
     }
 
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
     public Date getDate() {
         return date;
     }

diff --git a/src/main/java/com/nonstop/covid19/geometry/Countries.java b/src/main/java/com/nonstop/covid19/geometry/Countries.java
@@ -6,8 +6,16 @@
 import java.util.stream.Collectors;
 
 public class Countries {
+    private static Day mergeChina(Day day) {
+        if (day.getCountry().equals("Mainland China")) {
+            day.setCountry("China");
+        }
+        return day;
+    }
+
     public static List<Country> from(List<Day> countries) {
         return countries.stream()
+                .map(Countries::mergeChina)
                 .collect(Collectors.groupingBy(Day::getCountry))
                 .entrySet()
                 .stream()