Merge branch 'master' into bjorncs/remove-jetty-threadpool-feature-flag

2 files changed, 11 insertions, 8 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index a9248a49e92..2e78da0dc91 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -89,6 +89,10 @@ public interface ModelContext {
         default String tlsCompressionType() { return "ZSTD"; }
         default double visibilityDelay() { return 0.0; }
 
+        boolean useAsyncMessageHandlingOnSchedule();
+        int contentNodeBucketDBStripeBits();
+        int mergeChunkSize();
+
         // TODO(balder) Last used on 7.306
         default boolean useContentNodeBtreeDb() { return true; }
 
@@ -121,7 +125,7 @@ public interface ModelContext {
         }
 
         // TODO(bjorncs): Temporary feature flag
-        default boolean useNewRestapiHandler() { return false; }
+        default boolean useNewRestapiHandler() { return true; }
 
         // TODO(mortent): Temporary feature flag
         default boolean useAccessControlTlsHandshakeClientAuth() { return false; }
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 0d37f6810a7..4dc06eae841 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
@@ -5,21 +5,20 @@ import java.time.Instant;
 import java.util.Map;
 
 /**
- * Instants after which reindexing should be triggered, for select document types.
+ * Status of reindexing for the documents of an application.
  *
  * @author jonmv
  */
 public interface Reindexing {
 
-    /** The reindexing status for each document type for which this is known. */
-    default Map<String, ? extends Status> status() { return Map.of(); }
+    /** Reindexing status for a given application, cluster and document type. */
+    default Status status(String cluster, String documentType) { return () -> Instant.MAX; }
 
-
-    /** Reindexing status of a given document type. */
+    /** Reindexing status of a given document type in a given cluster in a given application. */
     interface Status {
 
-        /** The instant at which reindexing of this document type may begin. */
-        default Instant ready() { return Instant.MAX; };
+        /** The instant at which reindexing may begin. */
+        Instant ready();
 
     }