summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-07-11 10:43:22 +0200
committerHarald Musum <musum@yahooinc.com>2023-07-11 10:43:22 +0200
commit71b7f567c37cf971e9c8bdc692d7b23c4d7ab7a4 (patch)
tree8b4832403283eab1653d780d6d57acf1e2d847c6 /config-model-api
parentd0c57eddbfdf3b976da5d32b956c3d2b16ff478e (diff)
Remove dead code now that Vespa 7 is gone
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java5
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java1
2 files changed, 0 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index b6a183c06ab..afaab0f4890 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -8,9 +8,7 @@ import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.Zone;
import com.yahoo.io.reader.NamedReader;
import com.yahoo.path.Path;
-import com.yahoo.text.XML;
import com.yahoo.vespa.config.ConfigDefinitionKey;
-import org.w3c.dom.Element;
import java.io.File;
import java.io.IOException;
@@ -72,9 +70,6 @@ public interface ApplicationPackage {
String RULES_NAME_SUFFIX = ".sr";
String EXT_DIR = "ext";
- // TODO: Remove when oldest model version is 8.95
- String PERMANENT_SERVICES = "permanent-services.xml";
-
ApplicationId getApplicationId();
/**
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index dede5092b45..d5a1b832aba 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -38,7 +38,6 @@ public interface ModelContext {
ApplicationPackage applicationPackage();
Optional<Model> previousModel();
- default Optional<ApplicationPackage> permanentApplicationPackage() { return Optional.empty(); } // TODO: Remove when oldest model version is 8.95
HostProvisioner getHostProvisioner();
Provisioned provisioned();
DeployLogger deployLogger();