diff options
5 files changed, 1 insertions, 29 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 9e72efab07b..826cf85798a 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -166,12 +166,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { } @Override - @SuppressWarnings("deprecation") - public String getApplicationName() { - return metaData.getApplicationId().application().value(); - } - - @Override public ApplicationId getApplicationId() { return metaData.getApplicationId(); } @Override diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index ea59c4409c3..59f506d778a 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -97,7 +97,6 @@ "abstract" ], "methods": [ - "public abstract java.lang.String getApplicationName()", "public abstract com.yahoo.config.provision.ApplicationId getApplicationId()", "public abstract java.io.Reader getServices()", "public abstract java.io.Reader getHosts()", 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 0600a31e9c5..bc320ac6e98 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 @@ -73,15 +73,6 @@ public interface ApplicationPackage { String PERMANENT_SERVICES = "permanent-services.xml"; - /** - * The name of the application package - * - * @return the name of the application (i.e the directory where the application package was deployed from) - * @deprecated do not use - */ - @Deprecated // TODO: Remove in Vespa 8 - String getApplicationName(); - ApplicationId getApplicationId(); /** diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java index 8892de0a88d..abd7ba3be9f 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java @@ -95,14 +95,8 @@ public class MockApplicationPackage implements ApplicationPackage { /** Returns the root of this application package relative to the current dir */ protected File root() { return root; } - @SuppressWarnings("deprecation") // not redundant @Override - public String getApplicationName() { - return "mock-application"; - } - - @Override - public ApplicationId getApplicationId() { return ApplicationId.from("default", getApplicationName(), "default"); } + public ApplicationId getApplicationId() { return ApplicationId.from("default", "mock-application", "default"); } @Override public Reader getServices() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 6a483c38aee..0fa6e9a0704 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -122,12 +122,6 @@ public class ZKApplicationPackage extends AbstractApplicationPackage { } @Override - @SuppressWarnings("deprecation") - public String getApplicationName() { - return metaData.getApplicationId().application().value(); - } - - @Override public ApplicationId getApplicationId() { return metaData.getApplicationId(); } @Override |