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/ChainsBuilder.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/ChainsBuilder.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ChainsBuilder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ChainsBuilder.java index 5891347f6b4..c48968333ac 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ChainsBuilder.java @@ -24,8 +24,8 @@ public class ChainsBuilder<COMPONENT extends ChainedComponent<?>, CHAIN extends private final Map<String, Class<? extends DomChainBuilderBase<? extends COMPONENT, ? extends CHAIN>>> chainType2BuilderClass; // NOTE: The chain type string (key in chainType2BuilderClass) must match the xml tag name for the chain. - public ChainsBuilder(DeployState deployState, AbstractConfigProducer ancestor, List<Element> chainsElems, - Map<String, ComponentsBuilder.ComponentType> outerComponentTypeByComponentName, + public ChainsBuilder(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> chainsElems, + Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName, Map<String, Class<? extends DomChainBuilderBase<? extends COMPONENT, ? extends CHAIN>>> chainType2BuilderClass) { this.chainType2BuilderClass = chainType2BuilderClass; @@ -36,8 +36,8 @@ public class ChainsBuilder<COMPONENT extends ChainedComponent<?>, CHAIN extends return Collections.unmodifiableCollection(chains); } - private void readChains(DeployState deployState, AbstractConfigProducer ancestor, List<Element> chainsElems, - Map<String, ComponentsBuilder.ComponentType> outerSearcherTypeByComponentName) { + private void readChains(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> chainsElems, + Map<String, ComponentsBuilder.ComponentType<?>> outerSearcherTypeByComponentName) { for (Map.Entry<String, Class<? extends DomChainBuilderBase<? extends COMPONENT, ? extends CHAIN>>> chainType : chainType2BuilderClass.entrySet()) { @@ -49,9 +49,9 @@ public class ChainsBuilder<COMPONENT extends ChainedComponent<?>, CHAIN extends } } - private void readChain(DeployState deployState, AbstractConfigProducer ancestor, Element chainElem, + private void readChain(DeployState deployState, AbstractConfigProducer<?> ancestor, Element chainElem, Class<? extends DomChainBuilderBase<? extends COMPONENT, ? extends CHAIN>> builderClass, - Map<String, ComponentsBuilder.ComponentType> outerSearcherTypeByComponentName) { + Map<String, ComponentsBuilder.ComponentType<?>> outerSearcherTypeByComponentName) { DomChainBuilderBase<? extends COMPONENT, ? extends CHAIN> builder = DomBuilderCreator.create(builderClass, outerSearcherTypeByComponentName); |