Add option to get application package streams from ApplicationStore

1 files changed, 8 insertions, 7 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 8ed38761c95..e025a3bea4f 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
@@ -12,6 +12,8 @@ import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterId;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.time.Instant;
 import java.util.Map;
 import java.util.NavigableMap;
@@ -46,15 +48,14 @@ public class ApplicationStoreMock implements ApplicationStore {
     }
 
     @Override
-    public byte[] get(DeploymentId deploymentId, RevisionId revisionId) {
+    public InputStream stream(DeploymentId deploymentId, RevisionId revisionId) {
         if ( ! revisionId.isProduction())
-            return requireNonNull(devStore.get(deploymentId));
+            return new ByteArrayInputStream(devStore.get(deploymentId));
 
         TenantAndApplicationId tenantAndApplicationId = TenantAndApplicationId.from(deploymentId.applicationId());
         byte[] bytes = store.get(appId(tenantAndApplicationId.tenant(), tenantAndApplicationId.application())).get(revisionId);
-        if (bytes == null)
-            throw new NotExistsException("No " + revisionId + " found for " + tenantAndApplicationId);
-        return bytes;
+        if (bytes == null) throw new NotExistsException("No " + revisionId + " found for " + tenantAndApplicationId);
+        return new ByteArrayInputStream(bytes);
     }
 
     @Override
@@ -96,8 +97,8 @@ public class ApplicationStoreMock implements ApplicationStore {
     }
 
     @Override
-    public byte[] getTester(TenantName tenant, ApplicationName application, RevisionId revision) {
-        return requireNonNull(store.get(testerId(tenant, application)).get(revision));
+    public InputStream streamTester(TenantName tenant, ApplicationName application, RevisionId revision) {
+        return new ByteArrayInputStream(store.get(testerId(tenant, application)).get(revision));
     }