Allow continuous node resource specs

11 files changed, 34 insertions, 34 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 79675febe2f..833afb67f58 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -119,7 +119,7 @@ public class ContentCluster extends AbstractConfigProducer implements
 
             ModelElement contentElement = new ModelElement(w3cContentElement);
             DeployState deployState = context.getDeployState();
-            ModelElement documentsElement = contentElement.getChild("documents");
+            ModelElement documentsElement = contentElement.child("documents");
             Map<String, NewDocumentType> documentDefinitions =
                     new SearchDefinitionBuilder().build(deployState.getDocumentModel().getDocumentManager(), documentsElement);
 
@@ -150,7 +150,7 @@ public class ContentCluster extends AbstractConfigProducer implements
             }
 
             if (documentsElement != null) {
-                ModelElement e = documentsElement.getChild("document-processing");
+                ModelElement e = documentsElement.child("document-processing");
                 if (e != null) {
                     setupDocumentProcessing(c, e);
                 }
@@ -158,11 +158,11 @@ public class ContentCluster extends AbstractConfigProducer implements
                 throw new IllegalArgumentException("The specified content engine requires the <documents> element to be specified.");
             }
 
-            ModelElement tuning = contentElement.getChild("tuning");
+            ModelElement tuning = contentElement.child("tuning");
             if (tuning != null) {
                 setupTuning(c, tuning);
             }
-            ModelElement experimental = contentElement.getChild("experimental");
+            ModelElement experimental = contentElement.child("experimental");
             if (experimental != null) {
                 setupExperimental(c, experimental);
             }
@@ -217,7 +217,7 @@ public class ContentCluster extends AbstractConfigProducer implements
         }
 
         private void setupDocumentProcessing(ContentCluster c, ModelElement e) {
-            String docprocCluster = e.getStringAttribute("cluster");
+            String docprocCluster = e.stringAttribute("cluster");
             if (docprocCluster != null) {
                 docprocCluster = docprocCluster.trim();
             }
@@ -227,7 +227,7 @@ public class ContentCluster extends AbstractConfigProducer implements
                 }
             }
 
-            String docprocChain = e.getStringAttribute("chain");
+            String docprocChain = e.stringAttribute("chain");
             if (docprocChain != null) {
                 docprocChain = docprocChain.trim();
             }
