Merge pull request #7832 from vespa-engine/bratseth/deprecate-provisioning-version

Deprecate com.yahoo.config.provision.Version

5 files changed, 36 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index da79e34b3ad..af9eba92a98 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -1,10 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model;
 
-import com.yahoo.cloud.config.*;
+import com.yahoo.cloud.config.ApplicationIdConfig;
+import com.yahoo.cloud.config.ClusterListConfig;
+import com.yahoo.cloud.config.ModelConfig;
+import com.yahoo.cloud.config.SlobroksConfig;
+import com.yahoo.cloud.config.ZookeepersConfig;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Version;
+import com.yahoo.component.Version;
 import com.yahoo.vespa.config.content.LoadTypeConfig;
 import com.yahoo.cloud.config.ModelConfig.Hosts;
 import com.yahoo.cloud.config.ModelConfig.Hosts.Services;
@@ -18,7 +22,12 @@ import com.yahoo.messagebus.MessagebusConfig;
 import com.yahoo.vespa.configmodel.producers.DocumentManager;
 import com.yahoo.vespa.configmodel.producers.DocumentTypes;
 import com.yahoo.vespa.documentmodel.DocumentModel;
-import com.yahoo.vespa.model.*;
+import com.yahoo.vespa.model.ConfigProducer;
+import com.yahoo.vespa.model.HostResource;
+import com.yahoo.vespa.model.HostSystem;
+import com.yahoo.vespa.model.PortsMeta;
+import com.yahoo.vespa.model.Service;
+import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.clients.Clients;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
@@ -204,7 +213,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
 
     @Override
     public void getConfig(ModelConfig.Builder builder) {
-        builder.vespaVersion(vespaVersion.toSerializedForm());
+        builder.vespaVersion(vespaVersion.toFullString());
         for (HostResource modelHost : getHostSystem().getHosts()) {
             builder.hosts(new Hosts.Builder()
                     .name(modelHost.getHostname())
@@ -279,4 +288,5 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
         builder.application(applicationId.application().value());
         builder.instance(applicationId.instance().value());
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
index 9d9a19bfbd6..626b5bfbf5c 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
@@ -4,7 +4,7 @@ package com.yahoo.config.model.deploy;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostName;
-import com.yahoo.config.provision.Version;
+import com.yahoo.component.Version;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -104,7 +104,7 @@ public class DeployProperties {
         private URI ztsUrl;
         private String athenzDnsSuffix;
         private boolean hostedVespa = false;
-        private Version vespaVersion = Version.fromIntValues(1, 0, 0);
+        private Version vespaVersion = new Version(1, 0, 0);
         private boolean isBootstrap = false;
         private boolean isFirstTimeDeployment = false;
         private boolean useDedicatedNodeForLogserver = false;
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 4442b42bb88..ca6bdee82cf 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -5,13 +5,14 @@ import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.application.api.ComponentInfo;
 import com.yahoo.config.application.api.UnparsedConfigDefinition;
 import com.yahoo.config.application.api.ApplicationFile;
-import com.yahoo.config.provision.Version;
+import com.yahoo.component.Version;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.io.reader.NamedReader;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
-import com.yahoo.searchdefinition.*;
+import com.yahoo.searchdefinition.RankProfileRegistry;
+import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.config.application.api.ApplicationPackage;
@@ -25,7 +26,13 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.UncheckedIOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 07ebece3ea9..d3f4a122b1e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -20,7 +20,7 @@ import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesVal
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.deploy.DeployProperties;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.provision.Version;
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.VespaVersion;
 import com.yahoo.vespa.model.application.validation.Validation;
@@ -54,7 +54,7 @@ public class VespaModelFactory implements ModelFactory {
     public VespaModelFactory(ComponentRegistry<ConfigModelPlugin> pluginRegistry,
                              ComponentRegistry<MlModelImporter> modelImporters,
                              Zone zone) {
-        this.version = Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro);
+        this.version = new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro);
         List<ConfigModelBuilder> modelBuilders = new ArrayList<>();
         for (ConfigModelPlugin plugin : pluginRegistry.allComponents()) {
             if (plugin instanceof ConfigModelBuilder) {
@@ -71,7 +71,7 @@ public class VespaModelFactory implements ModelFactory {
         this(configModelRegistry, Clock.systemUTC());
     }
     public VespaModelFactory(ConfigModelRegistry configModelRegistry, Clock clock) {
-        this(Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry, clock);
+        this(new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry, clock);
     }
     public VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock) {
         this.version = version;
@@ -88,7 +88,7 @@ public class VespaModelFactory implements ModelFactory {
 
     /** Returns the version this model is build for */
     @Override
-    public Version getVersion() { return version; }
+    public Version version() { return version; }
 
     @Override
     public Model createModel(ModelContext modelContext) {
@@ -157,7 +157,7 @@ public class VespaModelFactory implements ModelFactory {
                 .athenzDnsSuffix(properties.athenzDnsSuffix())
                 .multitenant(properties.multitenant())
                 .hostedVespa(properties.hostedVespa())
-                .vespaVersion(getVersion())
+                .vespaVersion(version())
                 .isBootstrap(properties.isBootstrap())
                 .isFirstTimeDeployment(properties.isFirstTimeDeployment())
                 .useDedicatedNodeForLogserver(properties.useDedicatedNodeForLogserver())
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index a6d3809ff64..7e98804370f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -235,10 +235,11 @@ public class VespaDomBuilder extends VespaModelBuilder {
 
         @Override
         protected ApplicationConfigProducerRoot doBuild(DeployState deployState, AbstractConfigProducer parent, Element producerSpec) {
-            ApplicationConfigProducerRoot root = new ApplicationConfigProducerRoot(parent, name,
-                    deployState.getDocumentModel(),
-                    deployState.getProperties().vespaVersion(),
-                    deployState.getProperties().applicationId());
+            ApplicationConfigProducerRoot root = new ApplicationConfigProducerRoot(parent,
+                                                                                   name,
+                                                                                   deployState.getDocumentModel(),
+                                                                                   deployState.getProperties().vespaVersion(),
+                                                                                   deployState.getProperties().applicationId());
             root.setHostSystem(new HostSystem(root, "hosts", deployState.getProvisioner(), deployState.getDeployLogger()));
             new Client(root);
             return root;