ProvisionInfo -> AllocatedHosts

2 files changed, 12 insertions, 13 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index 23bbdd511b7..c1a786194a2 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.Version;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.path.Path;
@@ -28,7 +28,7 @@ import java.util.jar.JarFile;
  *
  * Anyone wanting to access application data should use this interface.
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public interface ApplicationPackage {
 
@@ -231,16 +231,16 @@ public interface ApplicationPackage {
     /** 
      * Returns the single host allocation info of this, or an empty map if no allocation is available 
      * 
-     * @deprecated please use #getProvisionInfo
+     * @deprecated please use #getAllocatedHosts
      */
     // TODO: Remove on Vespa 7
     @Deprecated
-    default Map<Version, ProvisionInfo> getProvisionInfoMap() {
+    default Map<Version, AllocatedHosts> getProvisionInfoMap() {
         return Collections.emptyMap();
     }
 
     /** Returns the host allocation info of this, or empty if no allocation is available */
-    default Optional<ProvisionInfo> getProvisionInfo() {
+    default Optional<AllocatedHosts> getAllocatedHosts() {
         return Optional.empty();
     }
 
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 db589ef5d21..f8f749ef070 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
@@ -1,12 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-import com.yahoo.config.provision.ProvisionInfo;
+import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 
-import java.time.Clock;
 import java.time.Instant;
 import java.util.Optional;
 import java.util.Set;
@@ -60,17 +59,17 @@ public interface Model {
     /**
      * Get the provisioning info for this model.
      * 
-     * @return {@link ProvisionInfo} instance, if available.
-     * @deprecated use provisionInfo
+     * @return {@link AllocatedHosts} instance, if available.
+     * @deprecated use allocatedHosts
      */
     @Deprecated
-    // TODO: Remove this (and the implementation below) when no version older than 6.142 is deployed anywhere
-    default Optional<ProvisionInfo> getProvisionInfo() {
-        return Optional.of(provisionInfo());
+    // 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 ProvisionInfo provisionInfo() {
+    default AllocatedHosts allocatedHosts() {
         return getProvisionInfo().get();
     }