diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-07-13 13:34:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 13:34:19 +0200 |
| commit | 67cfa620dec1972a70dd7f0053c87861e6a3251f (patch) | |
| tree | 10da6318ffe269ee8c759321c23ffd936b7e832d /config-model/src/main | |
| parent | 9a922b741599c325a902ffb7bd5bc8cd0f99da5f (diff) | |
| parent | b6f8c1f30b7f1b6168385ce947176e44e18eec7a (diff) | |
Merge pull request #23340 from vespa-engine/hmusum/remove-unused-meta-data-field
Remove 'user' field in application metadata and add deprecations for … [run-systemtest]
Diffstat (limited to 'config-model/src/main')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java | 4 | ||||
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 4 |
2 files changed, 2 insertions, 6 deletions
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 c88c1cdfc48..9ee279c68d3 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 e69872ca1e7..4d45398de90 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 @@ -464,14 +464,12 @@ public abstract class ContainerCluster<CONTAINER extends Container> @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()); - } } /** |