Upgrade ES 5

Author: EmmanuelDuru

elasticsearch-mapping/pom.xml

@@ -114,7 +114,7 @@
                 <groupId>org.elasticsearch.test</groupId>
                 <artifactId>framework</artifactId>
                 <version>${elasticsearch.version}</version>
-                <scope>test</scope>  
+                <!--<scope>test</scope>  -->
                 <exclusions>
                   <exclusion>
                 <groupId>com.carrotsearch.randomizedtesting</groupId>

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/ElasticSearchClient.java

@@ -1,5 +1,6 @@
 package org.elasticsearch.mapping;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -10,9 +11,15 @@
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.env.Environment;
+import org.elasticsearch.node.MockNode;
+import org.elasticsearch.node.Node;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.transport.MockTcpTransportPlugin;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.elasticsearch.util.AddressParserUtil;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,7 +39,7 @@
 @Slf4j
 public class ElasticSearchClient {
 
-//    private Node node;
+    private Node node;
     private boolean isClient;
     private boolean isTransportClient;
     private List<InetSocketTransportAddress> adresses;
@@ -47,7 +54,7 @@ public class ElasticSearchClient {
     private String truststorePassword = null;
 
     @PostConstruct
-    public void initialize() {
+    public void initialize() throws Exception {
         if (this.isClient && this.isTransportClient) {
             // when these both option are set, we use a transport client
             Settings.Builder settingsBuilder = Settings.builder()
@@ -71,11 +78,21 @@ public void initialize() {
             }
             this.client = transportClient;
         }  else {
-/************************
             // when only 'client' option is set, a node without data is initialized and joins the cluster
+/************************
             this.node = NodeBuilder.nodeBuilder().client(this.isClient).clusterName(this.clusterName).local(this.isLocal).node();
             this.client = node.client();
 ***************************/
+         Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), "target/eshome")
+                                                .put("transport.type", MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME)
+                                                .put(NetworkModule.HTTP_ENABLED.getKey(), false)
+                                                .build();
+         ArrayList<Class<? extends Plugin>> plugins = new ArrayList<Class<? extends Plugin>>();
+         plugins.add (MockTcpTransportPlugin.class);
+         MockNode node = new MockNode(settings, plugins);
+         node.start();
+         this.client = node.client();
+         this.node = node;
         } 
 
 //        if (this.resetData) { // removes all indices from elastic search. For Integration testing only.
@@ -85,15 +102,13 @@ public void initialize() {
     }
 
     @PreDestroy
-    public void close() {
+    public void close() throws Exception {
         if (client != null) {
             client.close();
         }
-/***
         if (node != null) {
             node.close();
         }
-****/
         log.info("Closed ElasticSearch client for cluster <" + this.clusterName + ">");
     }
 
@@ -106,15 +121,6 @@ public Client getClient() {
         return this.client;
     }
 
-    /**
-     * Set client (for tests)
-     *  
-     *  @param client ES client
-     */
-    public void setClient (Client client) {
-        this.client = client;
-    }
-
     /**
      * Wait for green status for the given indices.
      * 

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/BooleanFieldAnnotationParser.java

@@ -4,6 +4,7 @@
 
 import org.elasticsearch.annotation.BooleanField;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.IndexType;
 import org.elasticsearch.mapping.MappingBuilder;
 import lombok.extern.slf4j.Slf4j;
 
@@ -24,7 +25,8 @@ public void parseAnnotation(BooleanField annotation, Map<String, Object> fieldDe
 
         fieldDefinition.put("type", "boolean");
         fieldDefinition.put("store", annotation.store());
-        fieldDefinition.put("index", annotation.index());
+        //fieldDefinition.put("index", annotation.index());
+        fieldDefinition.put("index", annotation.index() == IndexType.no ? "false" : "true");
         fieldDefinition.put("boost", annotation.boost());
         fieldDefinition.put("include_in_all", annotation.includeInAll());
     }

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/DateFieldAnnotationParser.java

@@ -4,6 +4,7 @@
 
 import org.elasticsearch.annotation.DateField;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.IndexType;
 import org.elasticsearch.mapping.MappingBuilder;
 import org.elasticsearch.mapping.MappingException;
 import lombok.extern.slf4j.Slf4j;
@@ -25,8 +26,9 @@ public void parseAnnotation(DateField annotation, Map<String, Object> fieldDefin
 
         fieldDefinition.put("type", "date");
         fieldDefinition.put("store", annotation.store());
-        fieldDefinition.put("index", annotation.index());
-        fieldDefinition.put("precision_step", annotation.precisionStep());
+        //fieldDefinition.put("index", annotation.index());
+        fieldDefinition.put("index", annotation.index() == IndexType.no ? "false" : "true");
+        //fieldDefinition.put("precision_step", annotation.precisionStep());
         fieldDefinition.put("boost", annotation.boost());
         fieldDefinition.put("include_in_all", annotation.includeInAll());
         fieldDefinition.put("ignore_malformed", annotation.ignoreMalformed());

elasticsearch-mapping/src/test/java/org/elasticsearch/mapping/ElasticSearchInsertMappingTest.java

@@ -56,6 +56,7 @@ public class ElasticSearchInsertMappingTest {
 
     @Before
     public void setUp() throws Exception {
+/***************
       try {
          Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), "target/eshome")
                                                 .put("transport.type", MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME)
@@ -68,14 +69,11 @@ public void setUp() throws Exception {
          node.start();
          client = node.client();
          esClient.setClient(client);
-/***
-         super.setUp();
-         esClient.setClient(client());
-***/
       } catch (Exception e) {
          System.out.println ("Got " + e.getMessage());
          e.printStackTrace();
       }
+***********************/
     }
 
     @Test

pom.xml

@@ -103,7 +103,7 @@
                 <groupId>org.elasticsearch.test</groupId>
                 <artifactId>framework</artifactId>
                 <version>${elasticsearch.version}</version>
-                <scope>test</scope> 
+<!--                <scope>test</scope>      -->
                 <exclusions>
                   <exclusion>
                 <groupId>com.carrotsearch.randomizedtesting</groupId>