Handle import of array of struct fields, map of struct fields, and map of

primitive fields as long as required attributes are present.

1 files changed, 4 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java
index 2192a7e7bb1..7c67fc422d4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java
@@ -12,12 +12,15 @@ import java.util.Map;
 public class ImportedFields {
 
     private final Map<String, ImportedField> fields;
+    private final Map<String, ImportedField> complexFields;
 
-    public ImportedFields(Map<String, ImportedField> fields) {
+    public ImportedFields(Map<String, ImportedField> fields, Map<String, ImportedField> complexFields) {
         this.fields = fields;
+        this.complexFields = complexFields;
     }
 
     public Map<String, ImportedField> fields() {
         return Collections.unmodifiableMap(fields);
     }
+    public Map<String, ImportedField> complexFields() { return Collections.unmodifiableMap(complexFields); }
 }