Merge pull request #125 from codingchili/improved-queries

Improved queries + fix for failing tests since gradle migration.

.gitignore

@@ -5,4 +5,8 @@ target/
 build/
 core/conf/
 prototype/service
-prototype/website/bower_components/
+core/test/resources/Configurations/testfile.json
+prototype/core-full-1.0-SNAPSHOT.jar
+prototype/core-1.0-SNAPSHOT.jar
+core/db/
+services/logging/db/

.travis.yml

@@ -2,13 +2,33 @@ language: java
 sudo: false
 jdk:
   - oraclejdk8
-script: gradle build
+script: gradle build --stacktrace
 notifications:
   email: true
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+before_script:
+  - sleep 10
+services:
+#  - elasticsearch - requires version 5.2.2
+  - mongodb
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
+deploy:
+  provider: releases
+  api_key:
+    secure: W9XJLLhuWj7f3/xcV8TYWVTrtoYi8iMQTcatwNR3I9nKmK05ywab/G+iD4anZJWyZrOtvuS0ztBrPQMiGGdEju1iMRkuFTlC0XJOAJNL60gGgeZ7ngpBV/RWEEqGcUw+CNXvVIkbox9uXK5qokw8PMB7osnjmRpyfmLIL2hbiYVzXN3S3iKGn8nO7evWIVYjhEcHcZSCMlcLviBWJgCVzBpofubTy6zOVIggRG17tJjfstDsoyjmCWoZA18ZlGftcvM1a60H5retY9k/qYYVT5EPTrDmLLAHLP7Vy2ScgfzCWcO9V9Q8/BgfEwlpQ4j7ngHWW8zIk3QCqPZ9iDiXTkok8qhMQTRKebIOXJGnaI9ZoT/WehL6mGhHW23Cvpp8ubDLSyFuv9ylfUk9drdshEP/b02dV2o3S06PYhjXFinoOBRXMkIHwX0QFt8W85OyOCjARpBR5qDyxH5gCxSpfFaoUG0/CdWWoKdXDlwaG3KNzyU2jsjGsI3Y73q2AE+9qc9tgHHheK2TIjJPRMkjy0bxRHmEnSMM3JsP+/vNJNEDnZFgMxpHcixMikVbxpBzcSFSnjQNZs1bETMaHmIsPX34w8ODwwd5XQCrZb0zJiqe8A7tlcjcY9izTJ7+2O2hl9Lq8DJCQNb0awWXbX+KYjHH9YG2eF5sXxPrLLWgX+k=
+  file_glob: true
+  file:
+    - release/*
+    - build/distributions/*
+  skip_cleanup: true
+  overwrite: true
+  on:
+    tags: true
+env:
+  global:
+    - GRADLE_OPTS="-Xms256m"

build.gradle

@@ -1,83 +1,82 @@
 apply plugin: 'java'
 apply plugin: 'idea'
 
-version = "1.0-SNAPSHOT"
-libsDirName = '../prototype'
-
-tasks.withType(JavaCompile) {
-	options.encoding = 'UTF-8'
-}
+project.version = "1.0-SNAPSHOT"
+project.group = 'com.codingchili'
 
 subprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
 
+    version = rootProject.version
+    group = rootProject.version
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    libsDirName = '../../../prototype/service'
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
 
     sourceSets {
         main {
             java {
-                srcDir 'main/'
+                srcDir 'main/java'
+            }
+            resources {
+                srcDir 'main/resources'
             }
         }
         test {
             java {
-                srcDir 'test/'
+                srcDir 'test/java'
+            }
+            resources {
+                srcDir 'test/resources'
             }
         }
     }
 
     repositories {
         maven { url 'http://repo.maven.apache.org/maven2' }
     }
-}
 
-repositories {
-    maven { url 'http://repo.maven.apache.org/maven2' }
-}
-
-jar {
-    from {
-        (configurations.runtime).collect {
-            it.isDirectory() ? it : zipTree(it)
+    test {
+        testLogging {
+            exceptionFormat "full"
         }
     }
-    manifest {
-        attributes 'Implementation-Title' : 'chili-core',
-                'Implementation-Version': version,
-                'Main-Class': 'com.codingchili.core.Launcher'
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier 'sources'
+        from sourceSets.main.allSource
     }
 }
 
-subprojects.each { subproject -> evaluationDependsOn( subproject.path ) }
+task archiveZip(type: Zip, dependsOn: 'jar') {
+    baseName = 'prototype'
+    from fileTree('prototype')
 
-jar.dependsOn subprojects.tasks['classes']
-jar {
-    baseName = 'core-full'
-    manifest {
-        attributes 'Main-Class': 'com.codingchili.core.Launcher'
-    }
-    subprojects.each { subproject ->
-        from subproject.sourceSets.main.output.classesDir
-        from subproject.sourceSets.main.output.resourcesDir
+    from (subprojects.collect {it.tasks.withType(Jar)}) {
+        into 'lib'
     }
 }
 
-allprojects {
-    dependencies {
-        compile group: 'junit', name: 'junit', version: '4.12'
-        compile group: 'io.vertx', name: 'vertx-core', version: '3.3.3'
-        compile group: 'io.vertx', name: 'vertx-unit', version: '3.3.3'
-        compile group: 'io.vertx', name: 'vertx-web', version: '3.3.3'
-        compile group: 'io.vertx', name: 'vertx-hazelcast', version: '3.3.3'
-        compile group: 'io.vertx', name: 'vertx-mongo-client', version: '3.3.3'
-        compile group: 'io.vertx', name: 'vertx-dropwizard-metrics', version: '3.3.3'
-        compile group: 'org.fusesource.jansi', name: 'jansi', version: '1.14'
+task copyTask(type: Copy, dependsOn: 'build') {
+    from (subprojects.collect {it.tasks.withType(Jar)})
+    /*from (subprojects.collect {it.tasks.withType(Javadoc)})*/
+    from (subprojects.collect {it.tasks.withType(AbstractArchiveTask)})
+    destinationDir = new File('release')
+}
 
