diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 12:43:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02 12:43:40 +0100 |
commit | e77379005bccd3d5009b1484038183a05856b4cd (patch) | |
tree | 35545093828437f6d7704b4b6c3646a39ff50a00 /config-model-api/src | |
parent | b73a4d2c8b5e7ae83743b10b8f21836811e5dff4 (diff) | |
parent | 95ae8c562a8826f03bd2faad82b0ffb754133342 (diff) |
Merge pull request #4453 from vespa-engine/jvenstad/zone-cleanup-4
Jvenstad/zone cleanup 4
Diffstat (limited to 'config-model-api/src')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java | 18 |
1 files changed, 4 insertions, 14 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 e8236d9eab4..7506c884715 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 @@ -4,7 +4,7 @@ package com.yahoo.config.application.api; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.Version; import com.yahoo.config.provision.Zone; -import com.yahoo.config.provision.ZoneId; +import com.yahoo.path.Path; import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; import com.yahoo.path.Path; @@ -265,25 +265,15 @@ public interface ApplicationPackage { * application package. This is the entry point for the multi environment application package support. This method * will not mutate the existing application package. * - * @param zone A valid {@link ZoneId} instance, used to decide which parts of services to keep and remove + * @param zone A valid {@link Zone} instance, used to decide which parts of services to keep and remove * @param ruleConfigDeriver ignored * @param logger A {@link DeployLogger} to add output that will be returned to the user * * @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(Zone 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); - } - } |