Refactor handling of InvalidRangeFormatException

This changeset adds InvalidRangeFormatExceptionMapper and removes the individual
handling of InvalidRangeFormatExceptions throughout the code.

graylog2-server/src/main/java/org/graylog2/alerts/types/FieldValueAlertCondition.java

@@ -20,7 +20,7 @@
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
 import org.graylog2.alerts.AbstractAlertCondition;
-import org.graylog2.indexer.IndexHelper;
+import org.graylog2.indexer.InvalidRangeFormatException;
 import org.graylog2.indexer.results.FieldStatsResult;
 import org.graylog2.indexer.results.ResultMessage;
 import org.graylog2.indexer.searches.Searches;
@@ -158,7 +158,7 @@ protected CheckResult runCheck() {
             // cannot happen lol
             LOG.error("Invalid timerange.", e);
             return null;
-        } catch (IndexHelper.InvalidRangeFormatException e) {
+        } catch (InvalidRangeFormatException e) {
             // lol same here
             LOG.error("Invalid timerange format.", e);
             return null;

graylog2-server/src/main/java/org/graylog2/alerts/types/MessageCountAlertCondition.java

@@ -20,7 +20,7 @@
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
 import org.graylog2.alerts.AbstractAlertCondition;
-import org.graylog2.indexer.IndexHelper;
+import org.graylog2.indexer.InvalidRangeFormatException;
 import org.graylog2.indexer.results.CountResult;
 import org.graylog2.indexer.results.ResultMessage;
 import org.graylog2.indexer.results.SearchResult;
@@ -116,7 +116,7 @@ protected CheckResult runCheck() {
             // cannot happen lol
             LOG.error("Invalid timerange.", e);
             return null;
-        } catch (IndexHelper.InvalidRangeFormatException e) {
+        } catch (InvalidRangeFormatException e) {
             // lol same here
             LOG.error("Invalid timerange format.", e);
             return null;

graylog2-server/src/main/java/org/graylog2/dashboards/widgets/FieldChartWidget.java

@@ -18,7 +18,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
-import org.graylog2.indexer.IndexHelper;
+import org.graylog2.indexer.InvalidRangeFormatException;
 import org.graylog2.indexer.results.HistogramResult;
 import org.graylog2.indexer.searches.Searches;
 import org.graylog2.indexer.searches.timeranges.TimeRange;
@@ -99,10 +99,6 @@ protected ComputationResult compute() {
             String msg = "Could not calculate [" + this.getClass().getCanonicalName() + "] widget <" + getId() + ">. Not a numeric field? The field was [" + config.get("field") + "]";
             LOG.error(msg, e);
             throw new RuntimeException(msg);
-        } catch (IndexHelper.InvalidRangeFormatException e) {
-            String msg = "Could not calculate [" + this.getClass().getCanonicalName() + "] widget <" + getId() + ">. Invalid time range.";
-            LOG.error(msg, e);
-            throw new RuntimeException(msg);
         }
     }
 

graylog2-server/src/main/java/org/graylog2/dashboards/widgets/QuickvaluesWidget.java

@@ -19,7 +19,6 @@
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import org.graylog2.indexer.IndexHelper;
 import org.graylog2.indexer.results.TermsResult;
 import org.graylog2.indexer.searches.Searches;
 import org.graylog2.indexer.searches.timeranges.TimeRange;
@@ -87,21 +86,15 @@ protected ComputationResult compute() {
             filter = "streams:" + streamId;
         }
 
-        try {
-            final TermsResult terms = searches.terms(field, 50, query, filter, timeRange);
+        final TermsResult terms = searches.terms(field, 50, query, filter, timeRange);
 
-            Map<String, Object> result = Maps.newHashMap();
-            result.put("terms", terms.getTerms());
-            result.put("total", terms.getTotal());
-            result.put("other", terms.getOther());
-            result.put("missing", terms.getMissing());
+        Map<String, Object> result = Maps.newHashMap();
+        result.put("terms", terms.getTerms());
+        result.put("total", terms.getTotal());
+        result.put("other", terms.getOther());
+        result.put("missing", terms.getMissing());
 
-            return new ComputationResult(result, terms.took().millis());
-        } catch (IndexHelper.InvalidRangeFormatException e) {
-            String msg = "Could not calculate [" + this.getClass().getCanonicalName() + "] widget <" + getId() + ">. Invalid time range.";
-            LOG.error(msg, e);
-            throw new RuntimeException(msg);
-        }
+        return new ComputationResult(result, terms.took().millis());
     }
 
     private boolean checkConfig(Map<String, Object> config) {

graylog2-server/src/main/java/org/graylog2/dashboards/widgets/SearchResultChartWidget.java

@@ -18,7 +18,6 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
-import org.graylog2.indexer.IndexHelper;
 import org.graylog2.indexer.results.HistogramResult;
 import org.graylog2.indexer.searches.Searches;
 import org.graylog2.indexer.searches.timeranges.TimeRange;
@@ -90,11 +89,7 @@ protected ComputationResult compute() {
             filter = "streams:" + streamId;
         }
 
-        try {
-            HistogramResult histogram = searches.histogram(query, interval, filter, timeRange);
-            return new ComputationResult(histogram.getResults(), histogram.took().millis(), histogram.getHistogramBoundaries());
-        } catch (IndexHelper.InvalidRangeFormatException e) {
-            throw new RuntimeException("Invalid timerange format.", e);
-        }
+        HistogramResult histogram = searches.histogram(query, interval, filter, timeRange);
+        return new ComputationResult(histogram.getResults(), histogram.took().millis(), histogram.getHistogramBoundaries());
     }
 }

