Changes after review

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

@@ -41,18 +41,28 @@ public interface XContent {
     /**
      * Creates a new generator using the provided output stream.
      */
-    XContentGenerator createGenerator(OutputStream os) throws IOException;
+    default XContentGenerator createGenerator(OutputStream os) throws IOException {
+        return createGenerator(os, null, true);
+    }
 
     /**
-     * Creates a new generator using the provided output stream and some filters.
+     * Creates a new generator using the provided output stream and some
+     * inclusive filters. Same as createGenerator(os, filters, true).
      */
-    XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException;
+    default XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
+        return createGenerator(os, filters, true);
+    }
 
     /**
      * Creates a new generator using the provided output stream and some
      * filters.
+     *
+     * @param inclusive
+     *            If true only paths matching a filter will be included in
+     *            output. If false no path matching a filter will be included in
+     *            output
      */
-    XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusiveFilters) throws IOException;
+    XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusive) throws IOException;
     /**
      * Creates a parser over the provided string content.
      */

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

@@ -30,7 +30,6 @@ import org.elasticsearch.common.lease.Releasable;
 import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentBuilder.FieldCaseConversion;
 import org.joda.time.DateTimeZone;
 import org.joda.time.ReadableInstant;
 import org.joda.time.format.DateTimeFormatter;
