Non-functional changes only

4 files changed, 23 insertions, 28 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java
index f7167147a61..38dc82ac3c2 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java
@@ -18,7 +18,7 @@ import java.util.stream.Stream;
  */
 public final class ConfigModelContext {
 
-    private final AbstractConfigProducer parent;
+    private final AbstractConfigProducer<?> parent;
     private final String producerId;
     private final DeployState deployState;
     private final VespaModel vespaModel;
@@ -29,7 +29,7 @@ public final class ConfigModelContext {
                                DeployState deployState,
                                VespaModel vespaModel,
                                ConfigModelRepoAdder configModelRepoAdder,
-                               AbstractConfigProducer parent,
+                               AbstractConfigProducer<?> parent,
                                String producerId) {
         this.applicationType = applicationType;
         this.deployState = deployState;
@@ -41,7 +41,7 @@ public final class ConfigModelContext {
 
     public ApplicationPackage getApplicationPackage() { return deployState.getApplicationPackage(); }
     public String getProducerId() { return producerId; }
-    public AbstractConfigProducer getParentProducer() { return parent; }
+    public AbstractConfigProducer<?> getParentProducer() { return parent; }
     public DeployLogger getDeployLogger() { return deployState.getDeployLogger(); }
     public DeployState getDeployState() { return deployState; }
     public ApplicationType getApplicationType() { return applicationType; }
@@ -52,7 +52,7 @@ public final class ConfigModelContext {
     public ConfigModelRepoAdder getConfigModelRepoAdder() { return configModelRepoAdder; }
 
     /** Create a new context with a different parent */
-    public ConfigModelContext withParent(AbstractConfigProducer newParent) {
+    public ConfigModelContext withParent(AbstractConfigProducer<?> newParent) {
         return ConfigModelContext.create(deployState, vespaModel, configModelRepoAdder, newParent, producerId);
     }
 
@@ -76,7 +76,7 @@ public final class ConfigModelContext {
     public static ConfigModelContext create(DeployState deployState,
                                             VespaModel vespaModel,
                                             ConfigModelRepoAdder configModelRepoAdder,
-                                            AbstractConfigProducer parent,
+                                            AbstractConfigProducer<?> parent,
                                             String producerId) {
         return new ConfigModelContext(ApplicationType.DEFAULT, deployState, vespaModel, configModelRepoAdder, parent, producerId);
     }
@@ -94,7 +94,7 @@ public final class ConfigModelContext {
                                             DeployState deployState,
                                             VespaModel vespaModel,
                                             ConfigModelRepoAdder configModelRepoAdder,
-                                            AbstractConfigProducer parent,
+                                            AbstractConfigProducer<?> parent,
                                             String producerId) {
         return new ConfigModelContext(applicationType, deployState, vespaModel, configModelRepoAdder, parent, producerId);
     }
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
index b1e197db4eb..9b0f883bc2c 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
@@ -20,11 +20,10 @@ import java.util.List;
  * Builds a config model using DOM parsers
  *
  * @author vegardh
- * @since 5.1.10
  */
 public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends AbstractComponent implements ConfigModelPlugin {
 
-    private Class<MODEL> configModelClass;
+    private final Class<MODEL> configModelClass;
 
     public ConfigModelBuilder(Class<MODEL> configModelClass) {
         this.configModelClass = configModelClass;
@@ -34,16 +33,16 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
      * Method that must return the XML elements this builder handles. Subclasses must implement this in order to
      * get called when one of the elements have been encountered when parsing.
      *
-     * @return A list of elements that this builder handles.
+     * @return a list of elements that this builder handles
      */
     public abstract List<ConfigModelId> handlesElements();
 
     /**
      * Convenience hook called from {@link #build}. Implement this method to build a config model.
      *
-     * @param spec The XML element that this builder should handle.
-     * @param modelContext A model context that contains the application package and other data needed by the
-     *                     config model constructor.
+     * @param spec the XML element that this builder should handle
+     * @param modelContext a model context that contains the application package and other data needed by the
+     *                     config model constructor
      */
     public abstract void doBuild(MODEL model, Element spec, ConfigModelContext modelContext);
 
@@ -56,7 +55,7 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
      * @param spec the XML element this is constructed from
      */
     public final MODEL build(DeployState deployState, VespaModel vespaModel, ConfigModelRepo configModelRepo,
-                             AbstractConfigProducer parent, Element spec) {
+                             AbstractConfigProducer<?> parent, Element spec) {
         ConfigModelContext context = ConfigModelContext.create(deployState, vespaModel, configModelRepo, parent, getIdString(spec));
         return build(new DefaultModelInstanceFactory(), spec, context);
     }
@@ -92,7 +91,7 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
         if (!(other instanceof ConfigModelBuilder)) {
             return false;
         }
-        ConfigModelBuilder otherBuilder = (ConfigModelBuilder) other;
+        ConfigModelBuilder<?> otherBuilder = (ConfigModelBuilder<?>) other;
         List<ConfigModelId> thisIds = this.handlesElements();
         List<ConfigModelId> otherIds = otherBuilder.handlesElements();
         if (thisIds.size() != otherIds.size()) {
@@ -118,4 +117,5 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
             }
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/SimpleConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/SimpleConfigProducer.java
index f00d6d60317..7c59a5600cd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/SimpleConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/SimpleConfigProducer.java
@@ -18,7 +18,7 @@ public final class SimpleConfigProducer<T extends AbstractConfigProducer<?>> ext
      * @param parent   parent ConfigProducer.
      * @param configId name of this instance
      */
-    public SimpleConfigProducer(AbstractConfigProducer parent, String configId) {
+    public SimpleConfigProducer(AbstractConfigProducer<?> parent, String configId) {
         super(parent, configId);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index 404a0ceb4ea..b93f4405333 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -57,7 +57,7 @@ public class Content extends ConfigModel {
     // to find or add the docproc container and supplement cluster controllers with clusters having less then 3 nodes
     private final Collection<ContainerModel> containers;
 
-    @SuppressWarnings({ "UnusedDeclaration"}) // Created by reflection in ConfigModelRepo
+    @SuppressWarnings("UnusedDeclaration") // Created by reflection in ConfigModelRepo
     public Content(ConfigModelContext modelContext, AdminModel adminModel, Collection<ContainerModel> containers) {
         super(modelContext);
         modelContext.getParentProducer().getRoot();
@@ -92,7 +92,7 @@ public class Content extends ConfigModel {
         return docprocChain.getChainSpecification();
     }
 
-    private static void addIndexingChain(ContainerCluster containerCluster) {
+    private static void addIndexingChain(ContainerCluster<?> containerCluster) {
         DocprocChain chainAlreadyPresent = containerCluster.getDocprocChains().allChains().
                 getComponent(new ComponentId(IndexingDocprocChain.NAME));
         if (chainAlreadyPresent != null) {
@@ -104,7 +104,7 @@ public class Content extends ConfigModel {
         containerCluster.getDocprocChains().add(new IndexingDocprocChain());
     }
 
-    private static ContainerCluster getContainerWithSearch(Collection<ContainerModel> containers) {
+    private static ContainerCluster<?> getContainerWithSearch(Collection<ContainerModel> containers) {
         for (ContainerModel container : containers)
             if (container.getCluster().getSearch() != null)
                 return container.getCluster();
@@ -204,11 +204,6 @@ public class Content extends ConfigModel {
             content.cluster = new ContentCluster.Builder(admin).build(content.containers, modelContext, xml);
             buildIndexingClusters(content, modelContext,
                                   (ApplicationConfigProducerRoot)modelContext.getParentProducer());
-            markCombinedClusters();
-        }
-
-        private void markCombinedClusters() {
-
         }
 
         /** Select/creates and initializes the indexing cluster coupled to this */
@@ -231,7 +226,7 @@ public class Content extends ConfigModel {
             if (content.containers.isEmpty()) {
                 createImplicitIndexingCluster(indexedSearchCluster, content, modelContext, root);
             } else {
-                ContainerCluster targetCluster = getContainerWithDocproc(content.containers);
+                ContainerCluster<?> targetCluster = getContainerWithDocproc(content.containers);
                 if (targetCluster == null)
                     targetCluster = getContainerWithSearch(content.containers);
                 if (targetCluster == null)
@@ -259,7 +254,7 @@ public class Content extends ConfigModel {
             return null;
         }
 
-        private void addIndexingChainsTo(ContainerCluster indexer, IndexedSearchCluster cluster) {
+        private void addIndexingChainsTo(ContainerCluster<?> indexer, IndexedSearchCluster cluster) {
             addIndexingChain(indexer);
             DocprocChain indexingChain;
             ComponentRegistry<DocprocChain> allChains = indexer.getDocprocChains().allChains();
@@ -284,7 +279,7 @@ public class Content extends ConfigModel {
                                                    ConfigModelContext modelContext,
                                                    ApplicationConfigProducerRoot root) {
             String indexerName = cluster.getIndexingClusterName();
-            AbstractConfigProducer parent = root.getChildren().get(ContainerModel.DOCPROC_RESERVED_NAME);
+            AbstractConfigProducer<?> parent = root.getChildren().get(ContainerModel.DOCPROC_RESERVED_NAME);
             if (parent == null)
                 parent = new SimpleConfigProducer(root, ContainerModel.DOCPROC_RESERVED_NAME);
             ApplicationContainerCluster indexingCluster = new ApplicationContainerCluster(parent, "cluster." + indexerName, indexerName, modelContext.getDeployState());
@@ -319,14 +314,14 @@ public class Content extends ConfigModel {
             cluster.setIndexingChain(indexingCluster.getDocprocChains().allChains().getComponent(IndexingDocprocChain.NAME));
         }
 
-        private ContainerCluster getContainerWithDocproc(Collection<ContainerModel> containers) {
+        private ContainerCluster<?> getContainerWithDocproc(Collection<ContainerModel> containers) {
             for (ContainerModel container : containers)
                 if (container.getCluster().getDocproc() != null)
                     return container.getCluster();
             return null;
         }
 
-        private void addDocproc(ContainerCluster cluster) {
+        private void addDocproc(ContainerCluster<?> cluster) {
             if (cluster.getDocproc() == null) {
                 DocprocChains chains = new DocprocChains(cluster, "docprocchains");
                 ContainerDocproc containerDocproc = new ContainerDocproc(cluster, chains);