Merge pull request #34822 from vespa-engine/hmusum/config-model-content-cluster-build-cleanup

Minor config model content cluster build cleanup

Author: hmusum

config-model/src/main/java/com/yahoo/vespa/model/content/Content.java

@@ -44,7 +44,7 @@
  * The config model from a content tag in services.
  * This consists mostly of a ContentCluster.
  *
- * @author baldersheim
+ * @author Henning Baldersheim
  */
 public class Content extends ConfigModel {
 
@@ -207,8 +207,8 @@ public List<ConfigModelId> handlesElements() {
 
         @Override
         public void doBuild(Content content, Element xml, ConfigModelContext modelContext) {
-            Admin admin = content.adminModel != null ? content.adminModel.getAdmin() : null; // This is null in tests only
-            content.cluster = new ContentCluster.Builder(admin).build(content.containers, modelContext, xml);
+            Admin admin = content.adminModel.getAdmin();
+            content.cluster = new ContentCluster.Builder(admin).build(modelContext, xml);
             buildIndexingClusters(content, modelContext,
                                   (ApplicationConfigProducerRoot)modelContext.getParentProducer());
         }

config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java

@@ -34,7 +34,6 @@
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import com.yahoo.vespa.model.builder.xml.dom.NodesSpecification;
 import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.content.ClusterControllerConfig;
 import com.yahoo.vespa.model.content.ClusterResourceLimits;
 import com.yahoo.vespa.model.content.ContentSearch;
@@ -113,7 +112,7 @@ public Builder(Admin admin) {
             this.admin = admin;
         }
 
-        public ContentCluster build(Collection<ContainerModel> containers, ConfigModelContext context, Element w3cContentElement) {
+        public ContentCluster build(ConfigModelContext context, Element w3cContentElement) {
             ModelElement contentElement = new ModelElement(w3cContentElement);
             DeployState deployState = context.getDeployState();
             ModelElement documentsElement = contentElement.child("documents");
@@ -345,7 +344,6 @@ private void addClusterControllers(ConfigModelContext context,
                                            ModelElement contentElement,
                                            ContentCluster contentCluster,
                                            DeployState deployState) {
-            if (admin == null) return; // only in tests
             if (contentCluster.getPersistence() == null) return;
 
             ClusterControllerContainerCluster clusterControllers;
@@ -478,8 +476,7 @@ public DistributionMode getDistributionMode() {
     }
 
     public static String getClusterId(ModelElement clusterElem) {
-        String clusterId = clusterElem.stringAttribute("id");
-        return clusterId != null ? clusterId : "content";
+        return clusterElem.stringAttribute("id", "content");
     }
 
     public String getName() { return clusterId; }

config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java

@@ -22,7 +22,7 @@
 /**
  * For testing purposes only.
  * 
- * @author geirst
+ * @author Geir Storli
  */
 public class ContentClusterUtils {
 
@@ -67,7 +67,7 @@ public static ContentCluster createCluster(String clusterXml, MockRoot root) {
         ConfigModelContext context = ConfigModelContext.create(applicationType, root.getDeployState(),
                                                                null, null, root, null);
 
-        return new ContentCluster.Builder(admin).build(List.of(), context, doc.getDocumentElement());
+        return new ContentCluster.Builder(admin).build(context, doc.getDocumentElement());
     }
 
     public static ContentCluster createCluster(String clusterXml, List<String> schemas, DeployState.Builder deployStateBuilder) throws Exception {