Maybe I fixed some rebasing issues..

hawkular · Jul 4, 2017 · 08da6a6 · 08da6a6
1 parent 9fa4ab6
commit 08da6a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.../metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccessImpl.java b/.../metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccessImpl.java
@@ -33,7 +33,6 @@
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.hawkular.metrics.core.service.compress.CompressedPointContainer;

diff --git a/...rics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java b/...rics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java
@@ -632,11 +632,6 @@ public <T> Observable<DataPoint<T>> findDataPoints(MetricId<T> metricId, long st
         MetricType<T> metricType = metricId.getType();
         Func1<Row, DataPoint<T>> mapper = getDataPointMapper(metricType);
 
-        Func6<MetricId<T>, Long, Long, Integer, Order, Integer, Observable<Row>> finder =
-                getDataPointFinder(metricType);
-
-        Observable<DataPoint<T>> results;
-
         if(metricType == GAUGE || metricType == AVAILABILITY || metricType == COUNTER) {
             long sliceStart = DateTimeService.getTimeSlice(start, Duration.standardHours(2));
 
@@ -693,7 +688,7 @@ public <T> Observable<DataPoint<T>> findDataPoints(MetricId<T> metricId, long st
         Func6<MetricId<T>, Long, Long, Integer, Order, Integer, Observable<Row>> finder =
                 getDataPointFinder(metricType);
 
-        results = finder.call(metricId, start, end, limit, safeOrder, pageSize).map(mapper);
+        Observable<DataPoint<T>> results = finder.call(metricId, start, end, limit, safeOrder, pageSize).map(mapper);
         return results.doOnCompleted(context::stop);
     }