From 76076fbf01b79e461230e2ed24b2fba343b088f2 Mon Sep 17 00:00:00 2001 From: Andreas Eriksen Date: Wed, 5 Oct 2022 12:41:49 +0200 Subject: remove unused member --- .../vespa/hosted/controller/archive/CuratorArchiveBucketDb.java | 5 ----- .../vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'controller-server') 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 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)); } } -- cgit v1.2.3