Merge pull request #9 from FlorianLautenschlager/master

Florian Lautenschlager · web-flow · commit 8d2fb1655b3f · 2016-10-20T10:00:42.000+02:00
Updated to latest versions
diff --git a/build.gradle b/build.gradle
@@ -14,20 +14,12 @@
  *    limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath 'com.gradle.publish:plugin-publish-plugin:0.9.1'
-        classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-    }
+plugins {
+    id "org.sonarqube" version "2.1"
+    id "de.undercouch.download" version "3.1.1"
+    id "com.github.hierynomus.license" version "0.13.1"
+    id "com.jfrog.bintray" version "1.7.2"
+    id 'com.github.kt3k.coveralls' version '2.6.3'
 }
 
 allprojects {
@@ -45,7 +37,7 @@ allprojects {
     }
 
     jacoco {
-        toolVersion = '0.7.2.201409121644'
+        toolVersion = '0.7.6.201602180812'
     }
 }
 
@@ -54,7 +46,6 @@ subprojects {
     apply plugin: 'groovy'
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    apply plugin: 'com.gradle.plugin-publish'
     apply plugin: 'com.jfrog.bintray'
     apply plugin: 'com.github.hierynomus.license'
 
@@ -151,6 +142,6 @@ tasks.coveralls {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
+    gradleVersion = '3.1'
 }
 
diff --git a/chronix-importer/build.gradle b/chronix-importer/build.gradle
@@ -5,8 +5,8 @@ dependencies {
 
     compile 'de.qaware.chronix:chronix-api:0.1'
     compile 'de.qaware.chronix:chronix-server-client:0.3'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.2'
+    compile 'de.qaware.chronix:chronix-timeseries:0.3'
+    compile 'de.qaware.chronix:chronix-timeseries-converter:0.3'
 
     //Testing
     testCompile 'org.codehaus.groovy:groovy-all:2.4.6'
diff --git a/chronix-importer/importer/import.sh b/chronix-importer/importer/import.sh
diff --git a/chronix-importer/src/main/java/de/qaware/chronix/importer/csv/ChronixImporter.java b/chronix-importer/src/main/java/de/qaware/chronix/importer/csv/ChronixImporter.java
@@ -16,11 +16,11 @@
 package de.qaware.chronix.importer.csv;
 
 import de.qaware.chronix.ChronixClient;
-import de.qaware.chronix.converter.KassiopeiaSimpleConverter;
-import de.qaware.chronix.converter.serializer.gen.SimpleProtocolBuffers;
+import de.qaware.chronix.converter.MetricTimeSeriesConverter;
+import de.qaware.chronix.converter.serializer.gen.MetricProtocolBuffers;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
 import de.qaware.chronix.timeseries.MetricTimeSeries;
-import de.qaware.chronix.timeseries.Point;
+import de.qaware.chronix.timeseries.dts.Point;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -46,8 +46,8 @@ public class ChronixImporter {
     //serialized size of the list
     private static final int LIST_SERIALIZED_SIZE = 2;
     //serialized size of a point
-    private static final int POINT_SERIALIZED_SIZE = SimpleProtocolBuffers.Point.newBuilder()
-            .setT(Instant.now().toEpochMilli())
+    private static final int POINT_SERIALIZED_SIZE = MetricProtocolBuffers.Point.newBuilder()
+            .setTlong(Instant.now().toEpochMilli())
             .setV(4711).build()
             .getSerializedSize();
     private static final int SER_SIZE = LIST_SERIALIZED_SIZE + POINT_SERIALIZED_SIZE;
@@ -64,9 +64,9 @@ public class ChronixImporter {
      * @param url the url to chronix server
      */
     public ChronixImporter(String url, String[] attributeFields) {
-        CHRONIX_SOLR_CLIENT = new HttpSolrClient(url);
+        CHRONIX_SOLR_CLIENT = new HttpSolrClient.Builder(url).build();
         SCHEMA_FIELDS = attributeFields;
-        CHRONIX = new ChronixClient<>(new KassiopeiaSimpleConverter(),
+        CHRONIX = new ChronixClient<>(new MetricTimeSeriesConverter(),
                 new ChronixSolrStorage<>(200, null, null));
     }
 
diff --git a/chronix-server-integration/build.gradle b/chronix-server-integration/build.gradle
@@ -33,15 +33,10 @@ dependencies {
     compile 'de.qaware.chronix:chronix-api:0.1'
     compile 'de.qaware.chronix:chronix-server-client:0.3'
 
-    //Kassiopeia-Simple
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.2'
-
-    //Kassiopeia
-    compile 'de.qaware.chronix:chronix-kassiopeia:0.2'
-    compile 'de.qaware.chronix:chronix-kassiopeia-converter:0.2'
+    compile 'de.qaware.chronix:chronix-timeseries:0.3'
+    compile 'de.qaware.chronix:chronix-timeseries-converter:0.3'
 
     //Solr
-    compile 'org.apache.solr:solr-solrj:6.1.0'
+    compile 'org.apache.solr:solr-solrj:6.2.1'
 
 }
diff --git a/chronix-server-integration/src/main/java/de/qaware/chronix/examples/server/ChronixClientExampleWithKassiopeia.java b/chronix-server-integration/src/main/java/de/qaware/chronix/examples/server/ChronixClientExampleWithKassiopeia.java
@@ -16,7 +16,7 @@
 package de.qaware.chronix.examples.server;
 
 import de.qaware.chronix.ChronixClient;
-import de.qaware.chronix.converter.KassiopeiaConverter;
+import de.qaware.chronix.converter.AdvancedTimeSeriesConverter;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
 import de.qaware.chronix.timeseries.TimeSeries;
 import org.apache.solr.client.solrj.SolrClient;
@@ -55,7 +55,7 @@ public static void main(String[] args) {
 
         //Instantiate a Chronix Client
         ChronixClient<TimeSeries<Long, Double>, SolrClient, SolrQuery> chronix = new ChronixClient<>(
-                new KassiopeiaConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
+                new AdvancedTimeSeriesConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
 
         //We want the maximum of all time series that metric matches *load*.
         SolrQuery query = new SolrQuery("metric:*Load*");
diff --git a/chronix-server-integration/src/main/java/de/qaware/chronix/examples/server/ChronixClientExampleWithMetricTimeSeries.java b/chronix-server-integration/src/main/java/de/qaware/chronix/examples/server/ChronixClientExampleWithMetricTimeSeries.java
@@ -16,7 +16,7 @@
 package de.qaware.chronix.examples.server;
 
 import de.qaware.chronix.ChronixClient;
-import de.qaware.chronix.converter.KassiopeiaSimpleConverter;
+import de.qaware.chronix.converter.MetricTimeSeriesConverter;
 import de.qaware.chronix.converter.common.DoubleList;
 import de.qaware.chronix.converter.common.LongList;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
@@ -33,19 +33,17 @@
 import java.util.stream.Collectors;
 
 /**
- * An example showcase of how to integrate chronix into your application using kassiopeia-simple
- * Works with the release 0.2 of the chronix-server
- * Download at <a href="https://github.com/ChronixDB/chronix.server/releases/download/v0.1.1/chronix-0.1.1.zip">chronix-server-0.1.1</a>
+ * An example showcase of how to integrate chronix into your application
  *
  * @author f.lautenschlager
  */
-public class ChronixClientExampleWithKassiopeiaSimple {
+public class ChronixClientExampleWithMetricTimeSeries {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ChronixClientExampleWithKassiopeiaSimple.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChronixClientExampleWithMetricTimeSeries.class);
 
 
     public static void main(String[] args) {
-        SolrClient solr = new HttpSolrClient("http://localhost:8983/solr/chronix/");
+        SolrClient solr = new HttpSolrClient.Builder("http://localhost:8983/solr/chronix/").build();
 
         //Define a group by function for the time series records
         Function<MetricTimeSeries, String> groupBy = ts -> ts.getMetric() + "-" + ts.attribute("host");
@@ -60,7 +58,7 @@ public static void main(String[] args) {
         };
         //Instantiate a Chronix Client
         ChronixClient<MetricTimeSeries, SolrClient, SolrQuery> chronix = new ChronixClient<>(
-                new KassiopeiaSimpleConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
+                new MetricTimeSeriesConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
 
         //We want the maximum of all time series that metric matches *load*.
         SolrQuery query = new SolrQuery("metric:*Load*");
diff --git a/chronix-timeseries-exploration/build.gradle b/chronix-timeseries-exploration/build.gradle
@@ -24,14 +24,14 @@ dependencies {
     compile 'org.apache.logging.log4j:log4j-core:2.4'
 
     //Chronix libs
-    compile 'org.apache.solr:solr-solrj:6.1.0'
+    compile 'org.apache.solr:solr-solrj:6.2.1'
     //Solr need commons logging
     compile 'commons-logging:commons-logging:1.2'
 
     compile 'de.qaware.chronix:chronix-api:0.1'
     compile 'de.qaware.chronix:chronix-server-client:0.3'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.2'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.2'
+    compile 'de.qaware.chronix:chronix-timeseries:0.3'
+    compile 'de.qaware.chronix:chronix-timeseries-converter:0.3'
 }
 
 
diff --git a/chronix-timeseries-exploration/src/main/java/de/qaware/chronix/examples/exploration/ui/MainController.java b/chronix-timeseries-exploration/src/main/java/de/qaware/chronix/examples/exploration/ui/MainController.java
@@ -16,13 +16,13 @@
 package de.qaware.chronix.examples.exploration.ui;
 
 import de.qaware.chronix.ChronixClient;
-import de.qaware.chronix.converter.KassiopeiaSimpleConverter;
+import de.qaware.chronix.converter.MetricTimeSeriesConverter;
 import de.qaware.chronix.examples.exploration.ui.dt.DateAxis;
 import de.qaware.chronix.examples.exploration.ui.dt.ResultRow;
 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.Point;
+import de.qaware.chronix.timeseries.dts.Point;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -138,7 +138,7 @@ public void initChronix(String solrUrl) {
             public Void call() {
 
                 LOGGER.info("Setting up Chronix with a remote Solr to URL {}", solrUrl);
-                solr = new HttpSolrClient(solrUrl);
+                solr = new HttpSolrClient.Builder(solrUrl).build();
 
                 boolean solrAvailable = solrAvailable();
                 LOGGER.info("Checking connection to Solr. Result {}", solrAvailable);
@@ -158,7 +158,7 @@ public Void call() {
                     return timeSeries;
                 };
 
-                chronix = new ChronixClient<>(new KassiopeiaSimpleConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
+                chronix = new ChronixClient<>(new MetricTimeSeriesConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
 
                 return null;
             }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
