Remove unnecessary interface and package export

6 files changed, 7 insertions, 34 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
deleted file mode 100644
index 91c7cd68ea2..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2021 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.archive;
-
-import com.yahoo.config.provision.TenantName;
-import com.yahoo.config.provision.zone.ZoneId;
-
-import java.net.URI;
-import java.util.Optional;
-import java.util.Set;
-
-public interface ArchiveBucketDb {
-
-    Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant);
-
-    Set<ArchiveBucket> buckets(ZoneId zoneId);
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
index 067d05cd14e..2fa68f1f39d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
@@ -5,4 +5,4 @@
 @ExportPackage
 package com.yahoo.vespa.hosted.controller.api.integration.archive;
 
-import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
+import com.yahoo.osgi.annotation.ExportPackage;
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 8bc2271825b..39d1fe1da57 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,7 +1,6 @@
 // Copyright 2021 Oath Inc. 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.google.inject.Inject;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.flags.FetchVector;
@@ -9,10 +8,8 @@ import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.StringFlag;
 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.ArchiveBucketDb;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveService;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
-import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -27,7 +24,7 @@ import java.util.stream.Collectors;
  *
  * @author andreer
  */
-public class CuratorArchiveBucketDb implements ArchiveBucketDb {
+public class CuratorArchiveBucketDb {
 
     /**
      * Due to policy limits, we can't put data for more than this many tenants in a bucket.
@@ -47,14 +44,12 @@ public class CuratorArchiveBucketDb implements ArchiveBucketDb {
     private final CuratorDb curatorDb;
     private final StringFlag bucketNameFlag;
 
-    @Inject
     public CuratorArchiveBucketDb(Controller controller) {
         this.archiveService = controller.serviceRegistry().archiveService();
         this.curatorDb = controller.curator();
         this.bucketNameFlag = Flags.SYNC_HOST_LOGS_TO_S3_BUCKET.bindTo(controller.flagSource());
     }
 
-    @Override
     public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant) {
         String bucketName = bucketNameFlag
                 .with(FetchVector.Dimension.ZONE_ID, zoneId.value())
@@ -106,12 +101,10 @@ public class CuratorArchiveBucketDb implements ArchiveBucketDb {
         }
     }
 
-    @Override
     public Set<ArchiveBucket> buckets(ZoneId zoneId) {
         return curatorDb.readArchiveBuckets(zoneId);
     }
 
-    @NotNull
     private Optional<String> findAndUpdateArchiveUriCache(ZoneId zoneId, TenantName tenant, Set<ArchiveBucket> zoneBuckets) {
         Optional<String> bucketName = zoneBuckets.stream()
                 .filter(bucket -> bucket.tenants().contains(tenant))
@@ -132,4 +125,5 @@ public class CuratorArchiveBucketDb implements ArchiveBucketDb {
                 .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
         archiveUriCache.put(zoneId, bucketNameByTenant);
     }
+
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/package-info.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/package-info.java
deleted file mode 100644
index c93eb56d294..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2021 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.vespa.hosted.controller.archive;
-
-import com.yahoo.osgi.annotation.ExportPackage;
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 97385da468b..1a9889284e1 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
@@ -4,9 +4,9 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 import com.google.common.collect.Maps;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.vespa.hosted.controller.Controller;
-import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucketDb;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveService;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
+import com.yahoo.vespa.hosted.controller.archive.CuratorArchiveBucketDb;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 
@@ -23,7 +23,7 @@ public class ArchiveAccessMaintainer extends ControllerMaintainer {
 
     private static final String bucketCountMetricName = "archive.bucketCount";
 
-    private final ArchiveBucketDb archiveBucketDb;
+    private final CuratorArchiveBucketDb archiveBucketDb;
     private final ArchiveService archiveService;
     private final ZoneRegistry zoneRegistry;
     private final Metric metric;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
index faa4813e6b0..d2141b097b3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdater.java
@@ -6,9 +6,9 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.ApplicationController;
 import com.yahoo.vespa.hosted.controller.Controller;
-import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucketDb;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
 import com.yahoo.vespa.hosted.controller.application.SystemApplication;
+import com.yahoo.vespa.hosted.controller.archive.CuratorArchiveBucketDb;
 
 import java.net.URI;
 import java.time.Duration;
@@ -28,7 +28,7 @@ public class ArchiveUriUpdater extends ControllerMaintainer {
 
     private final ApplicationController applications;
     private final NodeRepository nodeRepository;
-    private final ArchiveBucketDb archiveBucketDb;
+    private final CuratorArchiveBucketDb archiveBucketDb;
 
     public ArchiveUriUpdater(Controller controller, Duration duration) {
         super(controller, duration, ArchiveUriUpdater.class.getSimpleName(), SystemName.all());