Merge pull request #3234 from vespa-engine/bratseth/store-provisioninfo-without-version

Bratseth/store provisioninfo without version

6 files changed, 35 insertions, 27 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java
index bcc8d222ca5..0384a5c7a1c 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java
@@ -11,7 +11,7 @@ import java.util.List;
  * An application file represents a file within an application package. This class can be used to traverse the entire
  * application package file structure, as well as read and write files to it, and create directories.
  *
- * @author Ulf Lillengen
+ * @author Ulf Lilleengen
  */
 public abstract class ApplicationFile implements Comparable<ApplicationFile> {
 
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 795e87b7690..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 {
 
@@ -228,10 +228,22 @@ public interface ApplicationPackage {
         throw new UnsupportedOperationException("This application package cannot write its metadata");
     }
 
-    default Map<Version, ProvisionInfo> getProvisionInfoMap() {
+    /** 
+     * Returns the single host allocation info of this, or an empty map if no allocation is available 
+     * 
+     * @deprecated please use #getAllocatedHosts
+     */
+    // TODO: Remove on Vespa 7
+    @Deprecated
+    default Map<Version, AllocatedHosts> getProvisionInfoMap() {
         return Collections.emptyMap();
     }
 
+    /** Returns the host allocation info of this, or empty if no allocation is available */
+    default Optional<AllocatedHosts> getAllocatedHosts() {
+        return Optional.empty();
+    }
+
     default Map<Version, FileRegistry> getFileRegistryMap() {
         return Collections.emptyMap();
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
index dcb875d02b5..589aee50d7c 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
@@ -7,7 +7,6 @@ import java.util.Collection;
  * Contains information about a host and what services are running on it.
  *
  * @author lulf
- * @since 5.37
  */
 public class HostInfo {
 
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 0c038077fe4..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;
@@ -16,8 +15,7 @@ import java.util.Collection;
  * A {@link Model} represents the interface towards the model of an entire tenant, and defines methods
  * for querying this model.
  *
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public interface Model {
 
@@ -60,9 +58,20 @@ public interface Model {
 
     /**
      * Get the provisioning info for this model.
-     * @return {@link ProvisionInfo} instance, if available.
+     * 
+     * @return {@link AllocatedHosts} instance, if available.
+     * @deprecated use allocatedHosts
      */
-    Optional<ProvisionInfo> getProvisionInfo();
+    @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();
+    }
 
     /**
      * Returns whether this application allows serving config request for a different version.
@@ -71,11 +80,6 @@ public interface Model {
      */
     default boolean allowModelVersionMismatch(Instant now) { return false; }
 
-    /** @deprecated pass now. */
-    // TODO: Remove this when no version older than 6.115 is deployed anywhere
-    @Deprecated
-    default boolean allowModelVersionMismatch() { return allowModelVersionMismatch(Clock.systemUTC().instant()); }
-
     /**
      * Returns whether old config models should be loaded (default) or not.
      * Skipping old config models is a validation override which is useful when the old model
@@ -88,9 +92,4 @@ public interface Model {
      */
     default boolean skipOldConfigModels(Instant now) { return false; }
     
-    /** @deprecated pass now. */
-    // TODO: Remove this when no version older than 6.115 is deployed anywhere
-    @Deprecated 
-    default boolean skipOldConfigModels() { return skipOldConfigModels(Clock.systemUTC().instant()); }
-
 }
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 5afc570d81b..5b79415c132 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
@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * Model context containing state provided to model factories.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public interface ModelContext {
 
@@ -31,11 +31,6 @@ public interface ModelContext {
     Properties properties();
     default Optional<File> appDir() { return Optional.empty();}
     
-    /** @deprecated TODO: Remove this when no config models older than 6.98 are used */
-    @SuppressWarnings("unused")
-    @Deprecated
-    default Optional<com.yahoo.config.provision.Version> vespaVersion() { return Optional.empty(); }
-    
     /** The Vespa version this model is built for */
     Version modelVespaVersion();
     
@@ -50,4 +45,5 @@ public interface ModelContext {
         Zone zone();
         Set<Rotation> rotations();
     }
+
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
index 10153ca07df..c6ac913ad14 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
@@ -5,5 +5,7 @@ package com.yahoo.config.model.api;
  * @author lulf
  */
 public interface ModelState {
+
     Model getModel();
+
 }