diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/http/xml')
2 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainBuilder.java index 334b41d5e8e..293480e6c7f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainBuilder.java @@ -19,15 +19,15 @@ import static com.yahoo.vespa.model.builder.xml.dom.chains.ComponentsBuilder.Com * @author Tony Vaagenes */ public class FilterChainBuilder extends DomChainBuilderBase<Filter, Chain<Filter>> { - private static Collection<ComponentType<Filter>> allowedComponentTypes = Collections.singleton(ComponentType.filter); + private static final Collection<ComponentType<Filter>> allowedComponentTypes = Collections.singleton(ComponentType.filter); - public FilterChainBuilder(Map<String, ComponentType> outerFilterTypeByComponentName) { + public FilterChainBuilder(Map<String, ComponentType<?>> outerFilterTypeByComponentName) { super(allowedComponentTypes, outerFilterTypeByComponentName); } @Override - protected Chain<Filter> buildChain(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec, ChainSpecification specWithoutInnerComponents) { + protected Chain<Filter> buildChain(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec, ChainSpecification specWithoutInnerComponents) { return new Chain<>(specWithoutInnerComponents); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainsBuilder.java index e85e853f989..c75d8225843 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterChainsBuilder.java @@ -35,15 +35,15 @@ public class FilterChainsBuilder extends DomChainsBuilder<Filter, Chain<Filter>, } @Override - protected FilterChains newChainsInstance(AbstractConfigProducer parent) { + protected FilterChains newChainsInstance(AbstractConfigProducer<?> parent) { return new FilterChains(parent); } @Override protected ChainsBuilder<Filter, Chain<Filter>> readChains( DeployState deployState, - AbstractConfigProducer ancestor, - List<Element> allChainsElems, Map<String, ComponentsBuilder.ComponentType> outerComponentTypeByComponentName) { + AbstractConfigProducer<?> ancestor, + List<Element> allChainsElems, Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName) { return new ChainsBuilder<>(deployState, ancestor, allChainsElems, outerComponentTypeByComponentName, chainType2BuilderClass); } |