From b6f8c1f30b7f1b6168385ce947176e44e18eec7a Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 4 Jul 2022 13:09:10 +0200 Subject: Remove 'user' field in application metadata and add deprecations for usage User was set in older Vespa versions when deploying locally, not set anymore and should not be used. Deprecate and add TODOs to remove in Vespa 9 --- .../main/java/com/yahoo/config/model/test/MockApplicationPackage.java | 4 +--- .../main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'config-model/src/main') 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 abd7ba3be9f..9f54be0c762 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 @@ -46,7 +46,6 @@ import java.util.stream.Collectors; */ public class MockApplicationPackage implements ApplicationPackage { - public static final String DEPLOYED_BY_USER = "user"; public static final String APPLICATION_NAME = "application"; public static final long APPLICATION_GENERATION = 1L; public static final String MUSIC_SCHEMA = createSchema("music", "foo"); @@ -80,8 +79,7 @@ public class MockApplicationPackage implements ApplicationPackage { this.failOnValidateXml = failOnValidateXml; queryProfileRegistry = new QueryProfileXMLReader().read(asNamedReaderList(queryProfileType), asNamedReaderList(queryProfile)); - applicationMetaData = new ApplicationMetaData(DEPLOYED_BY_USER, - "dir", + applicationMetaData = new ApplicationMetaData("dir", 0L, false, ApplicationId.from(TenantName.defaultName(), diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 3d4b6dcbe7e..3dd9e9770c4 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -436,14 +436,12 @@ public abstract class ContainerCluster @Override public void getConfig(ApplicationMetadataConfig.Builder builder) { - if (applicationMetaData != null) { + if (applicationMetaData != null) builder.name(applicationMetaData.getApplicationId().application().value()). - user(applicationMetaData.getDeployedByUser()). path(applicationMetaData.getDeployPath()). timestamp(applicationMetaData.getDeployTimestamp()). checksum(applicationMetaData.getChecksum()). generation(applicationMetaData.getGeneration()); - } } /** -- cgit v1.2.3