Upgrade elasticsearch to high level rest client and 6.4.1.

codingchili · Sep 30, 2018 · 16378cb · 16378cb
1 parent 034e956
commit 16378cb
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 207 deletions.
diff --git a/core/main/java/com/codingchili/core/configuration/system/StorageSettings.java b/core/main/java/com/codingchili/core/configuration/system/StorageSettings.java
@@ -27,7 +27,7 @@ public StorageSettings() {
 
         // we cannot depend on the elastic storage from here, but we can still configure it.
         storage.put("com.codingchili.core.storage.ElasticMap",
-                new RemoteStorage(LOCALHOST, 9300, "chili"));
+                new RemoteStorage(LOCALHOST, 9200, "chili"));
     }
 
     @Override

diff --git a/core/test/java/com/codingchili/core/storage/MapTestCases.java b/core/test/java/com/codingchili/core/storage/MapTestCases.java
@@ -50,7 +50,7 @@ public class MapTestCases {
     protected static Integer STARTUP_DELAY = 1;
 
     @Rule
-    public Timeout timeout = Timeout.seconds(15);
+    public Timeout timeout = Timeout.seconds(60);
 
     protected Class<? extends AsyncStorage> plugin;
     protected StorageContext<StorageObject> context;

diff --git a/core/test/resources/AuthenticationGenerator/service1.json b/core/test/resources/AuthenticationGenerator/service1.json
@@ -1,14 +1 @@
-{
-  "service1secret" : "9H9ZEusnWz2Pphnn+g8ns+t/8FfsGrGKQXi8VucucJh3OZ/VfqnYItazxpyDa0ALghb3JUOiIh+lhGZ5M+Fv1g==",
-  "local" : "mUTYJGjzINKRTO1RAyW4XZSetGTJaes5iPcCYnaNNYNH99BjN07MJYuhzjCng64GUh5Vqp+/ZCjO5uaL5wHmKw==",
-  "global" : "Zt3W9Qoi9qm8VZw49vdStmiuvOpY4aTd5hALBE1SxDelKJ7dXCVUU0fZTlJwfOEfVCRr4smGt8l+WDrTuNWhZQ==",
-  "node" : "undefined.node",
-  "service1token" : {
-    "properties" : {
-      "type" : "HmacSHA512"
-    },
-    "domain" : "undefined",
-    "key" : "+ZK/ypUIDwCSU/oUONCCGXHJgXaSjVNnvYMBLw6FDj2Ggwc7/Z2suaZs/MNaX7XdLkbmn/uJb8svs2TLVtIXQQ==",
-    "expiry" : 1538863199
-  }
-}
+{ }
diff --git a/core/test/resources/AuthenticationGenerator/service2.json b/core/test/resources/AuthenticationGenerator/service2.json
@@ -1,13 +1 @@
-{
-  "local" : "oz2HXMuzXfX2B8s+zaNpzOdUm/TP+ZBWzxz7ZpfsiOskjUGwnxACARYDHN0rXjROm7SHjwSddVSHGoUNPthztg==",
-  "global" : "Zt3W9Qoi9qm8VZw49vdStmiuvOpY4aTd5hALBE1SxDelKJ7dXCVUU0fZTlJwfOEfVCRr4smGt8l+WDrTuNWhZQ==",
-  "node" : "undefined.node",
-  "service2token" : {
-    "properties" : {
-      "type" : "HmacSHA512"
-    },
-    "domain" : "undefined",
-    "key" : "gX3g9DgApCeWbXh1Bnk6A92C+GEtTc82sKwrZURwC3BVJMwenv0+x9kH+qBbO9HeABzAtPRl1pInWDcAxC5plw==",
-    "expiry" : 1538863199
-  }
-}
+{ }
diff --git a/storage/elastic/build.gradle b/storage/elastic/build.gradle
@@ -20,12 +20,12 @@ jar {
 }
 
 dependencies {
-    compile 'org.elasticsearch.client:transport:6.1.1'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.5'
+    compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client:6.4.1'
+    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7'
     compileOnly project(':core')
 
     testCompile project(':core')
     testCompile project(':core').sourceSets.test.output
-    testCompile 'io.vertx:vertx-unit:3.5.1'
+    testCompile 'io.vertx:vertx-unit:3.5.3'
     testCompile 'junit:junit:4.12'
 }