Make unused methods default implementations and simplify

(cannot remove until methods are not used by old models anymore)

2 files changed, 8 insertions, 8 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 8c5bf410015..692780f3eb3 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1457,9 +1457,9 @@
     ],
     "methods" : [
       "public abstract long aggregatedModelCostInBytes()",
-      "public abstract void registerModel(com.yahoo.config.application.api.ApplicationFile)",
+      "public void registerModel(com.yahoo.config.application.api.ApplicationFile)",
       "public abstract void registerModel(com.yahoo.config.application.api.ApplicationFile, com.yahoo.config.model.api.OnnxModelOptions)",
-      "public abstract void registerModel(java.net.URI)",
+      "public void registerModel(java.net.URI)",
       "public abstract void registerModel(java.net.URI, com.yahoo.config.model.api.OnnxModelOptions)",
       "public abstract java.util.Map models()",
       "public abstract void setRestartOnDeploy()",
@@ -1481,9 +1481,7 @@
       "public void <init>()",
       "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)",
       "public long aggregatedModelCostInBytes()",
-      "public void registerModel(com.yahoo.config.application.api.ApplicationFile)",
       "public void registerModel(com.yahoo.config.application.api.ApplicationFile, com.yahoo.config.model.api.OnnxModelOptions)",
-      "public void registerModel(java.net.URI)",
       "public void registerModel(java.net.URI, com.yahoo.config.model.api.OnnxModelOptions)",
       "public java.util.Map models()",
       "public void setRestartOnDeploy()",
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 650ce1ac14c..69f2b6b6dce 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
@@ -19,10 +19,14 @@ public interface OnnxModelCost {
     interface Calculator {
         long aggregatedModelCostInBytes();
         // TODO: Unused, remove when 8.263.7 is oldest model in use
-        void registerModel(ApplicationFile path);
+        default void registerModel(ApplicationFile path) {
+            registerModel(path, OnnxModelOptions.empty());
+        }
         void registerModel(ApplicationFile path, OnnxModelOptions onnxModelOptions);
         // TODO: Unused, remove when 8.263.7 is oldest model in use
-        void registerModel(URI uri);
+        default void registerModel(URI uri) {
+            registerModel(uri, OnnxModelOptions.empty());
+        }
         void registerModel(URI uri, OnnxModelOptions onnxModelOptions);
         Map<String, ModelInfo> models();
         void setRestartOnDeploy();
@@ -47,9 +51,7 @@ public interface OnnxModelCost {
     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(ApplicationFile path, OnnxModelOptions onnxModelOptions) {}
-        @Override public void registerModel(URI uri) {}
         @Override public void registerModel(URI uri, OnnxModelOptions onnxModelOptions) {}
         @Override public Map<String, ModelInfo> models() { return Map.of(); }
         @Override public void setRestartOnDeploy() {}