fix tests

Author: Christoph Büscher

server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java

@@ -396,7 +396,7 @@ public InnerHitBuilder addFetchField(String name) {
      * @param format an optional format string used when formatting values, for example a date format.
      */
     public InnerHitBuilder addFetchField(String name, @Nullable String format) {
-        return addFetchField(name, format, false);
+        return addFetchField(name, format, null);
     }
 
     /**
@@ -405,11 +405,11 @@ public InnerHitBuilder addFetchField(String name, @Nullable String format) {
      * @param format an optional format string used when formatting values, for example a date format.
      * @param includeUnmapped whether unmapped fields should be returned as well
      */
-    public InnerHitBuilder addFetchField(String name, @Nullable String format, boolean includeUnmapped) {
+    public InnerHitBuilder addFetchField(String name, @Nullable String format, Boolean includeUnmapped) {
         if (fetchFields == null || fetchFields.isEmpty()) {
             fetchFields = new ArrayList<>();
         }
-        fetchFields.add(new FieldAndFormat(name, format, Optional.of(includeUnmapped)));
+        fetchFields.add(new FieldAndFormat(name, format, Optional.ofNullable(includeUnmapped)));
         return this;
     }
 

server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldAndFormat.java

@@ -74,7 +74,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(FORMAT_FIELD.getPreferredName(), format);
         }
         if (this.includeUnmapped.isPresent()) {
-            builder.field(INCLUDE_UNMAPPED_FIELD.getPreferredName(), includeUnmapped);
+            builder.field(INCLUDE_UNMAPPED_FIELD.getPreferredName(), includeUnmapped.get());
         }
         builder.endObject();
         return builder;
@@ -133,6 +133,6 @@ public boolean equals(Object obj) {
             return false;
         }
         FieldAndFormat other = (FieldAndFormat) obj;
-        return field.equals(other.field) && Objects.equals(format, other.format) && Objects.equals(includeUnmapped,other.includeUnmapped);
+        return field.equals(other.field) && Objects.equals(format, other.format) && Objects.equals(includeUnmapped, other.includeUnmapped);
     }
 }

server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java

@@ -68,6 +68,7 @@ public static FieldFetcher create(QueryShardContext context,
                     continue;
                 }
                 ValueFetcher valueFetcher = ft.valueFetcher(context, format);
+                mappedToExclude.add(field);
                 fieldContexts.add(new FieldContext(field, valueFetcher));
             }
         }