From 99a8a7500e76f58a9bf7e320d29c9f9bbdb9fb19 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 18 Dec 2017 12:27:11 +0100 Subject: Restore public method --- .../config/application/api/ApplicationPackage.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'config-model-api') 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 480d4d05451..0e50b39a319 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 @@ -229,9 +229,9 @@ public interface ApplicationPackage { throw new UnsupportedOperationException("This application package cannot write its metadata"); } - /** - * Returns the single host allocation info of this, or an empty map if no allocation is available - * + /** + * Returns the single host allocation info of this, or an empty map if no allocation is available + * * @deprecated please use #getAllocatedHosts */ // TODO: Remove on Vespa 7 @@ -262,8 +262,19 @@ public interface ApplicationPackage { * * @return A new application package instance pointing to a new location */ - default ApplicationPackage preprocess(ZoneId zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger) throws IOException, TransformerException, ParserConfigurationException, SAXException { + default ApplicationPackage preprocess(ZoneId zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger) + throws IOException, TransformerException, ParserConfigurationException, SAXException { throw new UnsupportedOperationException("This application package does not support preprocessing"); } + /** + * @deprecated pass a ZoneId as first parameter instead + */ + // TODO: Remove on Vespa 7 + @Deprecated + default ApplicationPackage preprocess(Zone zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger) + throws IOException, TransformerException, ParserConfigurationException, SAXException { + return preprocess(zone.id(), ruleConfigDeriver, logger); + } + } -- cgit v1.2.3