1 files changed, 16 insertions, 11 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
index 33ed55ecaef..abfddfe40be 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
@@ -1,11 +1,11 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. 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.ModelReference;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.provision.ApplicationId;
 
 import java.net.URI;
 
@@ -14,21 +14,26 @@ import java.net.URI;
  */
 public interface OnnxModelCost {
 
-    Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger);
+    // TODO: Remove when 8.250 is oldest model in use
+    default Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger) {
+        return newCalculator(appPkg, ApplicationId.defaultId());
+    }
+
+    Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId);
 
     interface Calculator {
         long aggregatedModelCostInBytes();
         void registerModel(ApplicationFile path);
-        @Deprecated(forRemoval = true) void registerModel(ModelReference ref); // TODO(bjorncs): remove once no longer in use by old config models
         void registerModel(URI uri);
     }
 
-    static OnnxModelCost disabled() {
-        return (__, ___) -> new Calculator() {
-            @Override public long aggregatedModelCostInBytes() { return 0; }
-            @Override public void registerModel(ApplicationFile path) {}
-            @SuppressWarnings("removal") @Override public void registerModel(ModelReference ref) {}
-            @Override public void registerModel(URI uri) {}
-        };
+    static OnnxModelCost disabled() { return new DisabledOnnxModelCost(); }
+
+    class DisabledOnnxModelCost implements OnnxModelCost, Calculator {
+        @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; }
+        @Override public long aggregatedModelCostInBytes() {return 0;}
+        @Override public void registerModel(ApplicationFile path) {}
+        @Override public void registerModel(URI uri) {}
     }
+
 }