Merge pull request #9 from geoanalytics-ca/open-date-intervals

added support for open date interval in search

Author: joshfix

staccato-elasticsearch/src/main/java/com/planet/staccato/es/QueryBuilderHelper.java

@@ -38,6 +38,8 @@ public class QueryBuilderHelper {//implements QueryBuilder {
     private static final int EAST = 2;
     private static final int NORTH = 3;
     private static final int DEFAULT_LIMIT = 10;
+    // https://github.com/radiantearth/stac-spec/blob/v0.8.0/api-spec/STAC-extensions.yaml#L1144
+    private static final String OPEN_INTERVAL_SYMBOL = "..";
 
     public static BoolQueryBuilder buildQuery(double[] bbox, String time, String query, Integer limit, String next,
                                               String[] ids, String[] collections, FieldsExtension fields,
@@ -113,29 +115,30 @@ public static Optional<QueryBuilder> timeBuilder(String time) {
 
         if (time.indexOf("/") > 0) {
             String[] timeArray = time.split("/");
-            startTimeProperty = timeArray[0];
-            endTimeProperty = timeArray[1];
-
-            try {
-                // see if the value can be parsed into a period, eg P1Y2M3W4D
-                Period period = Period.parse(endTimeProperty);
-
-                Instant start = Instant.parse(startTimeProperty);
-                Instant end = start.plus(period);
-
-                start.plus(period.normalized());
-
-                startTimeProperty = start.toString();
-                endTimeProperty = end.toString();
-
-            } catch (DateTimeParseException e) {
-                // not a period
+            startTimeProperty = dateStringOrOpenInterval(timeArray[0]);
+            endTimeProperty = dateStringOrOpenInterval(timeArray[1]);
+            if (endTimeProperty != null) {
+                // check if end time is not null;
+                // otherwise, NullPointerException will be thrown during parse
+                try {
+                    // see if the value can be parsed into a period, eg P1Y2M3W4D
+                    Period period = Period.parse(endTimeProperty);
+
+                    Instant start = Instant.parse(startTimeProperty);
+                    Instant end = start.plus(period);
+
+                    start.plus(period.normalized());
+
+                    startTimeProperty = start.toString();
+                    endTimeProperty = end.toString();
+                } catch (DateTimeParseException e) {
+                    // not a period
+                }
             }
         } else {
             startTimeProperty = time;
             endTimeProperty = time;
         }
-
         RangeQueryBuilder rangeQueryBuilder = QueryBuilders
                 .rangeQuery(FieldName.DATETIME_FULL)
                 .from(startTimeProperty)
@@ -144,6 +147,13 @@ public static Optional<QueryBuilder> timeBuilder(String time) {
         return Optional.of(rangeQueryBuilder);
     }
 
+    private static String dateStringOrOpenInterval(String value) {
+        if (value.equals(OPEN_INTERVAL_SYMBOL)) {
+            return null;
+        }
+        return value;
+    }
+
     public static Optional<QueryBuilder> intersectsBuilder(Object intersects) {
         if (intersects == null) {
             return Optional.empty();