don't silently ignore invalid timestamps supplied to mapreducer

CHANGELOG.md

@@ -29,7 +29,9 @@ Changelog
 * update jts dependency to version 1.18.2
 * update ignite dependency to version 2.14.0 ([#459], [#467])
 * add natural order to `OSHDBTag` ([#454])
+* throw exception when invalid timestamp strings are supplied to the MapReducer ([#260])
 
+[#260]: https://github.com/GIScience/oshdb/issues/260
 [#419]: https://github.com/GIScience/oshdb/pull/419
 [#433]: https://github.com/GIScience/oshdb/issues/433
 [#438]: https://github.com/GIScience/oshdb/pull/438

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java

@@ -413,17 +413,13 @@ public MapReducer<X> timestamps(String isoDateStart, String isoDateEnd) {
   public MapReducer<X> timestamps(
       String isoDateFirst, String isoDateSecond, String... isoDateMore) {
     SortedSet<OSHDBTimestamp> timestamps = new TreeSet<>();
-    try {
-      timestamps.add(
-          new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDateFirst).toEpochSecond()));
+    timestamps.add(
+        new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDateFirst).toEpochSecond()));
+    timestamps.add(
+        new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDateSecond).toEpochSecond()));
+    for (String isoDate : isoDateMore) {
       timestamps.add(
-          new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDateSecond).toEpochSecond()));
-      for (String isoDate : isoDateMore) {
-        timestamps.add(
-            new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDate).toEpochSecond()));
-      }
-    } catch (Exception e) {
-      LOG.error("unable to parse ISO date string: " + e.getMessage());
+          new OSHDBTimestamp(IsoDateTimeParser.parseIsoDateTime(isoDate).toEpochSecond()));
     }
     return this.timestamps(() -> timestamps);
   }

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduce.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.time.format.DateTimeParseException;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -17,6 +18,7 @@
 import org.heigit.ohsome.oshdb.util.function.SerializableFunction;
 import org.heigit.ohsome.oshdb.util.mappable.OSMContribution;
 import org.heigit.ohsome.oshdb.util.mappable.OSMEntitySnapshot;
+import org.heigit.ohsome.oshdb.util.time.OSHDBTimestampIllegalArgumentException;
 import org.heigit.ohsome.oshdb.util.time.OSHDBTimestamps;
 import org.junit.jupiter.api.Test;
 
@@ -256,4 +258,33 @@ private static <T> SerializableFunction<T, T> delay(int ms) {
     };
   }
 
+  @Test
+  void testInvalidTimestamps() {
+    assertThrows(DateTimeParseException.class, this::invalidTimestamps1);
+    assertThrows(OSHDBTimestampIllegalArgumentException.class, this::invalidTimestamps2);
+  }
+
+  private void invalidTimestamps1() throws Exception {
+    // contribution view query
+    var ignored = createMapReducerOSMContribution()
+        .timestamps("invalid1", "invalid2")
+        .map(OSMContribution::getContributorUserId)
+        .uniq();
+    // snapshot view query
+    var ignored2 = createMapReducerOSMEntitySnapshot()
+        .timestamps("invalid")
+        .count();
+  }
+
+  @SuppressWarnings("UnusedAssignment")
+  private void invalidTimestamps2() throws Exception {
+    // invalid time zone
+    var ignored = createMapReducerOSMEntitySnapshot()
+        .timestamps("2020-01-01T00:00:00+00")
+        .count();
+    // invalid sign
+    ignored = createMapReducerOSMEntitySnapshot()
+        .timestamps("-2020-01-01T00:00:00Z")
+        .count();
+  }
 }