@@ -239,9 +239,9 @@ public class ContentCluster extends AbstractConfigProducer implements
         }
 
         private void setupTuning(ContentCluster c, ModelElement tuning) {
-            ModelElement distribution = tuning.getChild("distribution");
+            ModelElement distribution = tuning.child("distribution");
             if (distribution != null) {
-                String attr = distribution.getStringAttribute("type");
+                String attr = distribution.stringAttribute("type");
                 if (attr != null) {
                     if (attr.toLowerCase().equals("strict")) {
                         c.distributionMode = DistributionMode.STRICT;
@@ -254,9 +254,9 @@ public class ContentCluster extends AbstractConfigProducer implements
                     }
                 }
             }
-            ModelElement merges = tuning.getChild("merges");
+            ModelElement merges = tuning.child("merges");
             if (merges != null) {
-                Integer attr = merges.getIntegerAttribute("max-nodes-per-merge");
+                Integer attr = merges.integerAttribute("max-nodes-per-merge");
                 if (attr != null) {
                     c.maxNodesPerMerge = attr;
                 }
@@ -307,7 +307,7 @@ public class ContentCluster extends AbstractConfigProducer implements
             else if (admin.multitenant()) {
                 String clusterName = contentClusterName + "-controllers";
                 NodesSpecification nodesSpecification =
-                    NodesSpecification.optionalDedicatedFromParent(contentElement.getChild("controllers"), context)
+                    NodesSpecification.optionalDedicatedFromParent(contentElement.child("controllers"), context)
                                       .orElse(NodesSpecification.nonDedicated(3, context));
                 Collection<HostResource> hosts = nodesSpecification.isDedicated() ?
                                                  getControllerHosts(nodesSpecification, admin, clusterName, context) :
@@ -520,7 +520,7 @@ public class ContentCluster extends AbstractConfigProducer implements
     }
 
     public static String getClusterName(ModelElement clusterElem) {
-        String clusterName = clusterElem.getStringAttribute("id");
+        String clusterName = clusterElem.stringAttribute("id");
         if (clusterName == null) {
             clusterName = "content";
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DocumentSelectionBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DocumentSelectionBuilder.java
index c6008ef4084..07b87a41b2f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DocumentSelectionBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DocumentSelectionBuilder.java
@@ -54,9 +54,9 @@ public class DocumentSelectionBuilder {
                     sb.append(" OR ");
                 }
                 sb.append('(');
-                String type = e.getStringAttribute("type");
+                String type = e.stringAttribute("type");
                 sb.append(type);
-                String selection = e.getStringAttribute("selection");
+                String selection = e.stringAttribute("selection");
                 if (selection != null) {
                     validateSelectionExpression(selection, type);
                     sb.append(" AND (");
@@ -66,7 +66,7 @@ public class DocumentSelectionBuilder {
                 sb.append(')');
             }
 
-            String globalSelection = elem.getStringAttribute("selection");
+            String globalSelection = elem.stringAttribute("selection");
             if (globalSelection != null) {
                 validateSelectionExpression(globalSelection, null);
                 StringBuilder global = new StringBuilder();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilder.java
index 9ef64e0b288..40bfa3241e2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomContentSearchBuilder.java
@@ -11,7 +11,7 @@ public class DomContentSearchBuilder {
 
     public static ContentSearch build(ModelElement contentXml) {
         ContentSearch.Builder builder = new ContentSearch.Builder();
-        ModelElement searchElement = contentXml.getChild("search");
+        ModelElement searchElement = contentXml.child("search");
         if (searchElement == null) {
             return builder.build();
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java
index 3d06d120b09..ffe07a00775 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomDispatchBuilder.java
@@ -17,7 +17,7 @@ public class DomDispatchBuilder {
 
     public static DispatchSpec build(ModelElement contentXml) {
         DispatchSpec.Builder builder = new DispatchSpec.Builder();
-        ModelElement dispatchElement = contentXml.getChild("dispatch");
+        ModelElement dispatchElement = contentXml.child("dispatch");
         if (dispatchElement == null) {
             return builder.build();
         }
@@ -48,6 +48,6 @@ public class DomDispatchBuilder {
     }
 
     private static DispatchSpec.Node buildNode(ModelElement nodeElement) {
-        return new DispatchSpec.Node(nodeElement.getIntegerAttribute("distribution-key"));
+        return new DispatchSpec.Node(nodeElement.integerAttribute("distribution-key"));
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
index 87412ad3596..61bf42af379 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
@@ -13,14 +13,14 @@ public class DomResourceLimitsBuilder {
 
     public static ResourceLimits build(ModelElement contentXml) {
         ResourceLimits.Builder builder = new ResourceLimits.Builder();
-        ModelElement resourceLimits = contentXml.getChild("resource-limits");
+        ModelElement resourceLimits = contentXml.child("resource-limits");
         if (resourceLimits == null) {
             return builder.build();
         }
-        if (resourceLimits.getChild("disk") != null) {
+        if (resourceLimits.child("disk") != null) {
             builder.setDiskLimit(resourceLimits.childAsDouble("disk"));
         }
-        if (resourceLimits.getChild("memory") != null) {
+        if (resourceLimits.child("memory") != null) {
             builder.setMemoryLimit(resourceLimits.childAsDouble("memory"));
         }
         return builder.build();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilder.java
index cfc110d7a13..64953deb36e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomSearchCoverageBuilder.java
@@ -11,11 +11,11 @@ public class DomSearchCoverageBuilder {
 
     public static SearchCoverage build(ModelElement contentXml) {
         SearchCoverage.Builder builder = new SearchCoverage.Builder();
-        ModelElement searchElement = contentXml.getChild("search");
+        ModelElement searchElement = contentXml.child("search");
         if (searchElement == null) {
             return builder.build();
         }
-        ModelElement coverageElement = searchElement.getChild("coverage");
+        ModelElement coverageElement = searchElement.child("coverage");
         if (coverageElement == null) {
             return builder.build();
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
index f470e75abf0..5f26b0628c2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
@@ -11,11 +11,11 @@ public class DomTuningDispatchBuilder {
 
     public static TuningDispatch build(ModelElement contentXml) {
         TuningDispatch.Builder builder = new TuningDispatch.Builder();
-        ModelElement tuningElement = contentXml.getChild("tuning");
+        ModelElement tuningElement = contentXml.child("tuning");
         if (tuningElement == null) {
             return builder.build();
         }
-        ModelElement dispatchElement = tuningElement.getChild("dispatch");
+        ModelElement dispatchElement = tuningElement.child("dispatch");
         if (dispatchElement == null) {
             return builder.build();
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
index 83e9553ebd5..e31e9703f11 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
@@ -9,15 +9,15 @@ import com.yahoo.vespa.model.content.engines.*;
  */
 public class EngineFactoryBuilder {
     public PersistenceEngine.PersistenceFactory build(ModelElement clusterElem, ContentCluster c) {
-        ModelElement persistence = clusterElem.getChild("engine");
+        ModelElement persistence = clusterElem.child("engine");
         if (persistence != null) {
-            if (c.getSearch().hasIndexedCluster() && persistence.getChild("proton") == null) {
+            if (c.getSearch().hasIndexedCluster() && persistence.child("proton") == null) {
                 throw new IllegalArgumentException("Persistence engine does not allow for indexed search. Please use <proton> as your engine.");
             }
 
-            if (persistence.getChild("proton") != null) {
+            if (persistence.child("proton") != null) {
                 return new ProtonEngine.Factory(c.getSearch());
-            } else if (persistence.getChild("dummy") != null) {
+            } else if (persistence.child("dummy") != null) {
                 return new com.yahoo.vespa.model.content.engines.DummyPersistence.Factory();
             }
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/GlobalDistributionBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/GlobalDistributionBuilder.java
index bdc15074258..1adb5d6d2d5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/GlobalDistributionBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/GlobalDistributionBuilder.java
@@ -36,11 +36,11 @@ public class GlobalDistributionBuilder {
     }
 
     private static boolean isGloballyDistributed(ModelElement e) {
-        return e.getBooleanAttribute("global", false);
+        return e.booleanAttribute("global", false);
     }
 
     private static String getDocumentName(ModelElement e) {
-        return e.getStringAttribute("type");
+        return e.stringAttribute("type");
     }
 
     private NewDocumentType getDocumentType(String name) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
index e1675007bbc..fe73fcc904b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java
@@ -14,9 +14,9 @@ public class RedundancyBuilder {
         Integer finalRedundancy = 3;
         Integer readyCopies = 2;
 
-        ModelElement redundancyElement = clusterXml.getChild("redundancy");
+        ModelElement redundancyElement = clusterXml.child("redundancy");
         if (redundancyElement != null) {
-            initialRedundancy = redundancyElement.getIntegerAttribute("reply-after");
+            initialRedundancy = redundancyElement.integerAttribute("reply-after");
             finalRedundancy = (int)redundancyElement.asLong();
 
             if (initialRedundancy == null) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
index 53220268bf8..44cb9cb96dd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/SearchDefinitionBuilder.java
@@ -21,7 +21,7 @@ public class SearchDefinitionBuilder {
 
         if (elem != null) {
             for (ModelElement e : elem.subElements("document")) {
-                String name = e.getStringAttribute("type"); // Schema-guaranteed presence
+                String name = e.stringAttribute("type"); // Schema-guaranteed presence
                 NewDocumentType documentType = repo.getDocumentType(name);
                 if (documentType != null) {
                     docTypes.put(documentType.getName(), documentType);