diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 12:12:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02 12:12:08 +0100 |
commit | 95ae8c562a8826f03bd2faad82b0ffb754133342 (patch) | |
tree | 35545093828437f6d7704b4b6c3646a39ff50a00 /config-model-api | |
parent | 21dd7e03056a77e1de75e6e95413c3b00e6615ec (diff) | |
parent | b73a4d2c8b5e7ae83743b10b8f21836811e5dff4 (diff) |
Merge branch 'master' into jvenstad/zone-cleanup-4
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java | 23 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeployLogger.java | 5 |
2 files changed, 19 insertions, 9 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 c1a786194a2..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 @@ -7,6 +7,7 @@ import com.yahoo.config.provision.Zone; import com.yahoo.path.Path; import com.yahoo.io.IOUtils; 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; @@ -14,8 +15,17 @@ import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -228,9 +238,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 @@ -261,7 +271,8 @@ public interface ApplicationPackage { * * @return A new application package instance pointing to a new location */ - default ApplicationPackage preprocess(Zone 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"); } diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeployLogger.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeployLogger.java index cee501841b4..61cab2f6ce7 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeployLogger.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeployLogger.java @@ -4,10 +4,9 @@ package com.yahoo.config.application.api; import java.util.logging.Level; /** - * Used during application deployment to persist and propagate messages to end user + * Used during application deployment to propagate messages to the end user * - * @author lulf - * @since 5.1 + * @author Ulf Lillengen */ public interface DeployLogger { |