From 0d1baa5e33382bc9703be676572283ac92dafcea Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Mon, 23 Mar 2020 11:56:45 +0100
Subject: Remove phrase-segmentation flag

---
 .../main/java/com/yahoo/config/model/api/ModelContext.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'config-model-api')

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 b9ada59cb0b..0700d7280f7 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
@@ -55,16 +55,23 @@ public interface ModelContext {
         Set<ContainerEndpoint> endpoints();
         boolean isBootstrap();
         boolean isFirstTimeDeployment();
-        // TODO: Remove when Vespa 7.112 is the oldest config model in use
+
+        // TODO: Remove after April 2020
         default boolean useDedicatedNodeForLogserver() { return true; }
+
         boolean useAdaptiveDispatch();
-        // TODO: Remove temporary default implementations
+
+        // TODO: Remove after April 2020
         default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); }
+
         default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); }
         double defaultTermwiseLimit();
         boolean useBucketSpaceMetric();
         default boolean useNewAthenzFilter() { return false; }
+
+        // TODO: Remove after April 2020
         default boolean usePhraseSegmenting() { return false; }
+
         default String proxyProtocol() { return "https-only"; }
         default Optional<AthenzDomain> athenzDomain() { return Optional.empty(); }
         default boolean useDedicatedNodesWhenUnspecified() { return false; }
-- 
cgit v1.2.3