-        // the following dependencies are about 25MB in size..
-        compile group: 'org.elasticsearch.client', name: 'transport', version: '5.0.2'
+if (System.env.TRAVIS == 'true') {
+    allprojects {
+        tasks.withType(GroovyCompile) {
+            groovyOptions.fork = true
+        }
+        tasks.withType(Test) {
+            maxParallelForks = 2
+            minHeapSize = '256m'
+        }
     }
-}
+}

common/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile project(':core')
+}

common/service/main/com.codingchili.common/Strings.java → common/main/java/com.codingchili.common/Strings.java

@@ -116,4 +116,12 @@ public static String getCharacterMissingError(String character) {
     public static String getTimeOutEcxeption(String target, int timeout) {
         return "Timed out after waiting for  " + timeout + "(ms) for address: " + target;
     }
+
+    public static String getNodeNotReachable(String target) {
+        return "The remote node '" + target + "' is currently not available.";
+    }
+
+    public static String getNodeFailedToAcknowledge(String target) {
+        return "The remote node '" + target + "' did not acknowledge the message.";
+    }
 }

core/build.gradle

@@ -1,10 +1,3 @@
-group = 'com.codingchili'
-version = '1.0-SNAPSHOT'
-
-libsDirName = "../../prototype"
-
-description = """"""
-
 jar {
     from {
         (configurations.runtime).collect {
@@ -19,5 +12,19 @@ jar {
 }
 
 dependencies {
-    compile project(':common:testing')
+    compile group: 'junit', name: 'junit', version: '4.12'
+    compile group: 'io.vertx', name: 'vertx-core', version: '3.4.0'
+    compile group: 'io.vertx', name: 'vertx-unit', version: '3.4.0'
+    compile group: 'io.vertx', name: 'vertx-web', version: '3.4.0'
+    compile group: 'io.vertx', name: 'vertx-hazelcast', version: '3.4.0'
+    compile group: 'io.vertx', name: 'vertx-mongo-client', version: '3.4.0'
+    compile group: 'io.vertx', name: 'vertx-dropwizard-metrics', version: '3.4.0'
+    compile group: 'org.fusesource.jansi', name: 'jansi', version: '1.14'
+
+    // the following dependencies are about 25MB in size..
+    compile group: 'org.elasticsearch.client', name: 'transport', version: '5.2.2'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.6.2'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.6.2'
+
+    compile group: 'com.googlecode.cqengine', name: 'cqengine', version: '2.9.3'
 }