Merge remote-tracking branch 'origin/master'

README.md

@@ -1,7 +1,7 @@
 # chili-core [![Build Status](https://travis-ci.org/codingchili/chili-core.svg?branch=master)](https://travis-ci.org/codingchili/chili-core) [![](https://jitpack.io/v/codingchili/chili-core.svg)](https://jitpack.io/#codingchili/chili-core)
 
 The chili core is an opinionated framework for creating microservices with focus on speed of development and time to market. 
-It's based on the Vert.x toolkit for maximum power and uses Hazelcast for plug-and-play clustering. 
+It's based on the Vert.x toolkit for maximum power and uses Hazelcast for plug-and-play clustering. This project is small with only 22k LOC.
 
 Find the official documentation [here](https://codingchili.github.io/chili-core/).
 

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'maven'
 
-project.version = "1.1.2"
+project.version = "1.1.3"
 project.group = 'com.github.codingchili.chili-core'
 
 subprojects {

core/build.gradle

@@ -27,18 +27,18 @@ artifacts {
 }
 
 dependencies {
-    compile 'io.vertx:vertx-core:3.6.0'
-    compile 'io.vertx:vertx-web:3.6.0'
-    compile 'io.vertx:vertx-hazelcast:3.6.0'
-    compile 'io.vertx:vertx-mongo-client:3.6.0'
-    compile 'io.vertx:vertx-dropwizard-metrics:3.6.0'
+    compile 'io.vertx:vertx-core:3.6.3'
+    compile 'io.vertx:vertx-web:3.6.3'
+    compile 'io.vertx:vertx-hazelcast:3.6.3'
+    compile 'io.vertx:vertx-mongo-client:3.6.3'
+    compile 'io.vertx:vertx-dropwizard-metrics:3.6.3'
     compile 'de.neuland-bfi:jade4j:1.2.7'
     compile 'de.mkammerer:argon2-jvm:2.5'
     compile 'org.fusesource.jansi:jansi:1.17.1'
     compile 'com.googlecode.cqengine:cqengine:3.0.0'
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7'
 
 
-    testCompile 'io.vertx:vertx-unit:3.6.0'
+    testCompile 'io.vertx:vertx-unit:3.6.3'
     testCompile 'junit:junit:4.12'
 }

core/main/java/com/codingchili/core/configuration/system/RemoteStorage.java

@@ -11,6 +11,7 @@ public class RemoteStorage {
     private String database = CoreStrings.DEFAULT_DB;
     private Integer port = 27017;
     private int persistInterval = 3000;
+    private boolean secure = false;
 
     /**
      * @param host     the hostname of the remote storage
@@ -113,4 +114,21 @@ public RemoteStorage setPersistInterval(int persistInterval) {
         this.persistInterval = persistInterval;
         return this;
     }
+
+    /**
+     * @return true if the storage plugin should attempt to use a secure connection.
+     * If the plugin supports security and fails to enable it an error must be thrown
+     * and storage initialization fail.
+     */
+    public boolean isSecure() {
+        return secure;
+    }
+
+    /**
+     * @param secure indicates that this storage must be loaded with a secure
+     *               connection.
+     */
+    public void setSecure(boolean secure) {
+        this.secure = secure;
+    }
 }

core/test/java/com/codingchili/core/listener/RestRequestTest.java

@@ -355,6 +355,11 @@ public void fail(Throwable throwable) {
 
         }
 
+        @Override
+        public void fail(int i, Throwable throwable) {
+
+        }
+
         @Override
         public RoutingContext put(String s, Object o) {
             return null;

core/test/java/com/codingchili/core/storage/HazelMapIT.java

@@ -44,6 +44,6 @@ public void tearDown(TestContext test) {
 
     @Before
     public void setUp(TestContext test) {
-        super.setUp(test.async(), HazelMap.class, context);
+        super.setUp(test, HazelMap.class, context);
     }
 }

core/test/java/com/codingchili/core/storage/MapTestCases.java

@@ -55,17 +55,18 @@ public class MapTestCases {
     protected AsyncStorage<StorageObject> store;
 
     protected void setUp(TestContext test, Class<? extends AsyncStorage> plugin) {
-        setUp(test.async(), plugin, new SystemContext());
+        setUp(test, plugin, new SystemContext());
     }
 
     @After
     public void tearDown(TestContext test) {
         context.close(test.asyncAssertSuccess());
     }
 
-    protected void setUp(Async async, Class<? extends AsyncStorage> plugin, CoreContext context) {
+    protected void setUp(TestContext test, Class<? extends AsyncStorage> plugin, CoreContext context) {
         this.context = new StorageContext<>(context);
         this.plugin = plugin;
+        Async async = test.async();
 
         new StorageLoader<StorageObject>(context)
                 .withDB(plugin.getSimpleName(), COLLECTION)
@@ -76,7 +77,7 @@ protected void setUp(Async async, Class<? extends AsyncStorage> plugin, CoreCont
                         store = result.result();
                         prepareStore(async);
                     } else {
-                        throw new RuntimeException(result.cause());
+                        test.fail(result.cause());
                     }
                 });
     }

docs/storage.md

@@ -1,3 +1,11 @@
+# Storage
+
 query dsl
+
 query api
-supported engines
+
+supported engines
+
+supported versions
+
+ElasticSearch 7.0.0

storage/elastic/build.gradle

@@ -18,7 +18,7 @@ jar {
 }
 
 dependencies {
-    compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client:6.4.1'
+    compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.0.0-rc1'
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7'
     compileOnly project(':core')