1 files changed, 33 insertions, 22 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 cd13305c009..344035745f8 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
@@ -1,8 +1,13 @@
 // 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.application.provider;
 
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.ApplicationName;
+import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.TenantName;
+
 /**
- * A class for holding values generated or computed during deployment
+ * Data generated or computed during deployment
  *
  * @author hmusum
  */
@@ -11,8 +16,7 @@ public class DeployData {
     /** Which user deployed */
     private final String deployedByUser;
 
-    /** Name of application given by user */
-    private final String applicationName;
+    private final ApplicationId applicationId;
 
     /** The absolute path to the directory holding the application */
     private final String deployedFromDir;
@@ -27,6 +31,7 @@ public class DeployData {
     private final long generation;
     private final long currentlyActiveGeneration;
 
+    // TODO: Remove after September 2019
     public DeployData(String deployedByUser,
                       String deployedFromDir,
                       String applicationName,
@@ -34,39 +39,45 @@ public class DeployData {
                       boolean internalRedeploy,
                       Long generation,
                       long currentlyActiveGeneration) {
+        this(deployedByUser,
+             deployedFromDir,
+             ApplicationId.from(TenantName.defaultName(), ApplicationName.from(applicationName), InstanceName.from("default")),
+             deployTimestamp,
+             internalRedeploy,
+             generation, currentlyActiveGeneration);
+    }
+
+    public DeployData(String deployedByUser,
+                      String deployedFromDir,
+                      ApplicationId applicationId,
+                      Long deployTimestamp,
+                      boolean internalRedeploy,
+                      Long generation,
+                      long currentlyActiveGeneration) {
         this.deployedByUser = deployedByUser;
         this.deployedFromDir = deployedFromDir;
-        this.applicationName = applicationName;
+        this.applicationId = applicationId;
         this.deployTimestamp = deployTimestamp;
         this.internalRedeploy = internalRedeploy;
         this.generation = generation;
         this.currentlyActiveGeneration = currentlyActiveGeneration;
     }
 
-    public String getDeployedByUser() {
-        return deployedByUser;
-    }
+    public String getDeployedByUser() { return deployedByUser; }
 
-    public String getDeployedFromDir() {
-        return deployedFromDir;
-    }
+    public String getDeployedFromDir() { return deployedFromDir; }
 
-    public long getDeployTimestamp() {
-        return deployTimestamp;
-    }
+    public long getDeployTimestamp() { return deployTimestamp; }
 
     public boolean isInternalRedeploy() { return internalRedeploy; }
 
-    public long getGeneration() {
-        return generation;
-    }
+    public long getGeneration() { return generation; }
 
-    public long getCurrentlyActiveGeneration() {
-        return currentlyActiveGeneration;
-    }
+    public long getCurrentlyActiveGeneration() { return currentlyActiveGeneration; }
 
-    public String getApplicationName() {
-        return applicationName;
-    }
+    public ApplicationId getApplicationId() { return applicationId; }
+
+    // TODO: remove after September 2019
+    public String getApplicationName() { return applicationId.application().toString(); }
 
 }