Revert "Bratseth/apply on restart take 9"

1 files changed, 20 insertions, 22 deletions

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 6481c4cb2c7..d25de9fb334 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
@@ -2,7 +2,6 @@
 package com.yahoo.config.model.api;
 
 import com.yahoo.component.Version;
-import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.FileReference;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
@@ -24,45 +23,41 @@ public interface Model {
     /**
      * Resolves config for a given key and config definition
      *
-     * @param configKey the key to resolve
-     * @param configDefinition the config definition to use for the schema
+     * @param configKey    The key to resolve
+     * @param configDefinition    The config definition to use for the schema
      */
-    @Deprecated // TODO: Return after December 2020
     ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition configDefinition);
 
     /**
-     * Resolves config for a given key and config definition
-     *
-     * @param configKey the key to resolve
-     * @param configDefinition the config definition to use for the schema
+     * Produces a set of the valid config keys for this model.
      */
-    default ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition configDefinition) {
-        return null; // TODO: Remove this default implementation after December 2020
-    }
-
-    /** Produces a set of the valid config keys for this model. */
     Set<ConfigKey<?>> allConfigsProduced();
 
-    /** Returns information about all hosts used in this model. */
+    /**
+     * Returns information about all hosts used in this model.
+     */
     Collection<HostInfo> getHosts();
 
-    /** Returns all the config ids available for this model. */
+    /**
+     * Returns all the config ids available for this model.
+     */
     Set<String> allConfigIds();
 
     /**
      * Asks the {@link Model} instance to distribute files using provided filedistribution instance.
-     *
-     * @param fileDistribution instance that can be called to distribute files
+     * @param fileDistribution {@link com.yahoo.config.model.api.FileDistribution} instance that can be called to distribute files.
      */
     void distributeFiles(FileDistribution fileDistribution);
 
-    /** The set of files that should be distributed to the hosts in this model. */
+    /**
+     * The set of files that should be distributed to the hosts in this model.
+     */
     Set<FileReference> fileReferences();
 
     /**
      * Gets the allocated hosts for this model.
      * 
-     * @return {@link AllocatedHosts} instance, if available
+     * @return {@link AllocatedHosts} instance, if available.
      */
     AllocatedHosts allocatedHosts();
 
@@ -85,10 +80,13 @@ public interface Model {
      */
     default boolean skipOldConfigModels(Instant now) { return false; }
 
-    /** Returns the version of this model. */
+    /**
+     * Returns the version of this model
+     */
     default Version version() { return Version.emptyVersion; }
 
-    /** Returns the provisioned hosts of this. */
+    /**
+     * Returns the provisioned hosts of this
+     */
     default Provisioned provisioned() { return new Provisioned(); }
-
 }