Upgrade ES 6 (changing to single type indices + miscs for unit tests)

Author: EmmanuelDuru

elasticsearch-mapping/pom.xml

@@ -24,6 +24,11 @@
                 <groupId>org.elasticsearch.plugin</groupId>
                 <artifactId>transport-netty4-client</artifactId>
             </dependency>
+<dependency>
+    <groupId>org.codelibs.elasticsearch.module</groupId>
+    <artifactId>analysis-common</artifactId>
+    <version>${elasticsearch.version}</version>
+</dependency>
         <dependency>
             <groupId>com.floragunn</groupId>
             <artifactId>search-guard-ssl</artifactId>

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

@@ -9,6 +9,7 @@
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthAction;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.elasticsearch.analysis.common.CommonAnalysisPlugin;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.network.NetworkModule;
@@ -86,10 +87,12 @@ public void initialize() throws Exception {
          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)
+                                                .put("node.name", "alien")
                                                 .put("cluster.name", this.clusterName)
                                                 .build();
          ArrayList<Class<? extends Plugin>> plugins = new ArrayList<Class<? extends Plugin>>();
          plugins.add (MockTcpTransportPlugin.class);
+         plugins.add (CommonAnalysisPlugin.class);
          MockNode node = new MockNode(settings, plugins);
          node.start();
          this.client = node.client();

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

@@ -189,7 +189,8 @@ public void parseClassAnnotations(Class<?> clazz, String pathPrefix)
         List<IFacetBuilderHelper> facetFields = new ArrayList<IFacetBuilderHelper>();
         Map<String, SourceFetchContext> fetchContexts = new HashMap<String, SourceFetchContext>();
 
-        typeDefinitionMap.put(typeNameStr, classDefinitionMap);
+        //typeDefinitionMap.put(typeNameStr, classDefinitionMap);
+        typeDefinitionMap.put("_doc", classDefinitionMap);
 
 /*********************
         if (esAll != null) {

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

@@ -314,9 +314,9 @@ public QueryBuilderHelper scriptFunction(String functionScore) {
         @Override
         public SearchResponse count(String[] indices, String... types) {
             SearchRequestBuilder countRequestBuilder = esClient.getClient().prepareSearch(indices);
-            if (types != null && types.length > 0) {
+            /**if (types != null && types.length > 0) {
                 countRequestBuilder.setTypes(types);
-            } 
+            }**/
             countRequestBuilder.setSize(0).setQuery(this.queryBuilder);
             return countRequestBuilder.execute().actionGet();
         }
@@ -465,7 +465,7 @@ private QueryBuilder getAndFilter(List<QueryBuilder> filters) {
 
         @Override
         public SearchResponse execute(int from, int size) {
-            searchRequestBuilder.setTypes(getTypes());
+            //searchRequestBuilder.setTypes(getTypes());
             if (prefixField == null) {
                 if (!fieldSort) {
                     searchRequestBuilder.addSort(SortBuilders.scoreSort());

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

@@ -150,7 +150,8 @@ public void initIndexes(String indexName, Class<?>[] classes) throws Exception {
 
             for (Class<?> clazz : classes) {
                 System.out.println(mappingBuilder.getMapping(clazz));
-                createIndexRequestBuilder.addMapping(clazz.getSimpleName().toLowerCase(), mappingBuilder.getMapping(clazz), XContentType.JSON);
+                createIndexRequestBuilder.addMapping("_doc", mappingBuilder.getMapping(clazz), XContentType.JSON);
+                //createIndexRequestBuilder.addMapping(clazz.getSimpleName().toLowerCase(), mappingBuilder.getMapping(clazz), XContentType.JSON);
             }
             final CreateIndexResponse createResponse = createIndexRequestBuilder.execute().actionGet();
             if (!createResponse.isAcknowledged()) {
@@ -165,11 +166,11 @@ public void save(String indexName, Person data) throws JsonGenerationException,
 		System.out.println (json);
         //esClient.getClient().prepareIndex(indexName, indexName).setOperationThreaded(false).setSource(json).setRefresh(true).execute().actionGet();
 		String idValue = (new FieldsMappingBuilder()).getIdValue(data);
-        esClient.getClient().prepareIndex(indexName, indexName, idValue).setSource(json, XContentType.JSON).setRefreshPolicy(RefreshPolicy.IMMEDIATE).execute().actionGet();
+        esClient.getClient().prepareIndex(indexName, "_doc", idValue).setSource(json, XContentType.JSON).setRefreshPolicy(RefreshPolicy.IMMEDIATE).execute().actionGet();
     }
 
     public Person readById(String indexName, String id) throws JsonParseException, JsonMappingException, IOException {
-        GetResponse response = esClient.getClient().prepareGet(indexName, indexName, id).execute().actionGet();
+        GetResponse response = esClient.getClient().prepareGet(indexName, "_doc", id).execute().actionGet();
 
         if (response == null || !response.isExists()) {
             return null;

elasticsearch-mapping/src/test/resources/city-mapping.json

@@ -1 +1 @@
-{"city":{"properties":{"all":{"type":"text"},"city":{"copy_to":"all","index":"true","boost":1.0,"store":false,"type":"keyword","fields":{"lower_case":{"fielddata":"true","analyzer":"lowerCaseAnalyser","index":"true","boost":1.0,"store":false,"type":"text"}}}}}}
+{"_doc":{"properties":{"all":{"type":"text"},"city":{"copy_to":"all","index":"true","boost":1.0,"store":false,"type":"keyword","fields":{"lower_case":{"fielddata":"true","analyzer":"lowerCaseAnalyser","index":"true","boost":1.0,"store":false,"type":"text"}}}}}}

elasticsearch-mapping/src/test/resources/person-mapping.json

@@ -1 +1 @@
-{"person":{"properties":{"all":{"type":"text"},"firstname":{"index":"false","boost":1.0,"store":false,"type":"keyword"},"address":{"type":"nested","properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"alienScore":{"index":"true","boost":1.0,"store":false,"ignore_malformed":false,"type":"long"},"addressMap":{"type":"object","enabled":"true","properties":{"value":{"properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"key":{"copy_to":"all","index":"false","boost":1.0,"store":false,"type":"keyword"}}},"alternateAddress":{"type":"object","enabled":true,"properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"lastname":{"copy_to":"all","fielddata":"true","index":"true","boost":1.0,"store":false,"type":"text"}}}}
+{"_doc":{"properties":{"all":{"type":"text"},"firstname":{"index":"false","boost":1.0,"store":false,"type":"keyword"},"address":{"type":"nested","properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"alienScore":{"index":"true","boost":1.0,"store":false,"ignore_malformed":false,"type":"long"},"addressMap":{"type":"object","enabled":"true","properties":{"value":{"properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"key":{"copy_to":"all","index":"false","boost":1.0,"store":false,"type":"keyword"}}},"alternateAddress":{"type":"object","enabled":true,"properties":{"city":{"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"lastname":{"copy_to":"all","fielddata":"true","index":"true","boost":1.0,"store":false,"type":"text"}}}}