Merge pull request #15187 from vespa-engine/jonmv/reindexig-controller

Jonmv/reindexig controller

1 files changed, 13 insertions, 10 deletions

diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
index 285c78ef0ab..905376e81ca 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
@@ -34,21 +34,24 @@ public class FieldSetRepo {
     FieldSet parseFieldCollection(DocumentTypeManager docMan, String docType, String fieldNames) {
         DocumentType type = docMan.getDocumentType(docType);
         if (type == null) {
-         throw new IllegalArgumentException("Unknown document type " + docType);
+            throw new IllegalArgumentException("Unknown document type " + docType);
         }
 
-        StringTokenizer tokenizer = new StringTokenizer(fieldNames, ",");
         FieldCollection collection = new FieldCollection(type);
-
-        while (tokenizer.hasMoreTokens()) {
-            String token = tokenizer.nextToken();
-            Field f = type.getField(token);
-            if (f == null) {
-                throw new IllegalArgumentException("No such field " + token);
+        if (fieldNames.equals("[document]")) {
+            collection.addAll(type.fieldSet());
+        }
+        else {
+            StringTokenizer tokenizer = new StringTokenizer(fieldNames, ",");
+            while (tokenizer.hasMoreTokens()) {
+                String token = tokenizer.nextToken();
+                Field f = type.getField(token);
+                if (f == null) {
+                    throw new IllegalArgumentException("No such field " + token);
+                }
+                collection.add(f);
             }
-            collection.add(f);
         }
-
         return collection;
     }