Upgrade ES 2 latest

Author: EmmanuelDuru

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

@@ -104,7 +104,7 @@ public ClusterHealthResponse waitForGreenStatus(String... indices) {
         LOGGER.debug("getNumberOfNodes         : {}", response.getNumberOfNodes());
         LOGGER.debug("getRelocatingShards      : {}", response.getRelocatingShards());
         LOGGER.debug("getUnassignedShards      : {}", response.getUnassignedShards());
-        LOGGER.debug("getAllValidationFailures : {}", response.getAllValidationFailures());
+        //LOGGER.debug("getAllValidationFailures : {}", response.getAllValidationFailures());
         return response;
     }
 
@@ -137,4 +137,4 @@ public void setHosts(final String hosts) {
     public void setResetData(final boolean resetData) {
         this.resetData = resetData;
     }
-}
+}

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

@@ -230,7 +230,8 @@ private void processFilterAnnotation(List<IFilterBuilderHelper> classFilters, St
                 path = path.trim();
                 addFilter(classFilters, nestedPrefix, esFieldName, indexable, path, isAnalyzed(indexable, null));
                 for (String alternateFieldName : alternateFieldNames(indexable)) {
-                    addFilter(classFilters, nestedPrefix, alternateFieldName, indexable, path, isAnalyzed(indexable, alternateFieldName));
+                    //addFilter(classFilters, nestedPrefix, alternateFieldName, indexable, path, isAnalyzed(indexable, alternateFieldName));
+                    addFilter(classFilters, nestedPrefix, esFieldName + "." + alternateFieldName, indexable, path, isAnalyzed(indexable, alternateFieldName));
                 }
             }
             return;

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

@@ -243,4 +243,4 @@ private String buildSettings(ObjectMapper mapper, IndexAnalyserDefinition[] cust
 
         return "{\"analysis\":{\"analyzer\":" + mapper.writeValueAsString(analysers) + "}}";
     }
-}
+}

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

@@ -20,6 +20,7 @@
 import org.elasticsearch.common.logging.Loggers;
 //import org.elasticsearch.index.query.FilterBuilder;
 //import org.elasticsearch.index.query.FilterBuilders;
+import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
@@ -379,10 +380,17 @@ private QueryBuilder addFilters(QueryBuilder query, Class<?> clazz, Map<String,
         private QueryBuilder addFilters(QueryBuilder query, final List<QueryBuilder> esFilters) {
             QueryBuilder filter = null;
             if (esFilters.size() > 0) {
+/**********************
                 filter = getAndFilter(esFilters);
                 if (filter != null) {
                     query = QueryBuilders.filteredQuery(query, filter);
                 }
+***********************/
+                BoolQueryBuilder result = QueryBuilders.boolQuery().must(query);
+                for (QueryBuilder esFilter : esFilters) {
+                   result = result.must(esFilter);
+                }
+                query = result;
             }
             return query;
         }

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

@@ -80,16 +80,16 @@ public void testMappingAndInsert() throws Exception {
 
         Map<String, String[]> filters = Maps.newHashMap();
 
-        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, Integer.MAX_VALUE);
+        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, 10000);
         Assert.assertEquals(2, response.getHits().getTotalHits());
         filters.put("address.city", new String[] { "Paris" });
-        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, Integer.MAX_VALUE);
+        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, 10000);
         Assert.assertEquals(1, response.getHits().getTotalHits());
         filters.put("address.city", new String[] { "Issy" });
-        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, Integer.MAX_VALUE);
+        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, 10000);
         Assert.assertEquals(0, response.getHits().getTotalHits());
         filters.put("address.city", new String[] { "Fontainebleau" });
-        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, Integer.MAX_VALUE);
+        response = this.queryHelper.buildQuery().types(requestedTypes).filters(filters).prepareSearch(searchIndexes).execute(0, 10000);
         Assert.assertEquals(1, response.getHits().getTotalHits());
 		} catch (Exception e) {
 			System.out.println ("Got e" + e.getMessage());
@@ -152,4 +152,4 @@ public SearchResponse search(String indexName, String searchText) {
 
         return searchRequestBuilder.execute().actionGet();
     }
-}
+}

pom.xml

@@ -10,7 +10,7 @@
     <description>An object mapping framework for Elastic Search.</description>
 
     <properties>
-        <elasticsearch.version>2.0.0</elasticsearch.version>
+        <elasticsearch.version>2.4.6</elasticsearch.version>
         <jackson.version>2.9.3</jackson.version>
         <spring.version>4.3.2.RELEASE</spring.version>
     	<commons-lang.version>3.5</commons-lang.version>