Use separate boolean to indicate disabled status

3 files changed, 9 insertions, 21 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Reindexing.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Reindexing.java
index cb9cb381da6..80fdbe961dc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Reindexing.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Reindexing.java
@@ -11,9 +11,12 @@ import java.util.Optional;
  */
 public interface Reindexing {
 
-    /** Reindexing status for a given application, cluster and document type. */
+    /** Reindexing status for this application, for a given cluster and document type. */
     default Optional<Status> status(String cluster, String documentType) { return Optional.empty(); }
 
+    /** Returns whether reindexing should run for this application. */
+    default boolean enabled() { return false; }
+
     /** Reindexing status of a given document type in a given cluster in a given application. */
     interface Status {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
index baec335b5bc..db9b81d0657 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
@@ -72,7 +72,7 @@ public class ApplicationReindexing implements Reindexing {
         return new ApplicationReindexing(enabled, common, clusters);
     }
 
-    /** Returns whether reindexing should run for this application. */
+    @Override
     public boolean enabled() {
         return enabled;
     }
@@ -87,9 +87,6 @@ public class ApplicationReindexing implements Reindexing {
 
     @Override
     public Optional<Reindexing.Status> status(String cluster, String documentType) {
-        if ( ! enabled)
-            return Optional.empty();
-
         if (clusters.containsKey(cluster)) {
             if (clusters.get(cluster).pending().containsKey(documentType))
                 return Optional.empty();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
index cf451c45251..3a72893aeb0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
@@ -10,6 +10,8 @@ import java.util.Optional;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author jonmv
@@ -70,23 +72,9 @@ public class ApplicationReindexingTest {
         assertEquals(Map.of("b", 20L),
                      reindexing.clusters().get("two").pending());
 
-        reindexing = reindexing.enabled(false);
+        assertTrue(reindexing.enabled());
 
-        // When disabled, status of any document type is empty.
-        assertEquals(Optional.empty(),
-                     reindexing.status("one", "a"));
-
-        assertEquals(Optional.empty(),
-                     reindexing.status("one", "d"));
-
-        assertEquals(Optional.empty(),
-                     reindexing.status("two", "d"));
-
-        assertEquals(Optional.empty(),
-                     reindexing.status("three", "a"));
-
-        assertEquals(Optional.empty(),
-                     reindexing.status("two", "b"));
+        assertFalse(reindexing.enabled(false).enabled());
 
     }