diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-02-02 17:40:33 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-02-02 17:40:33 +0100 |
commit | b729ea38f6ed4e23975c54321132c59627a4c6e1 (patch) | |
tree | 3d593f7872564bedb6b927c5bb80170311e41378 /config-model/src/main/java/com/yahoo/config/model/deploy | |
parent | 27ff7ea1bc90d511e3b1c1d8da516f25e0eba31d (diff) |
Fetaure names cleanup WIP
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/deploy')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 43d3fafdb78..24e68965e9c 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -47,8 +47,7 @@ import java.util.Set; /** * Contains various state during deploy that should be available in all builders of a {@link com.yahoo.config.model.ConfigModel} * - * @author lulf - * @since 5.8 + * @author Ulf Lilleengen */ public class DeployState implements ConfigDefinitionStore { @@ -211,9 +210,9 @@ public class DeployState implements ConfigDefinitionStore { public QueryProfiles getQueryProfiles() { return queryProfiles; } public SemanticRules getSemanticRules() { return semanticRules; } - + public Version getWantedNodeVespaVersion() { return wantedNodeVespaVersion; } - + public Instant now() { return now; } public boolean disableFiledistributor() { return disableFiledistributor; } @@ -288,7 +287,7 @@ public class DeployState implements ConfigDefinitionStore { this.now = now; return this; } - + public Builder wantedNodeVespaVersion(Version version) { this.wantedNodeVespaVersion = version; return this; @@ -321,7 +320,8 @@ public class DeployState implements ConfigDefinitionStore { names.put(searchName, sdName); if (!sdName.equals(searchName)) { throw new IllegalArgumentException("Search definition file name ('" + sdName + "') and name of " + - "search element ('" + searchName + "') are not equal for file '" + readerName + "'"); + "search element ('" + searchName + + "') are not equal for file '" + readerName + "'"); } } catch (ParseException e) { throw new IllegalArgumentException("Could not parse search definition file '" + getSearchDefinitionRelativePath(reader.getName()) + "': " + e.getMessage(), e); |