Upgrade ES 5

Author: EmmanuelDuru

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

@@ -86,6 +86,7 @@ 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("cluster.name", this.clusterName)
                                                 .build();
          ArrayList<Class<? extends Plugin>> plugins = new ArrayList<Class<? extends Plugin>>();
          plugins.add (MockTcpTransportPlugin.class);

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

@@ -390,7 +390,9 @@ private QueryBuilder addFilters(QueryBuilder query, final List<QueryBuilder> esF
 ***/
                result = QueryBuilders.boolQuery().must(query);
                for (QueryBuilder esFilter : esFilters) {
-                  result.filter(esFilter);
+                  if (esFilter != null) {
+                     result.filter(esFilter);
+                  }
                }
             }
             //return query;