From 10037d6e3b9ce49c1186dba8184620764afce2d2 Mon Sep 17 00:00:00 2001 From: jonmv Date: Wed, 11 Jan 2023 11:21:28 +0100 Subject: Remove redundant tags wiring --- .../com/yahoo/config/model/application/provider/DeployData.java | 7 ------- .../config/model/application/provider/FilesApplicationPackage.java | 2 -- 2 files changed, 9 deletions(-) (limited to 'config-application-package/src/main/java/com/yahoo') diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java index c3e9b99f562..de4ea62f671 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java @@ -2,7 +2,6 @@ package com.yahoo.config.model.application.provider; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.Tags; import java.util.Set; @@ -15,8 +14,6 @@ public class DeployData { private final ApplicationId applicationId; - private final Tags tags; - /** The absolute path to the directory holding the application */ private final String deployedFromDir; @@ -32,14 +29,12 @@ public class DeployData { public DeployData(String deployedFromDir, ApplicationId applicationId, - Tags tags, Long deployTimestamp, boolean internalRedeploy, Long generation, long currentlyActiveGeneration) { this.deployedFromDir = deployedFromDir; this.applicationId = applicationId; - this.tags = tags; this.deployTimestamp = deployTimestamp; this.internalRedeploy = internalRedeploy; this.generation = generation; @@ -58,6 +53,4 @@ public class DeployData { public ApplicationId getApplicationId() { return applicationId; } - public Tags getTags() { return tags; } - } diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 2d91f811e8b..c095b9ad586 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -142,7 +142,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { deployData.getDeployTimestamp(), deployData.isInternalRedeploy(), deployData.getApplicationId(), - deployData.getTags(), computeCheckSum(appDir), deployData.getGeneration(), deployData.getCurrentlyActiveGeneration()); @@ -489,7 +488,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { ApplicationId.from(TenantName.defaultName(), ApplicationName.from(originalAppDir), InstanceName.defaultName()), - Tags.empty(), "", 0L, 0L); -- cgit v1.2.3