From 88dd6ba430e729d473432076a6eba1f6cb85c136 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 14 Apr 2016 22:59:22 -0700 Subject: Rest: Remove 'case' parameter from rest apis The current api allows for choosing which "case" response json keys are written in. This has the options of camelCase or underscore. camelCase is going to be deprecated from the query apis. However, with the case api, it is not necessary to deprecate, as users who were using it in 2.x can transition completely on 2.x before upgrading by simply using the underscore option. This change removes the 'case' option from rest apis. see #8988 --- .../elasticsearch/search/suggest/completion/CompletionStats.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/main/java/org/elasticsearch/search/suggest/completion') diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java index 5ec517dd8d..7bb96aeedc 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java @@ -80,7 +80,7 @@ public class CompletionStats implements Streamable, ToXContent { } else { out.writeBoolean(true); out.writeVInt(fields.size()); - + assert !fields.containsKey(null); final Object[] keys = fields.keys; final long[] values = fields.values; @@ -105,7 +105,7 @@ public class CompletionStats implements Streamable, ToXContent { final long[] values = fields.values; for (int i = 0; i < keys.length; i++) { if (keys[i] != null) { - builder.startObject((String) keys[i], XContentBuilder.FieldCaseConversion.NONE); + builder.startObject((String) keys[i]); builder.byteSizeField(Fields.SIZE_IN_BYTES, Fields.SIZE, values[i]); builder.endObject(); } @@ -137,7 +137,7 @@ public class CompletionStats implements Streamable, ToXContent { sizeInBytes += completion.getSizeInBytes(); if (completion.fields != null) { - if (fields == null) { + if (fields == null) { fields = completion.fields.clone(); } else { assert !completion.fields.containsKey(null); -- cgit v1.2.3