Add FilterPath implementation that uses Jackson 2.6 streaming filtering feature

Author: tlrx

core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java

@@ -930,8 +930,8 @@ public XContentBuilder rawField(String fieldName, byte[] content, int offset, in
         return this;
     }
 
-    public XContentBuilder rawField(String fieldName, InputStream content) throws IOException {
-        generator.writeRawField(fieldName, content, bos);
+    public XContentBuilder rawField(String fieldName, InputStream content, XContentType contentType) throws IOException {
+        generator.writeRawField(fieldName, content, bos, contentType);
         return this;
     }
 

core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java

@@ -116,7 +116,7 @@ public interface XContentGenerator extends Closeable {
 
     void writeRawField(String fieldName, byte[] content, int offset, int length, OutputStream bos) throws IOException;
 
-    void writeRawField(String fieldName, InputStream content, OutputStream bos) throws IOException;
+    void writeRawField(String fieldName, InputStream content, OutputStream bos, XContentType contentType) throws IOException;
 
     void writeRawField(String fieldName, BytesReference content, OutputStream bos) throws IOException;
 

core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java

@@ -423,7 +423,7 @@ public static void writeRawField(String field, BytesReference source, XContentBu
             }
             XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
             if (contentType == builder.contentType()) {
-                builder.rawField(field, compressedStreamInput);
+                builder.rawField(field, compressedStreamInput, contentType);
             } else {
                 try (XContentParser parser = XContentFactory.xContent(contentType).createParser(compressedStreamInput)) {
                     parser.nextToken();

core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java

@@ -20,15 +20,11 @@
 package org.elasticsearch.common.xcontent.cbor;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
-import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
-import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
-import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -63,27 +59,19 @@ public byte streamSeparator() {
         throw new ElasticsearchParseException("cbor does not support stream parsing...");
     }
 
-    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
-        return new CborXContentGenerator(new BaseJsonGenerator(jsonGenerator));
-    }
-
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return newXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8));
+        return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8));
     }
 
     @Override
     public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        if (CollectionUtils.isEmpty(filters)) {
-            return createGenerator(os);
-        }
-        FilteringJsonGenerator cborGenerator = new FilteringJsonGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), filters);
-        return new CborXContentGenerator(cborGenerator);
+        return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), filters);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return newXContentGenerator(cborFactory.createGenerator(writer));
+        return new CborXContentGenerator(cborFactory.createGenerator(writer));
     }
 
     @Override

core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java

@@ -19,10 +19,10 @@
 
 package org.elasticsearch.common.xcontent.cbor;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.cbor.CBORParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
 
 import java.io.IOException;
@@ -34,8 +34,8 @@
  */
 public class CborXContentGenerator extends JsonXContentGenerator {
 
-    public CborXContentGenerator(BaseJsonGenerator generator) {
-        super(generator);
+    public CborXContentGenerator(JsonGenerator jsonGenerator, String... filters) {
+        super(jsonGenerator, filters);
     }
 
     @Override
@@ -49,7 +49,7 @@ public void usePrintLineFeedAtEnd() {
     }
 
     @Override
-    public void writeRawField(String fieldName, InputStream content, OutputStream bos) throws IOException {
+    public void writeRawField(String fieldName, InputStream content, OutputStream bos, XContentType contentType) throws IOException {
         writeFieldName(fieldName);
         try (CBORParser parser = CborXContent.cborFactory.createParser(content)) {
             parser.nextToken();

core/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java

@@ -25,9 +25,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
-import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
-import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -65,27 +63,19 @@ public byte streamSeparator() {
         return '\n';
     }
 
-    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
-        return new JsonXContentGenerator(new BaseJsonGenerator(jsonGenerator));
-    }
-
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return newXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8));
+        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8));
     }
 
     @Override
     public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        if (CollectionUtils.isEmpty(filters)) {
-            return createGenerator(os);
-        }
-        FilteringJsonGenerator jsonGenerator = new FilteringJsonGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), filters);
-        return new JsonXContentGenerator(jsonGenerator);
+        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), filters);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return newXContentGenerator(jsonFactory.createGenerator(writer));
+        return new JsonXContentGenerator(jsonFactory.createGenerator(writer));
     }
 
     @Override