Only expose explicit fields in the document.

Also build all fieldSets when constructing the document type.

2 files changed, 4 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java
index df189389348..1b2534e4cae 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java
@@ -2,6 +2,7 @@
 package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.document.DocumentType;
 import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.document.Field;
 import com.yahoo.searchdefinition.Search;
@@ -15,7 +16,6 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
  */
 public class BuiltInFieldSets extends Processor {
 
-    private static final String DOC_FIELDSET_NAME = "[document]";
     public static final String SEARCH_FIELDSET_NAME = "[search]";     // Public due to oddities in position handling.
     public static final String INTERNAL_FIELDSET_NAME = "[internal]"; // This one populated from misc places
 
@@ -43,7 +43,7 @@ public class BuiltInFieldSets extends Processor {
             if (docField instanceof SDField && ((SDField) docField).isExtraField()) {
                 continue; // skip
             }
-            search.fieldSets().addBuiltInFieldSetItem(DOC_FIELDSET_NAME, docField.getName());
+            search.fieldSets().addBuiltInFieldSetItem(DocumentType.DOCUMENT, docField.getName());
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
index 8e221a6210b..13c967c8355 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
@@ -2,6 +2,7 @@
 package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.document.DataType;
+import com.yahoo.document.DocumentType;
 import com.yahoo.document.PositionDataType;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.SearchBuilder;
@@ -31,7 +32,7 @@ public class PositionTestCase {
                 "src/test/examples/position_inherited.sd"));
 
         Search search = sb.getSearch("position_inherited");
-        FieldSet fieldSet = search.getDocument().getFieldSets().builtInFieldSets().get("[document]"); // TODO why is this not public in BuiltInFieldSets?
+        FieldSet fieldSet = search.getDocument().getFieldSets().builtInFieldSets().get(DocumentType.DOCUMENT);
         assertFalse(fieldSet.getFieldNames().contains(PositionDataType.getZCurveFieldName("pos")));
     }