Use ApplicationVersion instead of String keys in ApplicationStore

1 files changed, 8 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
index dc6042e669b..e21f356dbf7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.integration;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationStore;
+import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,26 +13,27 @@ public class ApplicationStoreMock implements ApplicationStore {
     Map<String, byte[]> store = new HashMap<>();
 
     @Override
-    public byte[] getApplicationPackage(ApplicationId application, String applicationVersion) {
+    public byte[] getApplicationPackage(ApplicationId application, ApplicationVersion applicationVersion) {
         return store.get(path(application, applicationVersion));
     }
 
     @Override
-    public void putApplicationPackage(ApplicationId application, String applicationVersion, byte[] applicationPackage) {
+    public void putApplicationPackage(ApplicationId application, ApplicationVersion applicationVersion, byte[] applicationPackage) {
         store.put(path(application, applicationVersion), applicationPackage);
     }
 
     @Override
-    public void putTesterPackage(ApplicationId tester, String applicationVersion, byte[] testerPackage) {
+    public void putTesterPackage(ApplicationId tester, ApplicationVersion applicationVersion, byte[] testerPackage) {
         store.put(path(tester, applicationVersion), testerPackage);
     }
 
     @Override
-    public byte[] getTesterPackage(ApplicationId tester, String applicationVersion) {
+    public byte[] getTesterPackage(ApplicationId tester, ApplicationVersion applicationVersion) {
         return store.get(path(tester, applicationVersion));
     }
 
-    String path(ApplicationId tester, String applicationVersion) {
-        return tester.toString() + applicationVersion;
+    String path(ApplicationId tester, ApplicationVersion applicationVersion) {
+        return tester.toString() + applicationVersion.id();
     }
+
 }