Code modifications for Chronix Server version 0.1.1

Author: Florian Lautenschlager

build.gradle

@@ -58,7 +58,7 @@ subprojects {
     apply plugin: 'com.jfrog.bintray'
     apply plugin: 'com.github.hierynomus.license'
 
-    version = 0.1
+    version = "0.1.1"
 
     license {
         includes(["**/*.java", "**/*.groovy"])

chronix-server-integration/src/main/java/de/qaware/chronix/examples/server/ChronixClientExample.java

@@ -19,6 +19,8 @@
 import de.qaware.chronix.converter.KassiopeiaSimpleConverter;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
 import de.qaware.chronix.timeseries.MetricTimeSeries;
+import de.qaware.chronix.timeseries.dt.DoubleList;
+import de.qaware.chronix.timeseries.dt.LongList;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -29,7 +31,6 @@
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * An example showcase of how to integrate chronix into your application.
@@ -79,14 +80,20 @@ private static String prettyPrint(List<MetricTimeSeries> maxTS) {
             sb.append("metric:[")
                     .append(ts.getMetric())
                     .append("] with value: [")
-                    .append(ts.getValues().collect(Collectors.toList()))
+                    .append(ts.getValues())
                     .append("]")
                     .append("\n");
         }
         return sb.toString();
     }
 
-    private static <T> List<T> concat(Stream<T> timestamps, Stream<T> timestamps1) {
-        return Stream.concat(timestamps, timestamps1).collect(Collectors.toList());
+    private static LongList concat(LongList first, LongList second) {
+        first.addAll(second);
+        return first;
     }
+    private static DoubleList concat(DoubleList first, DoubleList second) {
+        first.addAll(second);
+        return first;
+    }
+
 }

chronix-timeseries-exploration/src/main/java/de/qaware/chronix/examples/exploration/ui/MainController.java

@@ -21,7 +21,9 @@
 import de.qaware.chronix.examples.exploration.ui.log.TextAreaLogger;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
 import de.qaware.chronix.timeseries.MetricTimeSeries;
-import de.qaware.chronix.timeseries.Pair;
+import de.qaware.chronix.timeseries.dt.DoubleList;
+import de.qaware.chronix.timeseries.dt.LongList;
+import de.qaware.chronix.timeseries.dt.Pair;
 import javafx.application.Platform;
 import javafx.concurrent.Task;
 import javafx.event.EventHandler;
@@ -50,7 +52,6 @@
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Main controller for our simple example ui
@@ -141,8 +142,14 @@ public Void call() {
                 return null;
             }
 
-            private <T> List<T> concat(Stream<T> first, Stream<T> second) {
-                return Stream.concat(first, second).collect(Collectors.toList());
+            private LongList concat(LongList first, LongList second) {
+                first.addAll(second);
+                return first;
+            }
+
+            private DoubleList concat(DoubleList first, DoubleList second) {
+                first.addAll(second);
+                return first;
             }
         };