diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-05-06 20:21:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-06 20:21:32 +0200 |
commit | 3934b3311657f4e57559b9c01ed584a851fd2500 (patch) | |
tree | e9882e8a00bd45c744401731069e9af7dd6b71f3 /config-model/src/main | |
parent | ce90728dceb3ac333d32dedd56221fc488602198 (diff) | |
parent | 346c5a523fec4ec7cecb373e480e30846f5e33e5 (diff) |
Merge pull request #17760 from vespa-engine/bratseth/special-tokens-take-3
special-tokens-take-3
Diffstat (limited to 'config-model/src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java index 78d9dd473b3..3bc07db9507 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.model; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.HostInfo; +import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeResources; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java index ee246b5e485..2b2b17c76c3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java @@ -23,8 +23,9 @@ public class DocprocChain extends Chain<DocumentProcessor> { } /** - * The field name schema map that applies to this whole chain - * @return doctype,from → to + * The field name schema map that applies to this whole chain. + * + * @return doctype, from → to */ public Map<Pair<String,String>,String> fieldNameSchemaMap() { return fieldNameSchemaMap; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java index 2c1d979e2c4..8fe6b51f2b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java @@ -2,14 +2,12 @@ package com.yahoo.vespa.model.search; import com.yahoo.component.ComponentId; -import com.yahoo.component.ComponentSpecification; import com.yahoo.component.chain.Phase; import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.vespa.configdefinition.SpecialtokensConfig; import com.yahoo.vespa.model.container.docproc.DocprocChain; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Set; |