summaryrefslogtreecommitdiffstats
path: root/controller-api/src
diff options
context:
space:
mode:
Diffstat (limited to 'controller-api/src')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java2
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java5
2 files changed, 3 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
index 46e7fb48553..c391ea8f8f2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
@@ -23,5 +23,5 @@ public interface ArchiveService {
boolean canAddTenantToBucket(ZoneId zoneId, ArchiveBucket bucket);
- URI bucketURI(ZoneId zoneId, String bucketName, TenantName tenantName);
+ URI bucketURI(ZoneId zoneId, String bucketName);
}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java
index a2847439ce7..b17e222f371 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java
@@ -10,7 +10,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
/**
* @author freva
@@ -40,7 +39,7 @@ public class MockArchiveService implements ArchiveService {
}
@Override
- public URI bucketURI(ZoneId zoneId, String bucketName, TenantName tenantName) {
- return URI.create(String.format("s3://%s/%s/", bucketName, tenantName.value()));
+ public URI bucketURI(ZoneId zoneId, String bucketName) {
+ return URI.create(String.format("s3://%s/", bucketName));
}
}