Use dummy Reindexing impelmentation when reindexing is disabled

3 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
index a23ebfd134a..fdd12088d04 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
@@ -6,7 +6,6 @@ import com.yahoo.documentmodel.NewDocumentType;
 
 import java.util.Collection;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * Context required to configure automatic reindexing for a given cluster controller cluster (for a given content cluster).
@@ -23,12 +22,12 @@ public class ReindexingContext {
             Reindexing reindexing,
             String contentClusterName,
             Collection<NewDocumentType> documentTypes) {
-        this.reindexing = reindexing;
+        this.reindexing = Objects.requireNonNull(reindexing);
         this.contentClusterName = Objects.requireNonNull(contentClusterName);
         this.documentTypes = Objects.requireNonNull(documentTypes);
     }
 
-    public Optional<Reindexing> reindexing() { return Optional.ofNullable(reindexing); }
+    public Reindexing reindexing() { return reindexing; }
     public String contentClusterName() { return contentClusterName; }
     public Collection<NewDocumentType> documentTypes() { return documentTypes; }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingController.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingController.java
index c5998a2ece2..0b213e870f1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingController.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingController.java
@@ -27,7 +27,7 @@ class ReindexingController extends SimpleComponent implements ReindexingConfig.P
                         "reindexing-maintainer",
                         "ai.vespa.reindexing.ReindexingMaintainer",
                         REINDEXING_CONTROLLER_BUNDLE)));
-        this.reindexing = context.reindexing().orElse(null);
+        this.reindexing = context.reindexing();
         this.contentClusterName = context.contentClusterName();
         this.documentTypes = context.documentTypes();
     }
@@ -35,7 +35,7 @@ class ReindexingController extends SimpleComponent implements ReindexingConfig.P
     @Override
     public void getConfig(ReindexingConfig.Builder builder) {
         builder.clusterName(contentClusterName);
-        if (reindexing == null || !reindexing.enabled()) {
+        if (!reindexing.enabled()) {
             builder.enabled(false);
             return;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 98395fe6811..16ccbad00c0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -331,9 +331,10 @@ public class ContentCluster extends AbstractConfigProducer implements
 
         private static ReindexingContext createReindexingContent(
                 ConfigModelContext ctx, String contentClusterName, Map<String, NewDocumentType> documentDefinitions) {
+            class DisabledReindexing implements Reindexing {}
             Reindexing reindexing = ctx.properties().featureFlags().enableAutomaticReindexing()
-                    ? ctx.getDeployState().reindexing().orElse(null)
-                    : null;
+                    ? ctx.getDeployState().reindexing().orElse(new DisabledReindexing())
+                    : new DisabledReindexing();
             return new ReindexingContext(reindexing, contentClusterName, documentDefinitions.values());
         }