Fix license headers

hawkular · Jul 4, 2017 · f1cafe9 · f1cafe9
1 parent 4943695
commit f1cafe9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/Functions.java b/core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/Functions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

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
@@ -676,19 +676,10 @@ public <T> Observable<DataPoint<T>> findDataPoints(MetricId<T> metricId, long st
                             .compose(new DataPointDecompressTransformer(metricType, safeOrder, limit, start, end));
 
             Comparator<DataPoint<T>> comparator = getDataPointComparator(safeOrder);
-
-//            List<Observable<? extends DataPoint<T>>> sortedObservables = new ArrayList<>(3);
-//            sortedObservables.add(uncompressedPoints.doOnCompleted(() -> log.infof("uncomp Completed")));
-//            sortedObservables.add(compressedPoints.doOnCompleted(() -> log.infof("comp Completed")));
-
-            Observable<DataPoint<T>> dataPoints;
-
             List<Observable<? extends DataPoint<T>>> sources = new ArrayList<>(3);
             sources.add(uncompressedPoints);
             sources.add(compressedPoints);
 
-//            Collection<Observable<? extends U>> sources = Arrays.asList(uncompressedPoints, compressedPoints);
-
             if(metricType == GAUGE) {
                 Func1<Row, DataPoint<T>> tempMapper = (Func1<Row, DataPoint<T>>) tempDataPointMappers.get(metricType);
 
@@ -703,7 +694,7 @@ public <T> Observable<DataPoint<T>> findDataPoints(MetricId<T> metricId, long st
 
                 sources.add(tempStoragePoints);
             }
-            dataPoints = SortedMerge.create(sources, comparator, false)
+            Observable<DataPoint<T>> dataPoints = SortedMerge.create(sources, comparator, false)
                     .distinctUntilChanged(
                             (tDataPoint, tDataPoint2) -> comparator.compare(tDataPoint, tDataPoint2) == 0);
 

diff --git a/...trics-core-service/src/test/java/org/hawkular/metrics/core/operators/SortedMergeTest.java b/...trics-core-service/src/test/java/org/hawkular/metrics/core/operators/SortedMergeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");