[ issue #95 ] Release 6.8.4

SeaseLtd · Nov 15, 2019 · 76adf41 · 76adf41
1 parent 64a6f86
commit 76adf41
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/rre-maven-plugin/rre-maven-elasticsearch-plugin/pom.xml b/rre-maven-plugin/rre-maven-elasticsearch-plugin/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rre-maven-elasticsearch-plugin</artifactId>
-    <version>7.0.1</version>
+    <version>6.8.4</version>
     <packaging>maven-plugin</packaging>
     <name>RRE - Maven Elasticsearch Plugin</name>
     <dependencies>

diff --git a/rre-maven-plugin/rre-maven-external-elasticsearch-plugin/pom.xml b/rre-maven-plugin/rre-maven-external-elasticsearch-plugin/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rre-maven-external-elasticsearch-plugin</artifactId>
-    <version>7.0.1</version>
+    <version>6.8.4</version>
     <packaging>maven-plugin</packaging>
     <name>RRE - Maven External Elasticsearch Plugin</name>
 

diff --git a/rre-search-platform/rre-search-platform-elastic-search-impl/pom.xml b/rre-search-platform/rre-search-platform-elastic-search-impl/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rre-search-platform-elasticsearch-impl</artifactId>
-    <version>7.0.1</version>
+    <version>6.8.4</version>
     <name>RRE - Elasticsearch platform binding</name>
     <dependencies>
         <dependency>

diff --git a/...latform-elastic-search-impl/src/main/java/io/sease/rre/search/api/impl/Elasticsearch.java b/...latform-elastic-search-impl/src/main/java/io/sease/rre/search/api/impl/Elasticsearch.java
@@ -58,7 +58,6 @@
 import static java.util.Arrays.asList;
 import static java.util.Arrays.stream;
 import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 import static org.elasticsearch.client.Requests.createIndexRequest;
@@ -77,7 +76,12 @@ public class Elasticsearch implements SearchPlatform {
 
     private static class RRENode extends Node {
         RRENode(final Settings settings, final Collection<Class<? extends Plugin>> plugins) {
-            super(prepareEnvironment(settings, emptyMap(), null, () -> "ANodeName"), plugins, true);
+            super(prepareEnvironment(settings, null), plugins, true);
+        }
+
+        @Override
+        protected void registerDerivedNodeNameWithLogger(String s) {
+            // empty
         }
     }
 
@@ -264,7 +268,7 @@ SearchRequest buildSearchRequest(final String indexName, final String query, fin
 
     QueryOrSearchResponse convertResponse(final SearchResponse searchResponse) {
         return new QueryOrSearchResponse(
-                searchResponse.getHits().getTotalHits().value,
+                searchResponse.getHits().totalHits,
                 stream(searchResponse.getHits().getHits())
                         .map(hit -> {
                             final Map<String, Object> result = new HashMap<>(hit.getSourceAsMap());