Move group argument inside Capacity

3 files changed, 4 insertions, 519 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 0c061dd8222..4ccf34d30b0 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -606,521 +606,5 @@
       "public static final com.yahoo.config.application.api.ValidationOverrides empty",
       "public static final com.yahoo.config.application.api.ValidationOverrides all"
     ]
-  },
-  "com.yahoo.config.model.api.ApplicationInfo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.config.provision.ApplicationId, long, com.yahoo.config.model.api.Model)",
-      "public com.yahoo.config.provision.ApplicationId getApplicationId()",
-      "public long getGeneration()",
-      "public com.yahoo.config.model.api.Model getModel()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigChangeAction$Type": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.model.api.ConfigChangeAction$Type[] values()",
-      "public static com.yahoo.config.model.api.ConfigChangeAction$Type valueOf(java.lang.String)",
-      "public java.lang.String toString()"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.model.api.ConfigChangeAction$Type RESTART",
-      "public static final enum com.yahoo.config.model.api.ConfigChangeAction$Type REFEED"
-    ]
-  },
-  "com.yahoo.config.model.api.ConfigChangeAction": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.config.model.api.ConfigChangeAction$Type getType()",
-      "public abstract java.lang.String getMessage()",
-      "public abstract java.util.List getServices()",
-      "public abstract boolean allowed()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigChangeRefeedAction": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.model.api.ConfigChangeAction"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public com.yahoo.config.model.api.ConfigChangeAction$Type getType()",
-      "public java.lang.String name()",
-      "public abstract java.lang.String getDocumentType()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigChangeRestartAction": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.model.api.ConfigChangeAction"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public com.yahoo.config.model.api.ConfigChangeAction$Type getType()",
-      "public boolean allowed()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigDefinitionRepo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.util.Map getConfigDefinitions()",
-      "public abstract com.yahoo.vespa.config.buildergen.ConfigDefinition get(com.yahoo.vespa.config.ConfigDefinitionKey)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigDefinitionStore": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.vespa.config.ConfigDefinition getConfigDefinition(com.yahoo.vespa.config.ConfigDefinitionKey)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigModelPlugin": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ConfigServerSpec": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.String getHostName()",
-      "public abstract int getConfigServerPort()",
-      "public int getHttpPort()",
-      "public abstract int getZooKeeperPort()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ContainerEndpoint": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.util.List)",
-      "public java.lang.String clusterId()",
-      "public java.util.List names()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.EndpointCertificateMetadata": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String, int)",
-      "public java.lang.String keyName()",
-      "public java.lang.String certName()",
-      "public int version()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.EndpointCertificateSecrets": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public java.lang.String certificate()",
-      "public java.lang.String key()",
-      "public boolean isMissing()"
-    ],
-    "fields": [
-      "public static final com.yahoo.config.model.api.EndpointCertificateSecrets MISSING"
-    ]
-  },
-  "com.yahoo.config.model.api.FileDistribution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void startDownload(java.lang.String, int, java.util.Set)",
-      "public abstract java.io.File getFileReferencesDir()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.HostInfo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.util.Collection)",
-      "public java.lang.String getHostname()",
-      "public java.util.Collection getServices()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.HostProvisioner": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.config.provision.HostSpec allocateHost(java.lang.String)",
-      "public abstract java.util.List prepare(com.yahoo.config.provision.ClusterSpec, com.yahoo.config.provision.Capacity, int, com.yahoo.config.provision.ProvisionLogger)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.Model": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.vespa.config.ConfigPayload getConfig(com.yahoo.vespa.config.ConfigKey, com.yahoo.vespa.config.buildergen.ConfigDefinition)",
-      "public abstract java.util.Set allConfigsProduced()",
-      "public abstract java.util.Collection getHosts()",
-      "public abstract java.util.Set allConfigIds()",
-      "public abstract void distributeFiles(com.yahoo.config.model.api.FileDistribution)",
-      "public abstract java.util.Set fileReferences()",
-      "public abstract com.yahoo.config.provision.AllocatedHosts allocatedHosts()",
-      "public boolean allowModelVersionMismatch(java.time.Instant)",
-      "public boolean skipOldConfigModels(java.time.Instant)",
-      "public com.yahoo.component.Version version()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ModelContext$Properties": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract boolean multitenant()",
-      "public abstract com.yahoo.config.provision.ApplicationId applicationId()",
-      "public abstract java.util.List configServerSpecs()",
-      "public abstract com.yahoo.config.provision.HostName loadBalancerName()",
-      "public abstract java.net.URI ztsUrl()",
-      "public abstract java.lang.String athenzDnsSuffix()",
-      "public abstract boolean hostedVespa()",
-      "public abstract com.yahoo.config.provision.Zone zone()",
-      "public abstract java.util.Set endpoints()",
-      "public abstract boolean isBootstrap()",
-      "public abstract boolean isFirstTimeDeployment()",
-      "public boolean useDedicatedNodeForLogserver()",
-      "public abstract boolean useAdaptiveDispatch()",
-      "public java.util.Optional tlsSecrets()",
-      "public java.util.Optional endpointCertificateSecrets()",
-      "public abstract double defaultTermwiseLimit()",
-      "public abstract boolean useBucketSpaceMetric()",
-      "public boolean useNewAthenzFilter()",
-      "public boolean usePhraseSegmenting()",
-      "public java.lang.String proxyProtocol()",
-      "public java.util.Optional athenzDomain()",
-      "public boolean useDedicatedNodesWhenUnspecified()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ModelContext": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.config.application.api.ApplicationPackage applicationPackage()",
-      "public abstract java.util.Optional previousModel()",
-      "public abstract java.util.Optional permanentApplicationPackage()",
-      "public abstract java.util.Optional hostProvisioner()",
-      "public abstract com.yahoo.config.application.api.DeployLogger deployLogger()",
-      "public abstract com.yahoo.config.model.api.ConfigDefinitionRepo configDefinitionRepo()",
-      "public abstract com.yahoo.config.application.api.FileRegistry getFileRegistry()",
-      "public abstract com.yahoo.config.model.api.ModelContext$Properties properties()",
-      "public java.util.Optional appDir()",
-      "public java.util.Optional wantedDockerImageRepository()",
-      "public abstract com.yahoo.component.Version modelVespaVersion()",
-      "public abstract com.yahoo.component.Version wantedNodeVespaVersion()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ModelCreateResult": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.config.model.api.Model, java.util.List)",
-      "public com.yahoo.config.model.api.Model getModel()",
-      "public java.util.List getConfigChangeActions()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ModelFactory": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.component.Version version()",
-      "public abstract com.yahoo.config.model.api.Model createModel(com.yahoo.config.model.api.ModelContext)",
-      "public abstract com.yahoo.config.model.api.ModelCreateResult createAndValidateModel(com.yahoo.config.model.api.ModelContext, com.yahoo.config.model.api.ValidationParameters)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ModelState": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.config.model.api.Model getModel()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.PortInfo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(int, java.util.Collection)",
-      "public int getPort()",
-      "public java.util.Collection getTags()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.ServiceInfo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String, java.util.Collection, java.util.Map, java.lang.String, java.lang.String)",
-      "public java.lang.String getServiceName()",
-      "public java.lang.String getConfigId()",
-      "public java.lang.String getServiceType()",
-      "public java.util.Optional getProperty(java.lang.String)",
-      "public java.util.Collection getPorts()",
-      "public java.lang.String getHostName()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.SuperModel": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(java.util.Map, boolean)",
-      "public java.util.Map getModelsPerTenant()",
-      "public java.util.Map getModels()",
-      "public boolean isComplete()",
-      "public java.util.List getAllApplicationInfos()",
-      "public java.util.Optional getApplicationInfo(com.yahoo.config.provision.ApplicationId)",
-      "public com.yahoo.config.model.api.SuperModel cloneAndSetApplication(com.yahoo.config.model.api.ApplicationInfo)",
-      "public com.yahoo.config.model.api.SuperModel cloneAndRemoveApplication(com.yahoo.config.provision.ApplicationId)",
-      "public com.yahoo.config.model.api.SuperModel cloneAsComplete()",
-      "public java.util.Set getApplicationIds()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.SuperModelListener": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void applicationActivated(com.yahoo.config.model.api.SuperModel, com.yahoo.config.model.api.ApplicationInfo)",
-      "public abstract void applicationRemoved(com.yahoo.config.model.api.SuperModel, com.yahoo.config.provision.ApplicationId)",
-      "public abstract void notifyOfCompleteness(com.yahoo.config.model.api.SuperModel)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.SuperModelProvider": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void registerListener(com.yahoo.config.model.api.SuperModelListener)",
-      "public abstract com.yahoo.config.model.api.SuperModel getSuperModel()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.model.api.TlsSecrets": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public void <init>(com.yahoo.config.model.api.EndpointCertificateSecrets)",
-      "public java.lang.String certificate()",
-      "public java.lang.String key()",
-      "public boolean isMissing()"
-    ],
-    "fields": [
-      "public static final com.yahoo.config.model.api.TlsSecrets MISSING"
-    ]
-  },
-  "com.yahoo.config.model.api.ValidationParameters$CheckRouting": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.model.api.ValidationParameters$CheckRouting[] values()",
-      "public static com.yahoo.config.model.api.ValidationParameters$CheckRouting valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$CheckRouting TRUE",
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$CheckRouting FALSE"
-    ]
-  },
-  "com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange[] values()",
-      "public static com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange TRUE",
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange FALSE"
-    ]
-  },
-  "com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors[] values()",
-      "public static com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors TRUE",
-      "public static final enum com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors FALSE"
-    ]
-  },
-  "com.yahoo.config.model.api.ValidationParameters": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors)",
-      "public void <init>(com.yahoo.config.model.api.ValidationParameters$CheckRouting)",
-      "public void <init>(com.yahoo.config.model.api.ValidationParameters$IgnoreValidationErrors, com.yahoo.config.model.api.ValidationParameters$FailOnIncompatibleChange, com.yahoo.config.model.api.ValidationParameters$CheckRouting)",
-      "public boolean ignoreValidationErrors()",
-      "public boolean failOnIncompatibleChanges()",
-      "public boolean checkRouting()"
-    ],
-    "fields": []
   }
 }
\ No newline at end of file
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
index bf58000dd36..4edf3c455d0 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
@@ -18,15 +18,17 @@ public interface HostProvisioner {
     // TODO: Remove
     HostSpec allocateHost(String alias);
 
+    @Deprecated // TODO: Remove after April 2020
+    List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger);
+
     /**
      * Prepares allocation of a set of hosts with a given type, common id and the amount.
      *
      * @param  cluster the cluster to allocate nodes to
      * @param  capacity the capacity describing the capacity requested
-     * @param  groups the number of groups to divide the nodes into
      * @param  logger a logger to which messages to the deployer may be written
      * @return the specification of the allocated hosts
      */
-    List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger);
+    List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger);
 
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/package-info.java b/config-model-api/src/main/java/com/yahoo/config/model/api/package-info.java
index a3478026520..689e2524dde 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/package-info.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/package-info.java
@@ -1,6 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-@PublicApi // Not really "public", only annotated as such to enable the ABI checker plugin
 package com.yahoo.config.model.api;
 
 import com.yahoo.osgi.annotation.ExportPackage;