From fa66a459c40878e56e1cf8a895803683d809777b Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Thu, 2 Nov 2017 09:53:18 +0100
Subject: Remove deprecated, unused method and default implementation from
 interface

---
 .../src/main/java/com/yahoo/config/model/api/Model.java   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'config-model-api/src')

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
index f8f749ef070..3fec8550623 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
@@ -7,7 +7,6 @@ import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 
 import java.time.Instant;
-import java.util.Optional;
 import java.util.Set;
 import java.util.Collection;
 
@@ -57,21 +56,11 @@ public interface Model {
     default void reloadDeployFileDistributor(FileDistribution fileDistribution) { }
 
     /**
-     * Get the provisioning info for this model.
+     * Gets the allocated hosts for this model.
      * 
      * @return {@link AllocatedHosts} instance, if available.
-     * @deprecated use allocatedHosts
      */
-    @Deprecated
-    // TODO: Remove this (and the implementation below) when no version older than 6.143 is deployed anywhere
-    default Optional<AllocatedHosts> getProvisionInfo() {
-        return Optional.of(allocatedHosts());
-    }
-
-    @SuppressWarnings("deprecation")
-    default AllocatedHosts allocatedHosts() {
-        return getProvisionInfo().get();
-    }
+    AllocatedHosts allocatedHosts();
 
     /**
      * Returns whether this application allows serving config request for a different version.
-- 
cgit v1.2.3