Rename a class and some methods

9 files changed, 53 insertions, 53 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 950a21e5750..c355be5090a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -326,7 +326,7 @@ public class ApplicationRepositoryTest {
             // Delete app and verify that it has been deleted from repos and no application set exists
             assertTrue(applicationRepository.delete(applicationId()));
             assertTrue(applicationRepository.getActiveSession(applicationId()).isEmpty());
-            assertEquals(Optional.empty(), sessionRepository.getRemoteSession(sessionId).applicationSet());
+            assertEquals(Optional.empty(), sessionRepository.getRemoteSession(sessionId).applicationVersions());
             assertTrue(curator.exists(sessionNode));
             assertEquals(Session.Status.DELETE.name(), Utf8.toString(curator.getData(sessionNode.append("sessionState")).get()));
             assertTrue(sessionFile.exists());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
index c3766ad9b83..1b4e9ad1231 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java
@@ -7,7 +7,7 @@ import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
@@ -112,8 +112,8 @@ public class SuperModelRequestHandlerTest {
         assertTrue(controller.hasApplication(ApplicationId.global(), Optional.empty()));
     }
 
-    private ApplicationSet createApp(ApplicationId applicationId, long generation) throws IOException, SAXException {
-        return ApplicationSet.from(
+    private ApplicationVersions createApp(ApplicationId applicationId, long generation) throws IOException, SAXException {
+        return ApplicationVersions.from(
                 new TestApplication(
                         new VespaModel(FilesApplicationPackage.fromFile(testApp)),
                         new ServerCache(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
index 57af219c813..fb5d6537a19 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
@@ -38,7 +38,7 @@ public class ApplicationMapperTest {
 
     @Test
     public void testGetForVersionReturnsCorrectVersion() {
-        applicationMapper.register(appId, ApplicationSet.fromList(applications));
+        applicationMapper.register(appId, ApplicationVersions.fromList(applications));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
         assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
@@ -46,19 +46,19 @@ public class ApplicationMapperTest {
 
     @Test
     public void testGetForVersionReturnsLatestVersion() {
-        applicationMapper.register(appId, ApplicationSet.fromList(applications));
+        applicationMapper.register(appId, ApplicationVersions.fromList(applications));
         assertEquals(applicationMapper.getForVersion(appId, Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionThrows() {
-        applicationMapper.register(appId, ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2))));
+        applicationMapper.register(appId, ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2))));
         applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
     @Test (expected = NotFoundException.class)
     public void testGetForVersionThrows2() {
-        applicationMapper.register(appId, ApplicationSet.from(applications.get(0)));
+        applicationMapper.register(appId, ApplicationVersions.from(applications.get(0)));
 
         applicationMapper.getForVersion(new ApplicationId.Builder()
                                                 .tenant("different")
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java
index 7629680b16f..d0a3bf4ec9b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java
@@ -18,9 +18,9 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Vegard Sjonfjell
  */
-public class ApplicationSetTest {
+public class ApplicationVersionsTest {
 
-    private ApplicationSet applicationSet;
+    private ApplicationVersions applicationVersions;
     private final List<Version> vespaVersions = new ArrayList<>();
     private final List<Application> applications = new ArrayList<>();
 
@@ -32,29 +32,29 @@ public class ApplicationSetTest {
 
     @Test
     public void testGetForVersionOrLatestReturnsCorrectVersion() {
-        applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
+        applicationVersions = ApplicationVersions.fromList(applications);
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
     }
 
     @Test
     public void testGetForVersionOrLatestReturnsLatestVersion() {
-        applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()), applications.get(2));
+        applicationVersions = ApplicationVersions.fromList(applications);
+        assertEquals(applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionOrLatestThrows() {
-        applicationSet = ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2)));
-        applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now());
+        applicationVersions = ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2)));
+        applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
     @Test
     public void testGetAllVersions() {
-        applicationSet = ApplicationSet.fromList(applications);
+        applicationVersions = ApplicationVersions.fromList(applications);
         assertEquals(List.of(Version.fromString("1.2.3"), Version.fromString("1.2.4"), Version.fromString("1.2.5")),
-                     applicationSet.getAllVersions(ApplicationId.defaultId()));
+                     applicationVersions.versions(ApplicationId.defaultId()));
     }
 
     private Application createApplication(Version version) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 2ad04fdd572..a380a01b855 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -145,17 +145,17 @@ public class TenantApplicationsTest {
         assertEquals(0, repo.activeApplications().size());
     }
 
-    private static ApplicationSet createSet(ApplicationId id, Version version) throws IOException, SAXException {
+    private static ApplicationVersions createApplicationVersions(ApplicationId id, Version version) throws IOException, SAXException {
         VespaModel model = new VespaModel(new NullConfigModelRegistry(),
                                           new DeployState.Builder().wantedNodeVespaVersion(version)
                                                                    .applicationPackage(FilesApplicationPackage.fromFile(new File("src/test/apps/app")))
                                                                    .build());
-        return ApplicationSet.from(new Application(model,
-                                                   new ServerCache(),
-                                                   1,
-                                                   Version.emptyVersion,
-                                                   MetricUpdater.createTestUpdater(),
-                                                   id));
+        return ApplicationVersions.from(new Application(model,
+                                                        new ServerCache(),
+                                                        1,
+                                                        Version.emptyVersion,
+                                                        MetricUpdater.createTestUpdater(),
+                                                        id));
     }
 
     @Test
@@ -167,19 +167,19 @@ public class TenantApplicationsTest {
         applications.createPutTransaction(app1, 1).commit();
 
         Version deployedVersion0 = Version.fromString("6.1");
-        applications.activateApplication(createSet(app1, deployedVersion0), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion0), 1);
         assertTrue("Empty version is compatible", applications.compatibleWith(Optional.empty(), app1));
 
         Version nodeVersion0 = Version.fromString("6.0");
         assertTrue("Lower version is compatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         Version deployedVersion1 = Version.fromString("7.1");
-        applications.activateApplication(createSet(app1, deployedVersion1), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion1), 1);
         assertTrue("New major is compatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         flagSource.withListFlag(PermanentFlags.INCOMPATIBLE_VERSIONS.id(), List.of("8"), String.class);
         Version deployedVersion2 = Version.fromString("8.1");
-        applications.activateApplication(createSet(app1, deployedVersion2), 1);
+        applications.activateApplication(createApplicationVersions(app1, deployedVersion2), 1);
         assertFalse("New major is incompatible", applications.compatibleWith(Optional.of(nodeVersion0), app1));
 
         Version nodeVersion1 = Version.fromString("8.0");
@@ -191,7 +191,7 @@ public class TenantApplicationsTest {
         final AtomicInteger removed = new AtomicInteger(0);
 
         @Override
-        public void configActivated(ApplicationSet application) {
+        public void configActivated(ApplicationVersions application) {
             activated.incrementAndGet();
         }
 
@@ -210,12 +210,12 @@ public class TenantApplicationsTest {
         ApplicationId applicationId = ApplicationId.defaultId();
         applications.createApplication(applicationId);
         applications.createPutTransaction(applicationId, 1).commit();
-        applications.activateApplication(ApplicationSet.from(new Application(model,
-                                                                             new ServerCache(),
-                                                                             1,
-                                                                             vespaVersion,
-                                                                             MetricUpdater.createTestUpdater(),
-                                                                             applicationId)),
+        applications.activateApplication(ApplicationVersions.from(new Application(model,
+                                                                                  new ServerCache(),
+                                                                                  1,
+                                                                                  vespaVersion,
+                                                                                  MetricUpdater.createTestUpdater(),
+                                                                                  applicationId)),
                                          1);
         Set<ConfigKey<?>> configNames = applications.listConfigs(applicationId, Optional.of(vespaVersion), false);
         assertTrue(configNames.contains(new ConfigKey<>("sentinel", "hosts", "cloud.config")));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index ba1d69c13dd..6a4099bc45a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -66,7 +66,7 @@ public class HostHandlerTest {
     public void require_correct_tenant_and_application_for_hostname() throws Exception {
         ApplicationId applicationId = applicationId();
         applicationRepository.deploy(testApp, new PrepareParams.Builder().applicationId(applicationId).build());
-        String hostname = applicationRepository.getActiveApplicationSet(applicationId).get().getAllHosts().iterator().next();
+        String hostname = applicationRepository.getActiveApplicationSet(applicationId).get().allHosts().iterator().next();
         assertApplicationForHost(hostname, applicationId);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
index 9190cbc0d8a..8db86aa4dec 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
@@ -25,7 +25,7 @@ import com.yahoo.vespa.config.protocol.Trace;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.session.PrepareParams;
 import com.yahoo.vespa.filedistribution.LazyFileReferenceData;
@@ -142,7 +142,7 @@ public class RpcServerTest {
                                           new Version(1, 2, 3),
                                           MetricUpdater.createTestUpdater(),
                                           applicationId);
-        ApplicationSet appSet = ApplicationSet.from(app);
+        ApplicationVersions appSet = ApplicationVersions.from(app);
         tester.rpcServer().configActivated(appSet);
         ConfigKey<?> key = new ConfigKey<>(LbServicesConfig.class, "*");
         JRTClientConfigRequest clientReq  = createRequest(new RawConfig(key, LbServicesConfig.getDefMd5()));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
index 07d3aac5a52..bb71cbd35d4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java
@@ -19,7 +19,7 @@ import com.yahoo.io.reader.NamedReader;
 import com.yahoo.path.Path;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.ApplicationRepository;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.OrchestratorMock;
 import com.yahoo.vespa.config.server.filedistribution.MockFileDistributionFactory;
 import com.yahoo.vespa.config.server.http.InvalidApplicationException;
@@ -115,11 +115,11 @@ public class SessionRepositoryTest {
         assertNotNull(sessionRepository.getLocalSession(secondSessionId));
         assertNull(sessionRepository.getLocalSession(secondSessionId + 1));
 
-        ApplicationSet applicationSet = sessionRepository.ensureApplicationLoaded(sessionRepository.getRemoteSession(firstSessionId));
-        assertNotNull(applicationSet);
-        assertEquals(2, applicationSet.getApplicationGeneration());
-        assertEquals(applicationId.application(), applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application());
-        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
+        ApplicationVersions applicationVersions = sessionRepository.ensureApplicationLoaded(sessionRepository.getRemoteSession(firstSessionId));
+        assertNotNull(applicationVersions);
+        assertEquals(2, applicationVersions.applicationGeneration());
+        assertEquals(applicationId.application(), applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application());
+        assertNotNull(applicationVersions.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
 
         LocalSession session = sessionRepository.getLocalSession(secondSessionId);
         Collection<NamedReader> a = session.applicationPackage.get().getSchemas();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 9af1bbb875e..7cfe96bf30e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -17,7 +17,7 @@ import com.yahoo.vespa.config.server.MockSecretStore;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.TestConfigDefinitionRepo;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.application.ApplicationVersions;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.application.TenantApplicationsTest;
 import com.yahoo.vespa.config.server.filedistribution.FileDirectory;
@@ -107,12 +107,12 @@ public class TenantRepositoryTest {
         ApplicationId id = ApplicationId.from(tenant1, ApplicationName.defaultName(), InstanceName.defaultName());
         applicationRepo.createApplication(id);
         applicationRepo.createPutTransaction(id, 4).commit();
-        applicationRepo.activateApplication(ApplicationSet.from(new Application(new VespaModel(MockApplicationPackage.createEmpty()),
-                                                                                new ServerCache(),
-                                                                                4L,
-                                                                                new Version(1, 2, 3),
-                                                                                MetricUpdater.createTestUpdater(),
-                                                                                id)),
+        applicationRepo.activateApplication(ApplicationVersions.from(new Application(new VespaModel(MockApplicationPackage.createEmpty()),
+                                                                                     new ServerCache(),
+                                                                                     4L,
+                                                                                     new Version(1, 2, 3),
+                                                                                     MetricUpdater.createTestUpdater(),
+                                                                                     id)),
                                             4);
         assertEquals(1, listener.activated.get());
     }