Merge pull request #29069 from vespa-engine/hmusum/remove-deprecated-unused-API

Remove unused, deprecated API

3 files changed, 0 insertions, 10 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 6b663800b67..1fc39b8fa1d 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1456,7 +1456,6 @@
     "methods" : [
       "public abstract long aggregatedModelCostInBytes()",
       "public abstract void registerModel(com.yahoo.config.application.api.ApplicationFile)",
-      "public abstract void registerModel(com.yahoo.config.ModelReference)",
       "public abstract void registerModel(java.net.URI)"
     ],
     "fields" : [ ]
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 44f3d63f8af..6ce46e4f2af 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
@@ -2,9 +2,6 @@
 
 package com.yahoo.config.model.api;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-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;
@@ -21,7 +18,6 @@ public interface OnnxModelCost {
     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);
     }
 
@@ -29,10 +25,8 @@ public interface OnnxModelCost {
         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) {}
         };
     }
 
-
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
index ebd8b5836da..9d4b8837d34 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
@@ -2,7 +2,6 @@
 
 package com.yahoo.vespa.model.application.validation;
 
-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;
@@ -124,8 +123,6 @@ class JvmHeapSizeValidatorTest {
         @Override public long aggregatedModelCostInBytes() { return totalCost.get(); }
         @Override public void registerModel(ApplicationFile path) {}
 
-        @SuppressWarnings("removal") @Override public void registerModel(ModelReference ref) {}
-
         @Override
         public void registerModel(URI uri) {
             assertEquals("https://my/url/model.onnx", uri.toString());