Revert "Merge pull request #15542 from vespa-engine/revert-15540-bratseth/apply-on-restart-take-6"

This reverts commit cf34278a1f367301a740d9781cd07d32175bbd49, reversing
changes made to 9d64924f89a48e712403fb73808e2280bfe3dfe3.

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
index a8404b076d4..11e97bc8a95 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
@@ -31,7 +31,8 @@ import java.util.Map;
  *
  * @author Vegard Havdal
  */
-// TODO  This functionality should be on VespaModel itself, but we don't have a way right now to apply a config override to a ConfigInstance.Builder
+// TODO: Most of this has been copied to ConfigInstance.Builder.buildInstance() and can be removed from here
+//       when Model.getConfig is removed
 class InstanceResolver {
 
     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InstanceResolver.class.getName());
@@ -138,7 +139,6 @@ class InstanceResolver {
         return packagePrefix.value + cKey.getNamespace();
     }
 
-
     enum PackagePrefix {
         COM_YAHOO("com.yahoo."),
         NONE("");
@@ -148,4 +148,5 @@ class InstanceResolver {
             this.value = value;
         }
     }
+
 }