1 files changed, 74 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java b/config-model/src/main/java/com/yahoo/searchdefinition/Application.java
index fb76c945344..2dda670f07c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Application.java
@@ -3,10 +3,20 @@ package com.yahoo.searchdefinition;
 
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.model.api.ModelContext;
+import com.yahoo.searchdefinition.derived.SearchOrderer;
+import com.yahoo.searchdefinition.document.SDDocumentType;
+import com.yahoo.searchdefinition.processing.Processing;
+import com.yahoo.searchdefinition.processing.Processor;
+import com.yahoo.vespa.documentmodel.DocumentModel;
+import com.yahoo.vespa.model.container.search.QueryProfiles;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * A collection of objects representing the content of an application package.
@@ -18,28 +28,79 @@ import java.util.Map;
 public class Application {
 
     private final ApplicationPackage applicationPackage;
-    private final Map<String, Schema> schemas = new LinkedHashMap<>();
+    private final Map<String, Schema> schemas;
+    private final DocumentModel documentModel;
 
-    public Application(ApplicationPackage applicationPackage) {
+    public Application(ApplicationPackage applicationPackage,
+                       List<Schema> schemas,
+                       RankProfileRegistry rankProfileRegistry,
+                       QueryProfiles queryProfiles,
+                       ModelContext.Properties properties,
+                       boolean documentsOnly,
+                       boolean validate,
+                       Set<Class<? extends Processor>> processorsToSkip,
+                       DeployLogger logger) {
         this.applicationPackage = applicationPackage;
-    }
 
-    public ApplicationPackage applicationPackage() { return applicationPackage; }
+        Map<String, Schema> schemaMap = new LinkedHashMap<>();
+        for (Schema schema : schemas) {
+            if (schemaMap.containsKey(schema.getName()))
+                throw new IllegalArgumentException("Duplicate schema '" + schema.getName() + "' in " + this);
+            schemaMap.put(schema.getName(), schema);
+        }
+        this.schemas = Collections.unmodifiableMap(schemaMap);
+
+        schemas.forEach(schema -> schema.setOwner(this));
+        if (validate)
+            schemas.forEach(schema -> schema.validate(logger));
+
+        new TemporarySDTypeResolver(schemas, logger).process();
+
+        List<SDDocumentType> sdocs = new ArrayList<>();
+        sdocs.add(SDDocumentType.VESPA_DOCUMENT);
+        for (Schema schema : schemas) {
+            if (schema.hasDocument()) {
+                sdocs.add(schema.getDocument());
+            }
+        }
+
+        var orderer = new SDDocumentTypeOrderer(sdocs, logger);
+        orderer.process();
+        for (SDDocumentType sdoc : orderer.getOrdered()) {
+            new FieldOperationApplierForStructs().process(sdoc);
+            new FieldOperationApplier().process(sdoc);
+        }
 
+        var resolver = new DocumentReferenceResolver(schemas);
+        sdocs.forEach(resolver::resolveReferences);
+        sdocs.forEach(resolver::resolveInheritedReferences);
+        var importedFieldsEnumerator = new ImportedFieldsEnumerator(schemas);
+        sdocs.forEach(importedFieldsEnumerator::enumerateImportedFields);
 
-    public void add(Schema schema) {
-        if (schemas.containsKey(schema.getName()))
-            throw new IllegalArgumentException("Duplicate schema '" + schema.getName() + "' in " + this);
-        schemas.put(schema.getName(), schema);
+        if (validate)
+            new DocumentGraphValidator().validateDocumentGraph(sdocs);
+
+        List<Schema> schemasSomewhatOrdered = new ArrayList<>(schemas);
+        for (Schema schema : new SearchOrderer().order(schemasSomewhatOrdered)) {
+            new FieldOperationApplierForSearch().process(schema); // TODO: Why is this not in the regular list?
+            new Processing(properties).process(schema,
+                                               logger,
+                                               rankProfileRegistry,
+                                               queryProfiles,
+                                               validate,
+                                               documentsOnly,
+                                               processorsToSkip);
+        }
+
+        this.documentModel = new DocumentModelBuilder().build(schemasSomewhatOrdered);
     }
 
+    public ApplicationPackage applicationPackage() { return applicationPackage; }
+
     /** Returns an unmodifiable list of the schemas of this application */
-    public Map<String, Schema> schemas() { return Collections.unmodifiableMap(schemas); }
+    public Map<String, Schema> schemas() { return schemas; }
 
-    /** Validates this. Must be called after all content is added to it. */
-    public void validate(DeployLogger logger) {
-        schemas.values().forEach(schema -> schema.validate(logger));
-    }
+    public DocumentModel documentModel() { return documentModel; }
 
     @Override
     public String toString() { return "application " + applicationPackage.getApplicationId(); }