Revert "Revert "Revert "Bjorncs/install clustercontroller reindexer"""

1 files changed, 2 insertions, 13 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 070a389b3ac..c52ea1ef092 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
@@ -17,7 +17,6 @@ import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.Provisioned;
-import com.yahoo.config.model.api.Reindexing;
 import com.yahoo.config.model.api.ValidationParameters;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
@@ -51,7 +50,6 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
@@ -84,7 +82,6 @@ public class DeployState implements ConfigDefinitionStore {
     private final Instant now;
     private final HostProvisioner provisioner;
     private final Provisioned provisioned;
-    private final Reindexing reindexing;
 
     public static DeployState createTestState() {
         return new Builder().build();
@@ -118,8 +115,7 @@ public class DeployState implements ConfigDefinitionStore {
                         Instant now,
                         Version wantedNodeVespaVersion,
                         boolean accessLoggingEnabledByDefault,
-                        Optional<DockerImage> wantedDockerImageRepo,
-                        Reindexing reindexing) {
+                        Optional<DockerImage> wantedDockerImageRepo) {
         this.logger = deployLogger;
         this.fileRegistry = fileRegistry;
         this.rankProfileRegistry = rankProfileRegistry;
@@ -151,7 +147,6 @@ public class DeployState implements ConfigDefinitionStore {
         this.wantedNodeVespaVersion = wantedNodeVespaVersion;
         this.now = now;
         this.wantedDockerImageRepo = wantedDockerImageRepo;
-        this.reindexing = reindexing;
     }
 
     public static HostProvisioner getDefaultModelHostProvisioner(ApplicationPackage applicationPackage) {
@@ -294,8 +289,6 @@ public class DeployState implements ConfigDefinitionStore {
         }
     }
 
-    public Optional<Reindexing> reindexing() { return Optional.ofNullable(reindexing); }
-
     public static class Builder {
 
         private ApplicationPackage applicationPackage = MockApplicationPackage.createEmpty();
@@ -315,7 +308,6 @@ public class DeployState implements ConfigDefinitionStore {
         private Version wantedNodeVespaVersion = Vtag.currentVersion;
         private boolean accessLoggingEnabledByDefault = true;
         private Optional<DockerImage> wantedDockerImageRepo = Optional.empty();
-        private Reindexing reindexing = null;
 
         public Builder applicationPackage(ApplicationPackage applicationPackage) {
             this.applicationPackage = applicationPackage;
@@ -406,8 +398,6 @@ public class DeployState implements ConfigDefinitionStore {
             return this;
         }
 
-        public Builder reindexing(Reindexing reindexing) { this.reindexing = Objects.requireNonNull(reindexing); return this; }
-
         public DeployState build() {
             return build(new ValidationParameters());
         }
@@ -437,8 +427,7 @@ public class DeployState implements ConfigDefinitionStore {
                                    now,
                                    wantedNodeVespaVersion,
                                    accessLoggingEnabledByDefault,
-                                   wantedDockerImageRepo,
-                                   reindexing);
+                                   wantedDockerImageRepo);
         }
 
         private SearchDocumentModel createSearchDocumentModel(RankProfileRegistry rankProfileRegistry,