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

1 files changed, 7 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainsBuilder.java
index dfb849b2e0f..ae22a6971bb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocprocChainsBuilder.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.docproc;
 
+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.ComponentType;
 import com.yahoo.vespa.model.builder.xml.dom.chains.DomChainsBuilder;
-import com.yahoo.vespa.model.container.docproc.DocprocChains;
 import com.yahoo.vespa.model.container.docproc.DocprocChain;
+import com.yahoo.vespa.model.container.docproc.DocprocChains;
 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;
 
@@ -22,18 +20,18 @@ import java.util.Map;
  */
 public class DomDocprocChainsBuilder  extends DomChainsBuilder<DocumentProcessor, DocprocChain, DocprocChains> {
     public DomDocprocChainsBuilder(Element outerChainsElem, boolean supportDocprocChainsDir) {
-        super(outerChainsElem, Arrays.asList(ComponentType.documentprocessor),
-                supportDocprocChainsDir ? ApplicationPackage.DOCPROCCHAINS_DIR: null);
+        super(outerChainsElem, List.of(ComponentType.documentprocessor),
+              supportDocprocChainsDir ? ApplicationPackage.DOCPROCCHAINS_DIR: null);
     }
 
     @Override
-    protected DocprocChains newChainsInstance(AbstractConfigProducer parent) {
+    protected DocprocChains newChainsInstance(AbstractConfigProducer<?> parent) {
         return new DocprocChains(parent, "docprocchains");
     }
 
     @Override
-    protected DocprocChainsBuilder readChains(DeployState deployState, AbstractConfigProducer ancestor, List<Element> docprocChainsElements,
-                                              Map<String, ComponentType> outerComponentTypeByComponentName) {
+    protected DocprocChainsBuilder readChains(DeployState deployState, AbstractConfigProducer<?> ancestor, List<Element> docprocChainsElements,
+                                              Map<String, ComponentType<?>> outerComponentTypeByComponentName) {
         return new DocprocChainsBuilder(deployState, ancestor, docprocChainsElements, outerComponentTypeByComponentName);
     }
 }