Upgraded chronix server integration to Chronix Server 0.1.3 and Kassiopeia 0.1.7

Author: Florian Lautenschlager

chronix-server-integration/build.gradle

@@ -31,15 +31,15 @@ dependencies {
 
     //Chronix
     compile 'de.qaware.chronix:chronix-api:0.1'
-    compile 'de.qaware.chronix:chronix-server-client:0.1.2'
+    compile 'de.qaware.chronix:chronix-server-client:0.1.3'
 
     //Kassiopeia-Simple
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.1.4'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.1.4'
+    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.1.7'
+    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.1.7'
 
     //Kassiopeia
-    compile 'de.qaware.chronix:chronix-kassiopeia:0.1.4'
-    compile 'de.qaware.chronix:chronix-kassiopeia-converter:0.1.4'
+    compile 'de.qaware.chronix:chronix-kassiopeia:0.1.7'
+    compile 'de.qaware.chronix:chronix-kassiopeia-converter:0.1.7'
 
     //Solr
     compile 'org.apache.solr:solr-solrj:5.5.0'

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

@@ -52,12 +52,11 @@ public static void main(String[] args) {
 
         //Define a reduce function for the grouped time series records
         BinaryOperator<MetricTimeSeries> reduce = (ts1, ts2) -> {
-            MetricTimeSeries.Builder reduced = new MetricTimeSeries
-                    .Builder(ts1.getMetric())
-                    .points(concat(ts1.getTimestamps(), ts2.getTimestamps()),
-                            concat(ts1.getValues(), ts2.getValues()))
-                    .attributes(ts2.attributes());
-            return reduced.build();
+            if (ts1 == null || ts2 == null) {
+                return new MetricTimeSeries.Builder("empty").build();
+            }
+            ts1.addAll(ts2.getTimestampsAsArray(), ts2.getValuesAsArray());
+            return ts1;
         };
         //Instantiate a Chronix Client
         ChronixClient<MetricTimeSeries, SolrClient, SolrQuery> chronix = new ChronixClient<>(