diff options
author | Harald Musum <musum@yahooinc.com> | 2024-01-17 09:39:13 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2024-01-17 09:39:13 +0100 |
commit | 215563fed6d443da7868c6c5e37a038c3b64fa6c (patch) | |
tree | c8a4b66d57f6839161367a74c702b09fd8564e0d | |
parent | d5bd82ab357743820e5ed4cd6d2d8e3aa498b02f (diff) |
Remove unused method
3 files changed, 0 insertions, 8 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 21374061bfa..f5f9215d29d 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1517,7 +1517,6 @@ "abstract" ], "methods" : [ - "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)", "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId, com.yahoo.config.provision.ClusterSpec$Id)", "public static com.yahoo.config.model.api.OnnxModelCost disabled()" ], 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 1efd98184cc..49ef3cf4929 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 @@ -15,10 +15,6 @@ import java.util.Map; */ public interface OnnxModelCost { - // TODO: Remove when no longer in use (oldest model version is 8.283) - default Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { - return newCalculator(appPkg, applicationId, null); - } Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId, ClusterSpec.Id clusterId); interface Calculator { 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 a53ef233746..52d861ac902 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 @@ -29,8 +29,6 @@ import java.util.concurrent.atomic.AtomicLong; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author bjorncs @@ -119,7 +117,6 @@ class JvmHeapSizeValidatorTest { ModelCostDummy(long modelCost) { this.modelCost = modelCost; } - @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; } @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId, ClusterSpec.Id clusterId) { return this; } @Override public Map<String, ModelInfo> models() { return Map.of(); } @Override public void setRestartOnDeploy() {} |