Pass DeployState

1 files changed, 20 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 9eef1dc2447..74d92bcfd02 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -28,6 +28,7 @@ import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.io.IOUtils;
+import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.searchdefinition.Application;
 import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Schema;
@@ -334,6 +335,8 @@ public class DeployState implements ConfigDefinitionStore {
         private boolean accessLoggingEnabledByDefault = true;
         private Optional<DockerImage> wantedDockerImageRepo = Optional.empty();
         private Reindexing reindexing = null;
+        private RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
+        private QueryProfiles queryProfiles = null;
 
         public Builder() {}
 
@@ -431,6 +434,21 @@ public class DeployState implements ConfigDefinitionStore {
             return this;
         }
 
+        public Builder rankProfileRegistry(RankProfileRegistry rankProfileRegistry) {
+            this.rankProfileRegistry = rankProfileRegistry;
+            return this;
+        }
+
+        public Builder queryProfiles(QueryProfiles queryProfiles) {
+            this.queryProfiles = queryProfiles;
+            return this;
+        }
+
+        public Builder queryProfiles(QueryProfileRegistry queryProfileRegistry) {
+            this.queryProfiles = new QueryProfiles(queryProfileRegistry, logger);
+            return this;
+        }
+
         public Builder reindexing(Reindexing reindexing) { this.reindexing = Objects.requireNonNull(reindexing); return this; }
 
         public DeployState build() {
@@ -438,8 +456,8 @@ public class DeployState implements ConfigDefinitionStore {
         }
 
         public DeployState build(ValidationParameters validationParameters) {
-            RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
-            QueryProfiles queryProfiles = new QueryProfilesBuilder().build(applicationPackage, logger);
+            if (queryProfiles == null)
+                queryProfiles = new QueryProfilesBuilder().build(applicationPackage, logger);
             SemanticRules semanticRules = new SemanticRuleBuilder().build(applicationPackage);
             Application application = new ApplicationBuilder(applicationPackage, fileRegistry, logger, properties,
                                                              rankProfileRegistry, queryProfiles.getRegistry())