diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-02-13 10:28:48 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-02-13 14:52:35 +0000 |
commit | 4426f0ee45846a905d2fe47bb0b998014d86ad39 (patch) | |
tree | 303e32cfd33ea36aab6fed03b56c1186cef5b388 /config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing | |
parent | 3da5e19509fcc10d4cdbcc49747cacc7cac2ae2e (diff) |
split AbstractConfigProducer
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing')
4 files changed, 9 insertions, 9 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 bd7b6dd4716..541c59705cf 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 @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.builder.xml.dom.chains.processing; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.config.model.producer.TreeConfigProducer; 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; @@ -24,12 +24,12 @@ public class DomProcessingBuilder extends DomChainsBuilder<Processor, Processing } @Override - protected ProcessingChains newChainsInstance(AbstractConfigProducer<?> parent) { + protected ProcessingChains newChainsInstance(TreeConfigProducer<?> parent) { return new ProcessingChains(parent, "processing"); } @Override - protected ProcessingChainsBuilder readChains(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> processingChainsElements, + protected ProcessingChainsBuilder readChains(DeployState deployState, TreeConfigProducer<?> ancestor, List<Element> processingChainsElements, Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName) { return new ProcessingChainsBuilder(deployState, ancestor, processingChainsElements, outerComponentTypeByComponentName); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java index fa6fff9dee3..b4d0bfad826 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.model.builder.xml.dom.chains.processing; import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.chains.ComponentsBuilder; import com.yahoo.vespa.model.builder.xml.dom.chains.DomChainBuilderBase; import com.yahoo.vespa.model.container.processing.ProcessingChain; @@ -21,7 +21,7 @@ public class DomProcessingChainBuilder extends DomChainBuilderBase<Processor, Pr super(List.of(ComponentsBuilder.ComponentType.processor), outerComponentTypeByComponentName); } - protected ProcessingChain buildChain(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec, + protected ProcessingChain buildChain(DeployState deployState, TreeConfigProducer<?> ancestor, Element producerSpec, ChainSpecification specWithoutInnerComponents) { return new ProcessingChain(specWithoutInnerComponents); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java index 6f9dd964062..1b4466c6f87 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.builder.xml.dom.chains.processing; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.vespa.model.builder.xml.dom.chains.ChainedComponentModelBuilder; import com.yahoo.vespa.model.container.processing.Processor; -import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import org.w3c.dom.Element; @@ -17,7 +17,7 @@ import org.w3c.dom.Element; public class DomProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Processor> { @Override - protected Processor doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element processorElement) { + protected Processor doBuild(DeployState deployState, TreeConfigProducer ancestor, Element processorElement) { ChainedComponentModelBuilder modelBuilder = new ChainedComponentModelBuilder(processorElement); return new Processor(modelBuilder.build()); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java index f29b46cc327..5b6ae90f6ce 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.builder.xml.dom.chains.processing; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.chains.ChainsBuilder; import com.yahoo.vespa.model.builder.xml.dom.chains.ComponentsBuilder; import com.yahoo.vespa.model.builder.xml.dom.chains.DomChainBuilderBase; @@ -29,7 +29,7 @@ public class ProcessingChainsBuilder extends ChainsBuilder<Processor, Processing put("chain", DomProcessingChainBuilder.class); }}); - public ProcessingChainsBuilder(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> processingChainsElements, + public ProcessingChainsBuilder(DeployState deployState, TreeConfigProducer<?> ancestor, List<Element> processingChainsElements, Map<String, ComponentsBuilder.ComponentType<?>> outerSearcherTypeByComponentName) { super(deployState, ancestor, processingChainsElements, outerSearcherTypeByComponentName, chainType2builderClass); } |