Rename ArchiveUris -> ArchiveUriManager

6 files changed, 21 insertions, 20 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index fd75644d914..510c4041efb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -28,7 +28,7 @@ import com.yahoo.vespa.hosted.provision.persistence.CuratorDb;
 import com.yahoo.vespa.hosted.provision.persistence.DnsNameResolver;
 import com.yahoo.vespa.hosted.provision.persistence.JobControlFlags;
 import com.yahoo.vespa.hosted.provision.persistence.NameResolver;
-import com.yahoo.vespa.hosted.provision.provisioning.ArchiveUris;
+import com.yahoo.vespa.hosted.provision.archive.ArchiveUriManager;
 import com.yahoo.vespa.hosted.provision.provisioning.ContainerImages;
 import com.yahoo.vespa.hosted.provision.provisioning.FirmwareChecks;
 import com.yahoo.vespa.hosted.provision.provisioning.HostResourcesCalculator;
@@ -57,7 +57,7 @@ public class NodeRepository extends AbstractComponent {
     private final InfrastructureVersions infrastructureVersions;
     private final FirmwareChecks firmwareChecks;
     private final ContainerImages containerImages;
-    private final ArchiveUris archiveUris;
+    private final ArchiveUriManager archiveUriManager;
     private final JobControl jobControl;
     private final Applications applications;
     private final LoadBalancers loadBalancers;
@@ -134,7 +134,7 @@ public class NodeRepository extends AbstractComponent {
         this.infrastructureVersions = new InfrastructureVersions(db);
         this.firmwareChecks = new FirmwareChecks(db, clock);
         this.containerImages = new ContainerImages(containerImage, tenantContainerImage, tenantGpuContainerImage);
-        this.archiveUris = new ArchiveUris(db, zone);
+        this.archiveUriManager = new ArchiveUriManager(db, zone);
         this.jobControl = new JobControl(new JobControlFlags(db, flagSource));
         this.loadBalancers = new LoadBalancers(db);
         this.metricsDb = metricsDb;
@@ -166,7 +166,7 @@ public class NodeRepository extends AbstractComponent {
     public ContainerImages containerImages() { return containerImages; }
 
     /** Returns the archive URIs to use for nodes in this. */
-    public ArchiveUris archiveUris() { return archiveUris; }
+    public ArchiveUriManager archiveUriManager() { return archiveUriManager; }
 
     /** Returns the status of maintenance jobs managed by this. */
     public JobControl jobControl() { return jobControl; }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ArchiveUris.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java
index 285365a9c6d..722fd0bac56 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ArchiveUris.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java
@@ -1,5 +1,5 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.provision.provisioning;
+package com.yahoo.vespa.hosted.provision.archive;
 
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
@@ -23,9 +23,9 @@ import java.util.regex.Pattern;
  *
  * @author freva
  */
-public class ArchiveUris {
+public class ArchiveUriManager {
 
-    private static final Logger log = Logger.getLogger(ArchiveUris.class.getName());
+    private static final Logger log = Logger.getLogger(ArchiveUriManager.class.getName());
     private static final Pattern validUriPattern = Pattern.compile("[a-z0-9]+://(?:(?:[a-z0-9]+(?:[-_][a-z0-9.]+)*)+/)+");
     private static final Duration cacheTtl = Duration.ofMinutes(1);
 
@@ -33,7 +33,7 @@ public class ArchiveUris {
     private final CachedSupplier<Map<TenantName, String>> archiveUris;
     private final Zone zone;
 
-    public ArchiveUris(CuratorDb db, Zone zone) {
+    public ArchiveUriManager(CuratorDb db, Zone zone) {
         this.db = db;
         this.archiveUris = new CachedSupplier<>(db::readArchiveUris, cacheTtl);
         this.zone = zone;
@@ -76,7 +76,7 @@ public class ArchiveUris {
             Map<TenantName, String> archiveUris = new TreeMap<>(db.readArchiveUris());
             if (Optional.ofNullable(archiveUris.get(tenant)).equals(archiveUri)) return; // No change
 
-            archiveUri.map(ArchiveUris::normalizeUri).ifPresentOrElse(uri -> archiveUris.put(tenant, uri),
+            archiveUri.map(ArchiveUriManager::normalizeUri).ifPresentOrElse(uri -> archiveUris.put(tenant, uri),
                                                                       () -> archiveUris.remove(tenant));
             db.writeArchiveUris(archiveUris);
             this.archiveUris.invalidate(); // Throw away current cache
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ArchiveResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ArchiveResponse.java
index 3cff3c5e05f..7c844b983d9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ArchiveResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ArchiveResponse.java
@@ -14,7 +14,7 @@ public class ArchiveResponse extends SlimeJsonResponse {
 
     public ArchiveResponse(NodeRepository nodeRepository) {
         Cursor archivesArray = slime.setObject().setArray("archives");
-        nodeRepository.archiveUris().getArchiveUris().forEach((tenant, uri) -> {
+        nodeRepository.archiveUriManager().getArchiveUris().forEach((tenant, uri) -> {
             Cursor archiveObject = archivesArray.addObject();
             archiveObject.setString("tenant", tenant.value());
             archiveObject.setString("uri", uri);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index f98c4ba1199..0e33e3461e7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -184,7 +184,7 @@ class NodesResponse extends SlimeJsonResponse {
         node.reports().toSlime(object, "reports");
         node.modelName().ifPresent(modelName -> object.setString("modelName", modelName));
         node.switchHostname().ifPresent(switchHostname -> object.setString("switchHostname", switchHostname));
-        nodeRepository.archiveUris().archiveUriFor(node).ifPresent(uri -> object.setString("archiveUri", uri));
+        nodeRepository.archiveUriManager().archiveUriFor(node).ifPresent(uri -> object.setString("archiveUri", uri));
         trustedCertsToSlime(node.trustedCertificates(), object);
         if (!node.cloudAccount().isUnspecified()) {
             object.setString("cloudAccount", node.cloudAccount().value());
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index dadef5ce243..8de67e44700 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -423,7 +423,7 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler {
     }
 
     private HttpResponse setTenantArchiveUri(String tenant, Optional<String> archiveUri) {
-        nodeRepository.archiveUris().setArchiveUri(TenantName.from(tenant), archiveUri);
+        nodeRepository.archiveUriManager().setArchiveUri(TenantName.from(tenant), archiveUri);
         return new MessageResponse(archiveUri.map(a -> "Updated").orElse("Removed") + " archive URI for " + tenant);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ArchiveUrisTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManagerTest.java
index 7751e906c48..0b3ae8183af 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ArchiveUrisTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManagerTest.java
@@ -1,5 +1,5 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.provision.provisioning;
+package com.yahoo.vespa.hosted.provision.archive;
 
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
@@ -10,11 +10,12 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
 import com.yahoo.vespa.hosted.provision.node.Generation;
+import com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester;
 import org.junit.Test;
 
 import java.util.Optional;
 
-import static com.yahoo.vespa.hosted.provision.provisioning.ArchiveUris.normalizeUri;
+import static com.yahoo.vespa.hosted.provision.archive.ArchiveUriManager.normalizeUri;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
@@ -22,20 +23,20 @@ import static org.junit.Assert.fail;
 /**
  * @author freva
  */
-public class ArchiveUrisTest {
+public class ArchiveUriManagerTest {
 
     @Test
     public void archive_uri() {
         ApplicationId app = ApplicationId.from("vespa", "music", "main");
         Node allocated = createNode(app);
         Node unallocated = createNode(null);
-        ArchiveUris archiveUris = new ProvisioningTester.Builder().build().nodeRepository().archiveUris();
+        ArchiveUriManager archiveUriManager = new ProvisioningTester.Builder().build().nodeRepository().archiveUriManager();
 
-        assertFalse(archiveUris.archiveUriFor(unallocated).isPresent());
-        assertFalse(archiveUris.archiveUriFor(allocated).isPresent());
+        assertFalse(archiveUriManager.archiveUriFor(unallocated).isPresent());
+        assertFalse(archiveUriManager.archiveUriFor(allocated).isPresent());
 
-        archiveUris.setArchiveUri(app.tenant(), Optional.of("scheme://hostname/dir"));
-        assertEquals("scheme://hostname/dir/music/main/default/h432a/", archiveUris.archiveUriFor(allocated).get());
+        archiveUriManager.setArchiveUri(app.tenant(), Optional.of("scheme://hostname/dir"));
+        assertEquals("scheme://hostname/dir/music/main/default/h432a/", archiveUriManager.archiveUriFor(allocated).get());
     }
 
     private Node createNode(ApplicationId appId) {