diff options
author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-10-05 13:19:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-05 13:19:53 +0200 |
commit | 6b8dc4a9cdbf2c01efce0ee918581cbc2679da33 (patch) | |
tree | fb5e0dda3404cd86826427e9d8ce13278228c6de | |
parent | 3533daf30eb3fd99a74a3c6c4edd895b8888fc72 (diff) | |
parent | 76076fbf01b79e461230e2ed24b2fba343b088f2 (diff) |
Merge pull request #24312 from vespa-engine/andreer/remove-unused-member
remove unused member
2 files changed, 1 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java index 0a0adcfc252..ac32fe5799d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java @@ -1,10 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.archive; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; -import com.yahoo.text.Text; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket; import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveService; @@ -14,7 +12,6 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; import java.util.Optional; -import java.util.OptionalInt; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -34,12 +31,10 @@ public class CuratorArchiveBucketDb { private final ArchiveService archiveService; private final CuratorDb curatorDb; - private final SystemName system; public CuratorArchiveBucketDb(Controller controller) { this.archiveService = controller.serviceRegistry().archiveService(); this.curatorDb = controller.curator(); - this.system = controller.zoneRegistry().system(); } public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant, boolean createIfMissing) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java index 788360996ff..eed4fd0245d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java @@ -73,7 +73,7 @@ public class ArchiveAccessMaintainer extends ControllerMaintainer { .filter(t -> t instanceof CloudTenant) .map(t -> (CloudTenant) t) .collect(Collectors.toUnmodifiableMap( - Tenant::name, cloudTenant -> cloudTenant.archiveAccess())); + Tenant::name, CloudTenant::archiveAccess)); } } |