diff options
Diffstat (limited to 'java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java')
| -rw-r--r-- | java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java b/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java index 06427f1079..061a37321a 100644 --- a/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java +++ b/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java @@ -19,7 +19,8 @@ import static java.time.format.DateTimeFormatter.ISO_INSTANT; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.json.JsonReadFeature; +import com.fasterxml.jackson.core.json.JsonWriteFeature; import com.google.common.base.Charsets; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -38,14 +39,14 @@ public final class XContentBuilder implements Closeable { * Inspired from org.elasticsearch.common.xcontent.json.JsonXContent static block. */ public XContentBuilder() throws IOException { - JsonFactory jsonFactory = new JsonFactory(); - jsonFactory.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); - jsonFactory.configure(JsonGenerator.Feature.QUOTE_FIELD_NAMES, true); - jsonFactory.configure(JsonParser.Feature.ALLOW_COMMENTS, true); - jsonFactory.configure( - JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, - false); // this trips on many mappings now... - this.generator = jsonFactory.createGenerator(bos, JsonEncoding.UTF8); + this.generator = + JsonFactory.builder() + .configure(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES, true) + .configure(JsonWriteFeature.QUOTE_FIELD_NAMES, true) + .configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true) + .configure(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false) + .build() + .createGenerator(bos, JsonEncoding.UTF8); } public XContentBuilder startObject(String name) throws IOException { |