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/processing/DomProcessingBuilder.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/processing/DomProcessingBuilder.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java index 059cd157322..d29643c78e2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java @@ -1,17 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.builder.xml.dom.chains.processing; +import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; -import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.vespa.model.builder.xml.dom.chains.ComponentsBuilder; import com.yahoo.vespa.model.builder.xml.dom.chains.DomChainsBuilder; import com.yahoo.vespa.model.container.processing.ProcessingChain; import com.yahoo.vespa.model.container.processing.ProcessingChains; import com.yahoo.vespa.model.container.processing.Processor; import org.w3c.dom.Element; - -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -19,22 +17,21 @@ import java.util.Map; * Root builder of the processing model * * @author bratseth - * @since 5.1.6 */ public class DomProcessingBuilder extends DomChainsBuilder<Processor, ProcessingChain, ProcessingChains> { public DomProcessingBuilder(Element outerChainsElem) { - super(outerChainsElem, Arrays.asList(ComponentsBuilder.ComponentType.processor), ApplicationPackage.PROCESSORCHAINS_DIR); + super(outerChainsElem, List.of(ComponentsBuilder.ComponentType.processor), ApplicationPackage.PROCESSORCHAINS_DIR); } @Override - protected ProcessingChains newChainsInstance(AbstractConfigProducer parent) { + protected ProcessingChains newChainsInstance(AbstractConfigProducer<?> parent) { return new ProcessingChains(parent, "processing"); } @Override - protected ProcessingChainsBuilder readChains(DeployState deployState, AbstractConfigProducer ancestor, List<Element> processingChainsElements, - Map<String, ComponentsBuilder.ComponentType> outerComponentTypeByComponentName) { + protected ProcessingChainsBuilder readChains(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> processingChainsElements, + Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName) { return new ProcessingChainsBuilder(deployState, ancestor, processingChainsElements, outerComponentTypeByComponentName); } |