diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-12-03 14:40:39 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-12-03 14:41:03 +0100 |
| commit | d603afa302dc5911eda46360f08ff708f19c2a1a (patch) | |
| tree | b71d498b48242cab42e18542a57c51cc6397233a /config-model-api | |
| parent | afcf1bb71cb7b87a03149d197f724cfc7603ef92 (diff) | |
Remove unused and undocumented support for permanent-services.xml
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java | 1 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 |
2 files changed, 2 insertions, 1 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 883b59be410..0ce09c454a0 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 @@ -71,6 +71,7 @@ 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 a4e62dc5488..78f49f1e045 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 @@ -36,7 +36,7 @@ public interface ModelContext { ApplicationPackage applicationPackage(); Optional<Model> previousModel(); - Optional<ApplicationPackage> permanentApplicationPackage(); + default Optional<ApplicationPackage> permanentApplicationPackage() { return Optional.empty(); } // TODO: Remove when oldest model version is 8.95 HostProvisioner getHostProvisioner(); Provisioned provisioned(); DeployLogger deployLogger(); |