diff --git a/docs/java-api/aggregations/bucket/datehistogram-aggregation.asciidoc b/docs/java-api/aggregations/bucket/datehistogram-aggregation.asciidoc index dd61767e512..9617fbc50f7 100644 --- a/docs/java-api/aggregations/bucket/datehistogram-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/datehistogram-aggregation.asciidoc @@ -47,11 +47,11 @@ Histogram agg = sr.getAggregations().get("agg"); // For each entry for (Histogram.Bucket entry : agg.getBuckets()) { - DateTime keyAsDate = (DateTime) entry.getKey(); // Key - String key = entry.getKeyAsString(); // Key as String - long docCount = entry.getDocCount(); // Doc count + DateTime key = (DateTime) entry.getKey(); // Key + String keyAsString = entry.getKeyAsString(); // Key as String + long docCount = entry.getDocCount(); // Doc count - logger.info("key [{}], date [{}], doc_count [{}]", key, keyAsDate.getYear(), docCount); + logger.info("key [{}], date [{}], doc_count [{}]", keyAsString, key.getYear(), docCount); } -------------------------------------------------- diff --git a/docs/java-api/aggregations/bucket/daterange-aggregation.asciidoc b/docs/java-api/aggregations/bucket/daterange-aggregation.asciidoc index b86bec68086..fa8f31e8cd0 100644 --- a/docs/java-api/aggregations/bucket/daterange-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/daterange-aggregation.asciidoc @@ -39,10 +39,10 @@ Range agg = sr.getAggregations().get("agg"); // For each entry for (Range.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // Date range as key - DateTime fromAsDate = (DateTime) entry.getFrom(); // Date bucket from as a Date - DateTime toAsDate = (DateTime) entry.getTo(); // Date bucket to as a Date - long docCount = entry.getDocCount(); // Doc count + String key = entry.getKeyAsString(); // Date range as key + DateTime fromAsDate = (DateTime) entry.getFrom(); // Date bucket from as a Date + DateTime toAsDate = (DateTime) entry.getTo(); // Date bucket to as a Date + long docCount = entry.getDocCount(); // Doc count logger.info("key [{}], from [{}], to [{}], doc_count [{}]", key, fromAsDate, toAsDate, docCount); } diff --git a/docs/java-api/aggregations/bucket/filter-aggregation.asciidoc b/docs/java-api/aggregations/bucket/filter-aggregation.asciidoc index 5e2655c6a4e..8c462ed50bd 100644 --- a/docs/java-api/aggregations/bucket/filter-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/filter-aggregation.asciidoc @@ -14,7 +14,7 @@ Here is an example on how to create the aggregation request: -------------------------------------------------- AggregationBuilders .filter("agg") - .filter(FilterBuilders.termFilter("gender", "male")); + .filter(QueryBuilders.termQuery("gender", "male")); -------------------------------------------------- diff --git a/docs/java-api/aggregations/bucket/filters-aggregation.asciidoc b/docs/java-api/aggregations/bucket/filters-aggregation.asciidoc index b4c97c9ac11..903fa158679 100644 --- a/docs/java-api/aggregations/bucket/filters-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/filters-aggregation.asciidoc @@ -15,8 +15,8 @@ Here is an example on how to create the aggregation request: AggregationBuilder aggregation = AggregationBuilders .filters("agg") - .filter("men", FilterBuilders.termFilter("gender", "male")) - .filter("women", FilterBuilders.termFilter("gender", "female")); + .filter("men", QueryBuilders.termQuery("gender", "male")) + .filter("women", QueryBuilders.termQuery("gender", "female")); -------------------------------------------------- @@ -36,7 +36,7 @@ Filters agg = sr.getAggregations().get("agg"); // For each entry for (Filters.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // bucket key + String key = entry.getKeyAsString(); // bucket key long docCount = entry.getDocCount(); // Doc count logger.info("key [{}], doc_count [{}]", key, docCount); } diff --git a/docs/java-api/aggregations/bucket/geodistance-aggregation.asciidoc b/docs/java-api/aggregations/bucket/geodistance-aggregation.asciidoc index e3a9d95c0e3..9d0ff65fdab 100644 --- a/docs/java-api/aggregations/bucket/geodistance-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/geodistance-aggregation.asciidoc @@ -40,10 +40,10 @@ Range agg = sr.getAggregations().get("agg"); // For each entry for (Range.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // key as String - Number from = (Number) entry.getFrom(); // bucket from value - Number to = (Number) entry.getTo(); // bucket to value - long docCount = entry.getDocCount(); // Doc count + String key = entry.getKeyAsString(); // key as String + Number from = (Number) entry.getFrom(); // bucket from value + Number to = (Number) entry.getTo(); // bucket to value + long docCount = entry.getDocCount(); // Doc count logger.info("key [{}], from [{}], to [{}], doc_count [{}]", key, from, to, docCount); } diff --git a/docs/java-api/aggregations/bucket/geohashgrid-aggregation.asciidoc b/docs/java-api/aggregations/bucket/geohashgrid-aggregation.asciidoc index b322ca37776..19e3f033493 100644 --- a/docs/java-api/aggregations/bucket/geohashgrid-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/geohashgrid-aggregation.asciidoc @@ -36,11 +36,11 @@ GeoHashGrid agg = sr.getAggregations().get("agg"); // For each entry for (GeoHashGrid.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // key as String - GeoPoint keyAsGeoPoint = entry.getKeyAsGeoPoint(); // key as geo point - long docCount = entry.getDocCount(); // Doc count + String keyAsString = entry.getKeyAsString(); // key as String + GeoPoint key = (GeoPoint) entry.getKey(); // key as geo point + long docCount = entry.getDocCount(); // Doc count - logger.info("key [{}], point {}, doc_count [{}]", key, keyAsGeoPoint, docCount); + logger.info("key [{}], point {}, doc_count [{}]", keyAsString, key, docCount); } -------------------------------------------------- diff --git a/docs/java-api/aggregations/bucket/histogram-aggregation.asciidoc b/docs/java-api/aggregations/bucket/histogram-aggregation.asciidoc index f5c8abe2e7e..bc1803e8617 100644 --- a/docs/java-api/aggregations/bucket/histogram-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/histogram-aggregation.asciidoc @@ -36,8 +36,9 @@ Histogram agg = sr.getAggregations().get("agg"); // For each entry for (Histogram.Bucket entry : agg.getBuckets()) { - Number key = (Number) entry.getKey(); // Key - String keyAsString = entry.getKeyAsString(); // Key As String - long docCount = entry.getDocCount(); // Doc count + Long key = (Long) entry.getKey(); // Key + long docCount = entry.getDocCount(); // Doc count + + logger.info("key [{}], doc_count [{}]", key, docCount); } -------------------------------------------------- diff --git a/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc b/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc index 3cf301ffaee..eb095a2898c 100644 --- a/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc @@ -46,11 +46,11 @@ import org.elasticsearch.search.aggregations.bucket.range.Range; [source,java] -------------------------------------------------- // sr is here your SearchResponse object -IPv4Range agg = sr.getAggregations().get("agg"); +Range agg = sr.getAggregations().get("agg"); // For each entry for (Range.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // Ip range as key + String key = entry.getKeyAsString(); // Ip range as key String fromAsString = entry.getFromAsString(); // Ip bucket from as a String String toAsString = entry.getToAsString(); // Ip bucket to as a String long docCount = entry.getDocCount(); // Doc count diff --git a/docs/java-api/aggregations/bucket/range-aggregation.asciidoc b/docs/java-api/aggregations/bucket/range-aggregation.asciidoc index 3b0f8174eae..b30c856ebea 100644 --- a/docs/java-api/aggregations/bucket/range-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/range-aggregation.asciidoc @@ -38,10 +38,10 @@ Range agg = sr.getAggregations().get("agg"); // For each entry for (Range.Bucket entry : agg.getBuckets()) { - String key = entry.getKey(); // Range as key + String key = entry.getKeyAsString(); // Range as key Number from = (Number) entry.getFrom(); // Bucket from Number to = (Number) entry.getTo(); // Bucket to - long docCount = entry.getDocCount(); // Doc count + long docCount = entry.getDocCount(); // Doc count logger.info("key [{}], from [{}], to [{}], doc_count [{}]", key, from, to, docCount); } diff --git a/docs/java-api/aggs.asciidoc b/docs/java-api/aggs.asciidoc index 891c782f21f..f6b1b4d79b7 100644 --- a/docs/java-api/aggs.asciidoc +++ b/docs/java-api/aggs.asciidoc @@ -47,7 +47,7 @@ SearchResponse sr = node.client().prepareSearch() AggregationBuilders.terms("by_country").field("country") .subAggregation(AggregationBuilders.dateHistogram("by_year") .field("dateOfBirth") - .interval((DateHistogram.Interval.YEAR) + .interval((DateHistogramInterval.YEAR) .subAggregation(AggregationBuilders.avg("avg_children").field("children")) ) ) diff --git a/docs/java-api/query-dsl-filters.asciidoc b/docs/java-api/query-dsl-filters.asciidoc index 2e8e8221a8a..660ba70d0cc 100644 --- a/docs/java-api/query-dsl-filters.asciidoc +++ b/docs/java-api/query-dsl-filters.asciidoc @@ -416,7 +416,7 @@ See {ref}/query-dsl-query-filter.html[Query Filter] [source,java] -------------------------------------------------- FilterBuilder filter = queryFilter( - queryString("this AND that OR thus") <1> + queryStringQuery("this AND that OR thus") <1> ); -------------------------------------------------- <1> query you want to wrap as a filter diff --git a/docs/java-api/search.asciidoc b/docs/java-api/search.asciidoc index e6896d8745f..1d34b6c46c0 100644 --- a/docs/java-api/search.asciidoc +++ b/docs/java-api/search.asciidoc @@ -87,7 +87,7 @@ documentation [source,java] -------------------------------------------------- SearchRequestBuilder srb1 = node.client() - .prepareSearch().setQuery(QueryBuilders.queryString("elasticsearch")).setSize(1); + .prepareSearch().setQuery(QueryBuilders.queryStringQuery("elasticsearch")).setSize(1); SearchRequestBuilder srb2 = node.client() .prepareSearch().setQuery(QueryBuilders.matchQuery("name", "kimchy")).setSize(1); @@ -120,7 +120,7 @@ SearchResponse sr = node.client().prepareSearch() .addAggregation( AggregationBuilders.dateHistogram("agg2") .field("birth") - .interval(DateHistogram.Interval.YEAR) + .interval(DateHistogramInterval.YEAR) ) .execute().actionGet();