diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-04-27 22:08:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 22:08:47 +0200 |
| commit | cd04e0c3a06499971c82678e88510b257d4d6faa (patch) | |
| tree | 0243a5e675eacf15d466409964e7789058e4a41a /config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java | |
| parent | f455d83e0556dcc783fdafdc78898cb5dc1ebb6e (diff) | |
| parent | 24ec516e9fead0b12fa20a9ed282cb57b2c4f817 (diff) | |
Merge pull request #22323 from vespa-engine/hmusum/validate-file-extension-for-app-files-2v7.579.27
Validate file extension for app files, part 2
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java index 299d8172f6c..d4393b2cd9e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainBuilder.java @@ -10,8 +10,7 @@ import com.yahoo.vespa.model.builder.xml.dom.chains.DomChainBuilderBase; import com.yahoo.vespa.model.container.docproc.DocprocChain; import com.yahoo.vespa.model.container.docproc.DocumentProcessor; import org.w3c.dom.Element; - -import java.util.Arrays; +import java.util.List; import java.util.Map; /** @@ -21,12 +20,12 @@ import java.util.Map; */ public class DomDocprocChainBuilder extends DomChainBuilderBase<DocumentProcessor, DocprocChain> { - public DomDocprocChainBuilder(Map<String, ComponentsBuilder.ComponentType> outerComponentTypeByComponentName) { - super(Arrays.asList(ComponentsBuilder.ComponentType.documentprocessor), outerComponentTypeByComponentName); + public DomDocprocChainBuilder(Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName) { + super(List.of(ComponentsBuilder.ComponentType.documentprocessor), outerComponentTypeByComponentName); } @Override - protected DocprocChain buildChain(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec, + protected DocprocChain buildChain(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec, ChainSpecification specWithoutInnerComponents) { Map<Pair<String, String>, String> fieldNameSchemaMap = DocumentProcessorModelBuilder.parseFieldNameSchemaMap(producerSpec); return new DocprocChain(specWithoutInnerComponents, fieldNameSchemaMap); |