Merge pull request #9586 from vespa-engine/bratseth/default-node-capacity

Bratseth/default node capacity

5 files changed, 11 insertions, 44 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
index 63b11f9da75..b0bc376de81 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java
@@ -53,7 +53,7 @@ public class DocumentReferenceResolver {
         if (search == null) {
             throw new IllegalArgumentException(
                     String.format("The field '%s' is an invalid document reference. " +
-                            "Could not find document with '%s' in any search definitions", field.getName(), targetDocumentName));
+                                  "Could not find document with '%s' in any search definitions", field.getName(), targetDocumentName));
         }
         return new DocumentReference(field, search);
     }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java
index 692fe7666d4..414a605c621 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java
@@ -28,14 +28,15 @@ import java.util.Optional;
 import java.util.Set;
 
 /**
-   <p>A document definition is a list of fields. Documents may inherit other documents,
-   implicitly acquiring their fields as it's own. If a document is not set to inherit
-   any document, it will always inherit the document "document.0".</p>
-
-   @author  <a href="thomasg@yahoo-inc.com">Thomas Gundersen</a>
-   @author  bratseth
-*/
+ * A document definition is a list of fields. Documents may inherit other documents,
+ * implicitly acquiring their fields as it's own. If a document is not set to inherit
+ * any document, it will always inherit the document "document.0".
+ *
+ * @author  Thomas Gundersen
+ * @author  bratseth
+ */
 public class SDDocumentType implements Cloneable, Serializable {
+
     public static final SDDocumentType VESPA_DOCUMENT;
     private Map<DataTypeName, SDDocumentType> inheritedTypes = new HashMap<>();
     private Map<NewDocumentType.Name, SDDocumentType> ownedTypes = new HashMap<>();
@@ -315,18 +316,12 @@ public class SDDocumentType implements Cloneable, Serializable {
         return docType;
     }
     
-    /**
-     * The field sets defined for this type and its {@link Search}
-     * @return fieldsets 
-     */
+    /** The field sets defined for this type and its {@link Search} */
     public FieldSets getFieldSets() {
         return fieldSets;
     }
 
-    /**
-     * Sets the field sets for this
-     * @param fieldSets field sets to set for this object
-     */
+    /** Sets the field sets for this */
     public void setFieldSets(FieldSets fieldSets) {
         this.fieldSets = fieldSets;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 6c7da668e93..2eff081f42d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -117,18 +117,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.system().isPresent()) {
             builder.environment(options.system().get());
         }
-        if (options.defaultFlavor().isPresent()) {
-            builder.defaultFlavor(options.defaultFlavor().get());
-        }
-        if (options.defaultAdminFlavor().isPresent()) {
-            builder.defaultAdminFlavor(options.defaultAdminFlavor().get());
-        }
-        if (options.defaultContainerFlavor().isPresent()) {
-            builder.defaultContainerFlavor(options.defaultContainerFlavor().get());
-        }
-        if (options.defaultContentFlavor().isPresent()) {
-            builder.defaultContentFlavor(options.defaultContentFlavor().get());
-        }
 
         builder.serverId(HostName.getLocalhost());
         if (!containerCluster.getHttp().getHttpServer().getConnectorFactories().isEmpty()) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index eafff2374cb..2162550cadf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -36,10 +36,6 @@ public interface CloudConfigOptions {
     Optional<String> environment();
     Optional<String> region();
     Optional<String> system();
-    Optional<String> defaultFlavor();
-    Optional<String> defaultAdminFlavor();
-    Optional<String> defaultContainerFlavor();
-    Optional<String> defaultContentFlavor();
     Optional<Boolean> useVespaVersionInRequest();
     Optional<Integer> numParallelTenantLoaders();
     Optional<String> loadBalancerAddress();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 07422b1f215..ec01716d9c9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -99,18 +99,6 @@ public class TestOptions implements CloudConfigOptions {
     public Optional<String> system() { return Optional.empty(); }
 
     @Override
-    public Optional<String> defaultFlavor() { return defaultFlavor; }
-
-    @Override
-    public Optional<String> defaultAdminFlavor() { return defaultAdminFlavor; }
-
-    @Override
-    public Optional<String> defaultContainerFlavor() { return defaultContainerFlavor; }
-
-    @Override
-    public Optional<String> defaultContentFlavor() { return defaultContentFlavor; }
-
-    @Override
     public Optional<Boolean> useVespaVersionInRequest() { return useVespaVersionInRequest; }
 
     @Override