@@ -109,8 +108,7 @@ public final class XContentBuilder implements BytesStream, Releasable {
      * {@link #close()} when the builder is done with.
      */
     public XContentBuilder(XContent xContent, OutputStream bos, String[] filters) throws IOException {
-        this.bos = bos;
+        this(xContent, bos, true, filters);
-        this.generator = xContent.createGenerator(bos, filters);
     }
 
     /**
@@ -172,7 +170,7 @@ public final class XContentBuilder implements BytesStream, Releasable {
     }
 
     public XContentBuilder startObject(String name, FieldCaseConversion conversion) throws IOException {
-        field(name);
+        field(name, conversion);
         startObject();
         return this;
     }

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

@@ -123,6 +123,4 @@ public interface XContentGenerator extends Closeable {
 
     @Override
     void close() throws IOException;
-
-    void writeStartObject(String name) throws IOException;
 }

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

@@ -66,16 +66,6 @@ public class CborXContent implements XContent {
         throw new ElasticsearchParseException("cbor does not support stream parsing...");
     }
 
-    @Override
-    public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), os);
-    }
-
-    @Override
-    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), os, filters);
-    }
-
     @Override
     public XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusiveFilters) throws IOException {
         return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), os, inclusiveFilters, filters);

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

@@ -20,7 +20,6 @@
 package org.elasticsearch.common.xcontent.cbor;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
 
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
@@ -33,11 +32,11 @@ import java.io.OutputStream;
 public class CborXContentGenerator extends JsonXContentGenerator {
 
     public CborXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, String... filters) {
-        super(jsonGenerator, os, filters);
+        this(jsonGenerator, os, true, filters);
     }
 
-    public CborXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, boolean inclusiveFilters, String[] filters) {
+    public CborXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, boolean inclusive, String[] filters) {
-        super(jsonGenerator, os, inclusiveFilters, filters);
+        super(jsonGenerator, os, inclusive, filters);
     }
 
     @Override

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

@@ -71,18 +71,8 @@ public class JsonXContent implements XContent {
     }
 
     @Override
-    public XContentGenerator createGenerator(OutputStream os) throws IOException {
+    public XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusive) throws IOException {
-        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), os);
+        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), os, inclusive, filters);
-    }
-
-    @Override
-    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), os, filters);
-    }
-
-    @Override
-    public XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusiveFilters) throws IOException {
-        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), os, inclusiveFilters, filters);
     }
 
     @Override

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

@@ -457,8 +457,4 @@ public class JsonXContentGenerator implements XContentGenerator {
         generator.close();
     }
 
-    @Override
-    public void writeStartObject(String name) throws IOException {
-        generator.writeObjectFieldStart(name);
-    }
 }

core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java

@@ -67,16 +67,6 @@ public class SmileXContent implements XContent {
         return (byte) 0xFF;
     }
 
-    @Override
-    public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new SmileXContentGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8), os);
-    }
-
-    @Override
-    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        return new SmileXContentGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8), os, filters);
-    }
-
     @Override
     public XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusiveFilters) throws IOException {
         return new SmileXContentGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8), os, inclusiveFilters, filters);

core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.common.xcontent.smile;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
@@ -33,11 +32,11 @@ import java.io.OutputStream;
 public class SmileXContentGenerator extends JsonXContentGenerator {
 
     public SmileXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, String... filters) {
-        super(jsonGenerator, os, filters);
+        this(jsonGenerator, os, true, filters);
     }
 
-    public SmileXContentGenerator(SmileGenerator jsonGenerator, OutputStream os, boolean inclusiveFilters, String[] filters) {
+    public SmileXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, boolean inclusive, String[] filters) {
-        super(jsonGenerator, os, inclusiveFilters, filters);
+        super(jsonGenerator, os, inclusive, filters);
     }
 
     @Override

core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java

@@ -46,10 +46,10 @@ public class FilterPathBasedFilter extends TokenFilter {
     private final boolean inclusive;
 
     public FilterPathBasedFilter(boolean inclusive, FilterPath[] filters) {
-        this.inclusive = inclusive;
         if (CollectionUtils.isEmpty(filters)) {
             throw new IllegalArgumentException("filters cannot be null or empty");
         }
+        this.inclusive = inclusive;
         this.filters = filters;
     }
 

core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java

@@ -65,22 +65,11 @@ public class YamlXContent implements XContent {
         throw new ElasticsearchParseException("yaml does not support stream parsing...");
     }
 
-    @Override
-    public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new YamlXContentGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8), os);
-    }
-
-    @Override
-    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
-        return new YamlXContentGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8), os, filters);
-    }
-
     @Override
     public XContentGenerator createGenerator(OutputStream os, String[] filters, boolean inclusiveFilters) throws IOException {
         return new YamlXContentGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8), os, inclusiveFilters, filters);
     }
 
-
     @Override
     public XContentParser createParser(String content) throws IOException {
         return new YamlXContentParser(yamlFactory.createParser(new FastStringReader(content)));

core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java

@@ -32,11 +32,11 @@ import java.io.OutputStream;
 public class YamlXContentGenerator extends JsonXContentGenerator {
 
     public YamlXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, String... filters) {
-        super(jsonGenerator, os, filters);
+        this(jsonGenerator, os, true, filters);
     }
 
-    public YamlXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, boolean inclusiveFilters, String[] filters) {
+    public YamlXContentGenerator(JsonGenerator jsonGenerator, OutputStream os, boolean inclusive, String[] filters) {
-        super(jsonGenerator, os, inclusiveFilters, filters);
+        super(jsonGenerator, os, inclusive, filters);
     }
 
     @Override

core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java

@@ -31,7 +31,7 @@ public class FilterPathGeneratorFilteringTests extends ESTestCase {
 
     private final JsonFactory JSON_FACTORY = new JsonFactory();
 
-    public void testFilters() throws Exception {
+    public void testInclusiveFilters() throws Exception {
         final String SAMPLE = "{'a':0,'b':true,'c':'c_value','d':[0,1,2],'e':[{'f1':'f1_value','f2':'f2_value'},{'g1':'g1_value','g2':'g2_value'}],'h':{'i':{'j':{'k':{'l':'l_value'}}}}}";
 
         assertResult(SAMPLE, true, "a", "{'a':0}");
@@ -122,11 +122,16 @@ public class FilterPathGeneratorFilteringTests extends ESTestCase {
 
     }
 
-    public void testFiltersWithDots() throws Exception {
+    public void testInclusiveFiltersWithDots() throws Exception {
         assertResult("{'a':0,'b.c':'value','b':{'c':'c_value'}}", true, "b.c", "{'b':{'c':'c_value'}}");
         assertResult("{'a':0,'b.c':'value','b':{'c':'c_value'}}", true, "b\\.c", "{'b.c':'value'}");
     }
 
+    public void testExclusiveFiltersWithDots() throws Exception {
+        assertResult("{'a':0,'b.c':'value','b':{'c':'c_value'}}", false, "b.c", "{'a':0,'b.c':'value'}");
+        assertResult("{'a':0,'b.c':'value','b':{'c':'c_value'}}", false, "b\\.c", "{'a':0,'b':{'c':'c_value'}}");
+    }
+
     private void assertResult(String input, boolean inclusive, String filter, String expected) throws Exception {
         try (BytesStreamOutput os = new BytesStreamOutput()) {
             try (FilteringGeneratorDelegate generator = new FilteringGeneratorDelegate(JSON_FACTORY.createGenerator(os),