diff options
Diffstat (limited to 'config-application-package')
2 files changed, 13 insertions, 11 deletions
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 b21f8677984..279af646a8c 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 @@ -10,9 +10,6 @@ import com.yahoo.config.provision.ApplicationId; */ public class DeployData { - /** Which user deployed */ - private final String deployedByUser; - private final ApplicationId applicationId; /** The absolute path to the directory holding the application */ @@ -28,14 +25,23 @@ public class DeployData { private final long generation; private final long currentlyActiveGeneration; - public DeployData(String deployedByUser, + // TODO: Remove when oldest version in use is 8.13 + public DeployData(String ignored, String deployedFromDir, ApplicationId applicationId, Long deployTimestamp, boolean internalRedeploy, Long generation, long currentlyActiveGeneration) { - this.deployedByUser = deployedByUser; + this(deployedFromDir, applicationId, deployTimestamp, internalRedeploy, generation, currentlyActiveGeneration); + } + + public DeployData(String deployedFromDir, + ApplicationId applicationId, + Long deployTimestamp, + boolean internalRedeploy, + Long generation, + long currentlyActiveGeneration) { this.deployedFromDir = deployedFromDir; this.applicationId = applicationId; this.deployTimestamp = deployTimestamp; @@ -44,8 +50,6 @@ public class DeployData { this.currentlyActiveGeneration = currentlyActiveGeneration; } - public String getDeployedByUser() { return deployedByUser; } - public String getDeployedFromDir() { return deployedFromDir; } public long getDeployTimestamp() { return deployTimestamp; } 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 826cf85798a..7b483d0603c 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 @@ -134,8 +134,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { } private static ApplicationMetaData metaDataFromDeployData(File appDir, DeployData deployData) { - return new ApplicationMetaData(deployData.getDeployedByUser(), - deployData.getDeployedFromDir(), + return new ApplicationMetaData(deployData.getDeployedFromDir(), deployData.getDeployTimestamp(), deployData.isInternalRedeploy(), deployData.getApplicationId(), @@ -480,7 +479,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { private static ApplicationMetaData readMetaData(File appDir) { String originalAppDir = preprocessed.equals(appDir.getName()) ? appDir.getParentFile().getName() : appDir.getName(); ApplicationMetaData defaultMetaData = new ApplicationMetaData("n/a", - "n/a", 0L, false, ApplicationId.from(TenantName.defaultName(), @@ -573,7 +571,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { } @Override - public void writeMetaData() throws IOException { + public void writeMetaData() { File metaFile = applicationFile(appDir, META_FILE_NAME); IOUtils.writeFile(metaFile, metaData.asJsonBytes()); } |