graylog2-server/src/main/java/org/graylog2/dashboards/widgets/SearchResultCountWidget.java

@@ -19,7 +19,6 @@
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import org.graylog2.indexer.IndexHelper;
 import org.graylog2.indexer.results.CountResult;
 import org.graylog2.indexer.searches.Searches;
 import org.graylog2.indexer.searches.timeranges.AbsoluteRange;
@@ -76,25 +75,21 @@ protected ComputationResult compute() {
     }
 
     protected ComputationResult computeInternal(String filter) {
-        try {
-            CountResult cr = searches.count(query, timeRange, filter);
-            if (trend && timeRange instanceof RelativeRange) {
-                DateTime toPrevious = timeRange.getFrom();
-                DateTime fromPrevious = toPrevious.minus(Seconds.seconds(((RelativeRange) timeRange).getRange()));
-                TimeRange previousTimeRange = new AbsoluteRange(fromPrevious, toPrevious);
-                CountResult previousCr = searches.count(query, previousTimeRange);
+        CountResult cr = searches.count(query, timeRange, filter);
+        if (trend && timeRange instanceof RelativeRange) {
+            DateTime toPrevious = timeRange.getFrom();
+            DateTime fromPrevious = toPrevious.minus(Seconds.seconds(((RelativeRange) timeRange).getRange()));
+            TimeRange previousTimeRange = new AbsoluteRange(fromPrevious, toPrevious);
+            CountResult previousCr = searches.count(query, previousTimeRange);
 
-                Map<String, Object> results = Maps.newHashMap();
-                results.put("now", cr.getCount());
-                results.put("previous", previousCr.getCount());
-                long tookMs = cr.getTookMs() + previousCr.getTookMs();
+            Map<String, Object> results = Maps.newHashMap();
+            results.put("now", cr.getCount());
+            results.put("previous", previousCr.getCount());
+            long tookMs = cr.getTookMs() + previousCr.getTookMs();
 
-                return new ComputationResult(results, tookMs);
-            } else {
-                return new ComputationResult(cr.getCount(), cr.getTookMs());
-            }
-        } catch (IndexHelper.InvalidRangeFormatException e) {
-            throw new RuntimeException("Invalid timerange format.", e);
+            return new ComputationResult(results, tookMs);
+        } else {
+            return new ComputationResult(cr.getCount(), cr.getTookMs());
         }
     }
 }

graylog2-server/src/main/java/org/graylog2/dashboards/widgets/StatisticalCountWidget.java

@@ -19,7 +19,6 @@
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import org.graylog2.indexer.IndexHelper;
 import org.graylog2.indexer.results.FieldStatsResult;
 import org.graylog2.indexer.searches.Searches;
 import org.graylog2.indexer.searches.timeranges.AbsoluteRange;
@@ -118,8 +117,6 @@ protected ComputationResult compute() {
             } else {
                 return new ComputationResult(getStatisticalValue(fieldStatsResult), fieldStatsResult.took().millis());
             }
-        } catch (IndexHelper.InvalidRangeFormatException e) {
-            throw new RuntimeException("Invalid timerange format.", e);
         } catch (Searches.FieldTypeException e) {
             throw new RuntimeException("Invalid field provided.", e);
         }

graylog2-server/src/main/java/org/graylog2/indexer/IndexHelper.java

@@ -127,6 +127,4 @@ public int compare(IndexRange o1, IndexRange o2) {
         return indices;
     }
 
-    public static class InvalidRangeFormatException extends Exception {
-    }
 }

graylog2-server/src/main/java/org/graylog2/indexer/InvalidRangeFormatException.java

@@ -0,0 +1,19 @@
+package org.graylog2.indexer;
+
+public class InvalidRangeFormatException extends RuntimeException {
+    public InvalidRangeFormatException() {
+        super("Invalid timerange parameters provided");
+    }
+
+    public InvalidRangeFormatException(String message) {
+        super(message);
+    }
+
+    public InvalidRangeFormatException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidRangeFormatException(Throwable cause) {
+        super("Invalid timerange parameters provided", cause);
+    }
+}

graylog2-server/src/main/java/org/graylog2/indexer/InvalidRangeFormatExceptionMapper.java

@@ -0,0 +1,20 @@
+package org.graylog2.indexer;
+
+import org.graylog2.plugin.rest.ApiError;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class InvalidRangeFormatExceptionMapper implements ExceptionMapper<InvalidRangeFormatException> {
+    @Override
+    public Response toResponse(InvalidRangeFormatException exception) {
+        return Response
+                .status(Response.Status.BAD_REQUEST)
+                .type(MediaType.APPLICATION_JSON_TYPE)
+                .entity(new ApiError(exception.getMessage()))
+                .build();
+    }
+}