Revert "Revert "Revert "Jvenstad/fix config model inconsitency"""

13 files changed, 71 insertions, 122 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 7a4998215e3..3d94dedf651 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
@@ -286,7 +286,7 @@ public class ApplicationRepositoryTest {
 
         assertTrue(deployment2.isPresent());
         deployment2.get().activate(); // session 3
-        long activeSessionId = tester.tenant().getApplicationRepo().requireActiveSessionOf(tester.applicationId());
+        long activeSessionId = tester.tenant().getApplicationRepo().getSessionIdForApplication(tester.applicationId());
 
         clock.advance(Duration.ofSeconds(10));
         Optional<com.yahoo.config.provision.Deployment> deployment3 = tester.redeployFromLocalActive();
@@ -296,7 +296,7 @@ public class ApplicationRepositoryTest {
         LocalSession deployment3session = ((com.yahoo.vespa.config.server.deploy.Deployment) deployment3.get()).session();
         assertNotEquals(activeSessionId, deployment3session);
         // No change to active session id
-        assertEquals(activeSessionId, tester.tenant().getApplicationRepo().requireActiveSessionOf(tester.applicationId()));
+        assertEquals(activeSessionId, tester.tenant().getApplicationRepo().getSessionIdForApplication(tester.applicationId()));
         assertEquals(3, tester.tenant().getLocalSessionRepo().listSessions().size());
 
         clock.advance(Duration.ofHours(1)); // longer than session lifetime
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 69c88dc0275..a708e4d8ace 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
@@ -39,12 +39,12 @@ public class TenantApplicationsTest {
         writeApplicationData(createApplicationId("foo"), 3L);
         writeApplicationData(createApplicationId("bar"), 4L);
         TenantApplications repo = createZKAppRepo();
-        List<ApplicationId> applications = repo.activeApplications();
+        List<ApplicationId> applications = repo.listApplications();
         assertThat(applications.size(), is(2));
-        assertThat(applications.get(0).application().value(), is("bar"));
-        assertThat(applications.get(1).application().value(), is("foo"));
-        assertThat(repo.requireActiveSessionOf(applications.get(0)), is(4L));
-        assertThat(repo.requireActiveSessionOf(applications.get(1)), is(3L));
+        assertThat(applications.get(0).application().value(), is("foo"));
+        assertThat(applications.get(1).application().value(), is("bar"));
+        assertThat(repo.getSessionIdForApplication(applications.get(0)), is(3L));
+        assertThat(repo.getSessionIdForApplication(applications.get(1)), is(4L));
     }
 
     @Test
@@ -52,7 +52,7 @@ public class TenantApplicationsTest {
         writeApplicationData(createApplicationId("foo"), 3L);
         writeApplicationData("invalid", 3L);
         TenantApplications repo = createZKAppRepo();
-        List<ApplicationId> applications = repo.activeApplications();
+        List<ApplicationId> applications = repo.listApplications();
         assertThat(applications.size(), is(1));
         assertThat(applications.get(0).application().value(), is("foo"));
     }
@@ -60,7 +60,7 @@ public class TenantApplicationsTest {
     @Test(expected = IllegalArgumentException.class)
     public void require_that_requesting_session_for_unknown_application_throws_exception() throws Exception {
         TenantApplications repo = createZKAppRepo();
-        repo.requireActiveSessionOf(createApplicationId("nonexistent"));
+        repo.getSessionIdForApplication(createApplicationId("nonexistent"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -70,19 +70,18 @@ public class TenantApplicationsTest {
         curatorFramework.create().creatingParentsIfNeeded()
                 .forPath(TenantRepository.getApplicationsPath(tenantName).append(baz.serializedForm()).getAbsolute());
         TenantApplications repo = createZKAppRepo();
-        repo.requireActiveSessionOf(baz);
+        repo.getSessionIdForApplication(baz);
     }
 
     @Test
     public void require_that_application_ids_can_be_written() throws Exception {
         TenantApplications repo = createZKAppRepo();
         ApplicationId myapp = createApplicationId("myapp");
-        repo.createApplication(myapp);
-        repo.createPutTransaction(myapp, 3l).commit();
+        repo.createPutApplicationTransaction(myapp, 3l).commit();
         String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
         assertTrue(curatorFramework.checkExists().forPath(path) != null);
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("3"));
-        repo.createPutTransaction(myapp, 5l).commit();
+        repo.createPutApplicationTransaction(myapp, 5l).commit();
         assertTrue(curatorFramework.checkExists().forPath(path) != null);
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("5"));
     }
@@ -92,15 +91,13 @@ public class TenantApplicationsTest {
         TenantApplications repo = createZKAppRepo();
         ApplicationId id1 = createApplicationId("myapp");
         ApplicationId id2 = createApplicationId("myapp2");
-        repo.createApplication(id1);
-        repo.createApplication(id2);
-        repo.createPutTransaction(id1, 1).commit();
-        repo.createPutTransaction(id2, 1).commit();
-        assertThat(repo.activeApplications().size(), is(2));
-        repo.createDeleteTransaction(id1).commit();
-        assertThat(repo.activeApplications().size(), is(1));
-        repo.createDeleteTransaction(id2).commit();
-        assertThat(repo.activeApplications().size(), is(0));
+        repo.createPutApplicationTransaction(id1, 1).commit();
+        repo.createPutApplicationTransaction(id2, 1).commit();
+        assertThat(repo.listApplications().size(), is(2));
+        repo.deleteApplication(id1).commit();
+        assertThat(repo.listApplications().size(), is(1));
+        repo.deleteApplication(id2).commit();
+        assertThat(repo.listApplications().size(), is(0));
     }
 
     @Test
@@ -111,7 +108,7 @@ public class TenantApplicationsTest {
         MockReloadHandler reloadHandler = new MockReloadHandler();
         TenantApplications repo = createZKAppRepo(reloadHandler);
         assertNull(reloadHandler.lastRemoved);
-        repo.createDeleteTransaction(foo).commit();
+        repo.deleteApplication(foo).commit();
         long endTime = System.currentTimeMillis() + 60_000;
         while (System.currentTimeMillis() < endTime && reloadHandler.lastRemoved == null) {
             Thread.sleep(100);
@@ -129,7 +126,11 @@ public class TenantApplicationsTest {
     }
 
     private static ApplicationId createApplicationId(String name) {
-        return ApplicationId.from(tenantName.value(), name, "myinst");
+        return new ApplicationId.Builder()
+                .tenant(tenantName.value())
+                .applicationName(name)
+                .instanceName("myinst")
+                .build();
     }
 
     private void writeApplicationData(ApplicationId applicationId, long sessionId) throws Exception {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 6b67dcc4e9a..7ffb9552cf8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -183,7 +183,7 @@ public class DeployTester {
     public AllocatedHosts getAllocatedHostsOf(ApplicationId applicationId) {
         Tenant tenant = tenant();
         LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo()
-                                                                             .requireActiveSessionOf(applicationId));
+                                                                             .getSessionIdForApplication(applicationId));
         return session.getAllocatedHosts();
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
index c6a8e1f2f9d..b0bb3bf244f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
@@ -56,14 +56,12 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
         session2 = new MockSession(2l, FilesApplicationPackage.fromFile(new File("src/test/apps/content")));
         Tenant tenant1 = tenantRepository.getTenant(tenantName1);
         tenant1.getLocalSessionRepo().addSession(session2);
-        tenant1.getApplicationRepo().createApplication(idTenant1);
-        tenant1.getApplicationRepo().createPutTransaction(idTenant1, 2l).commit();
+        tenant1.getApplicationRepo().createPutApplicationTransaction(idTenant1, 2l).commit();
 
         MockSession session3 = new MockSession(3l, FilesApplicationPackage.fromFile(new File("src/test/apps/content2")));
         Tenant tenant2 = tenantRepository.getTenant(tenantName2);
         tenant2.getLocalSessionRepo().addSession(session3);
-        tenant2.getApplicationRepo().createApplication(idTenant2);
-        tenant2.getApplicationRepo().createPutTransaction(idTenant2, 3l).commit();
+        tenant2.getApplicationRepo().createPutApplicationTransaction(idTenant2, 3l).commit();
 
         handler = new ApplicationHandler(ApplicationHandler.testOnlyContext(),
                                          Zone.defaultZone(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index bfd6a35cc2e..2c84e2d8ad4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -222,13 +222,13 @@ public class ApplicationHandlerTest {
     }
 
     private void deleteAndAssertOKResponseMocked(ApplicationId applicationId, boolean fullAppIdInUrl) throws IOException {
-        long sessionId = tenantRepository.getTenant(applicationId.tenant()).getApplicationRepo().requireActiveSessionOf(applicationId);
+        long sessionId = tenantRepository.getTenant(applicationId.tenant()).getApplicationRepo().getSessionIdForApplication(applicationId);
         deleteAndAssertResponse(applicationId, Zone.defaultZone(), Response.Status.OK, null, fullAppIdInUrl);
         assertNull(tenantRepository.getTenant(applicationId.tenant()).getLocalSessionRepo().getSession(sessionId));
     }
 
     private void deleteAndAssertOKResponse(Tenant tenant, ApplicationId applicationId) throws IOException {
-        long sessionId = tenant.getApplicationRepo().requireActiveSessionOf(applicationId);
+        long sessionId = tenant.getApplicationRepo().getSessionIdForApplication(applicationId);
         deleteAndAssertResponse(applicationId, Zone.defaultZone(), Response.Status.OK, null, true);
         assertNull(tenant.getLocalSessionRepo().getSession(sessionId));
     }
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 1db70956407..2d3dcc592f7 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
@@ -46,8 +46,7 @@ public class HostHandlerTest {
     private HostHandler hostHandler;
 
     static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId) {
-        tenant.getApplicationRepo().createApplication(applicationId);
-        tenant.getApplicationRepo().createPutTransaction(applicationId, sessionId).commit();
+        tenant.getApplicationRepo().createPutApplicationTransaction(applicationId, sessionId).commit();
         ApplicationPackage app = FilesApplicationPackage.fromFile(testApp);
         tenant.getLocalSessionRepo().addSession(new SessionHandlerTest.MockSession(sessionId, app, applicationId));
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
index f97bc443a38..f57e7f09b39 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
@@ -51,17 +51,17 @@ public class ListApplicationsHandlerTest {
         final String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[]");
-        ApplicationId id1 = ApplicationId.from("mytenant", "foo", "quux");
-        applicationRepo.createApplication(id1);
-        applicationRepo.createPutTransaction(id1, 1).commit();
+        applicationRepo.createPutApplicationTransaction(
+                new ApplicationId.Builder().tenant("tenant").applicationName("foo").instanceName("quux").build(),
+                1).commit();
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");
-        ApplicationId id2 = ApplicationId.from("mytenant", "bali", "quux");
-        applicationRepo.createApplication(id2);
-        applicationRepo.createPutTransaction(id2, 1).commit();
+        applicationRepo.createPutApplicationTransaction(
+                new ApplicationId.Builder().tenant("tenant").applicationName("bali").instanceName("quux").build(),
+                1).commit();
         assertResponse(url, Response.Status.OK,
-                "[\"" + url + "bali/environment/dev/region/us-east/instance/quux\"," +
-                        "\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]"
+                "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"," +
+                        "\"" + url + "bali/environment/dev/region/us-east/instance/quux\"]"
         );
     }
 
@@ -82,12 +82,12 @@ public class ListApplicationsHandlerTest {
 
     @Test
     public void require_that_listing_works_with_multiple_tenants() throws Exception {
-        ApplicationId id1 = ApplicationId.from("mytenant", "foo", "quux");
-        applicationRepo.createApplication(id1);
-        applicationRepo.createPutTransaction(id1, 1).commit();
-        ApplicationId id2 = ApplicationId.from("foobar", "quux", "foo");
-        applicationRepo2.createApplication(id2);
-        applicationRepo2.createPutTransaction(id2, 1).commit();
+        applicationRepo.createPutApplicationTransaction(new ApplicationId.Builder()
+                .tenant("tenant")
+                .applicationName("foo").instanceName("quux").build(), 1).commit();
+        applicationRepo2.createPutApplicationTransaction(new ApplicationId.Builder()
+                .tenant("tenant")
+                .applicationName("quux").instanceName("foo").build(), 1).commit();
         String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 858d1e0eaa7..380b76c30af 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -323,9 +323,6 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
                                             Optional.of(AllocatedHosts.withHosts(Collections.singleton(new HostSpec("bar", Collections.emptyList())))));
             session = createRemoteSession(sessionId, initialStatus, zkClient);
             addLocalSession(sessionId, deployData, zkClient);
-            tenantRepository.getTenant(tenantName).getApplicationRepo().createApplication(ApplicationId.from(tenantName.value(),
-                                                                                                             deployData.getApplicationName(),
-                                                                                                             InstanceName.defaultName().value()));
             metaData = localRepo.getSession(sessionId).getMetaData();
             actResponse = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.ACTIVE, sessionId, subPath));
             return this;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
index 7f7f71a1fe8..94d3b126bd7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
@@ -203,8 +203,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
                               .applicationName("foo")
                               .instanceName("quux")
                               .build();
-        applicationRepo.createApplication(fooId);
-        applicationRepo.createPutTransaction(fooId, 2).commit();
+        applicationRepo.createPutApplicationTransaction(fooId, 2).commit();
         assertFromParameter("3", "http://myhost:40555/application/v2/tenant/" + tenant + "/application/foo/environment/test/region/baz/instance/quux");
         localSessionRepo.addSession(new SessionHandlerTest.MockSession(5l, FilesApplicationPackage.fromFile(testApp)));
         ApplicationId bioId = new ApplicationId.Builder()
@@ -212,8 +211,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
                               .applicationName("foobio")
                               .instanceName("quux")
                               .build();
-        applicationRepo.createApplication(bioId);
-        applicationRepo.createPutTransaction(bioId, 5).commit();
+        applicationRepo.createPutApplicationTransaction(bioId, 5).commit();
         assertFromParameter("6", "http://myhost:40555/application/v2/tenant/" + tenant + "/application/foobio/environment/staging/region/baz/instance/quux");
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index a4432dcbfcd..e7db4dcf58f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -196,14 +196,12 @@ public class LocalSessionTest {
         zkClient.write(Collections.singletonMap(new Version(0, 0, 0), new MockFileRegistry()));
         File sessionDir = new File(tenantFileSystemDirs.sessionsPath(), String.valueOf(sessionId));
         sessionDir.createNewFile();
-        TenantApplications applications = TenantApplications.create(curator, new MockReloadHandler(), tenant);
-        applications.createApplication(zkc.readApplicationId());
         return new LocalSession(tenant, sessionId, preparer,
                 new SessionContext(
                         FilesApplicationPackage.fromFile(testApp),
                         zkc,
                         sessionDir,
-                        applications,
+                        TenantApplications.create(curator, new MockReloadHandler(), tenant),
                         new HostRegistry<>(),
                         superModelGenerationCounter,
                         flagSource));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
index d5d0fe72dbe..a7b74e69a21 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
@@ -3,26 +3,23 @@ package com.yahoo.vespa.config.server.session;
 
 import com.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.api.Model;
-import com.yahoo.config.model.api.ModelContext;
-import com.yahoo.config.model.api.ModelCreateResult;
-import com.yahoo.config.model.api.ModelFactory;
-import com.yahoo.config.model.api.ValidationParameters;
+import com.yahoo.config.model.api.*;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.vespa.config.server.TestComponentRegistry;
+import com.yahoo.config.model.test.MockApplicationPackage;
+import com.yahoo.component.Version;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
-import com.yahoo.vespa.config.server.application.PermanentApplicationPackage;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
-import com.yahoo.vespa.curator.Curator;
+import com.yahoo.vespa.config.server.TestComponentRegistry;
+import com.yahoo.vespa.config.server.application.PermanentApplicationPackage;
 import com.yahoo.vespa.curator.mock.MockCurator;
+import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.VespaModelFactory;
+
 import org.junit.Before;
 import org.junit.Test;
 
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 9bd5c5f1614..4046384005d 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
@@ -81,8 +81,6 @@ public class TenantRepositoryTest {
 
     @Test
     public void testListenersAdded() throws IOException, SAXException {
-        tenantRepository.getTenant(tenant1).getApplicationRepo().createApplication(ApplicationId.defaultId());
-        tenantRepository.getTenant(tenant1).getApplicationRepo().createPutTransaction(ApplicationId.defaultId(), 4).commit();
         tenantRepository.getTenant(tenant1).getReloadHandler().reloadConfig(ApplicationSet.fromSingle(
                 new Application(new VespaModel(MockApplicationPackage.createEmpty()),
                                 new ServerCache(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index 26a6f5e0c5f..5f18046cb81 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.tenant;
 
-import com.yahoo.component.Version;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.SimpletypesConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
@@ -10,10 +9,9 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.DeployData;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
-import com.yahoo.config.provision.AllocatedHosts;
-import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
-import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.AllocatedHosts;
+import com.yahoo.component.Version;
 import com.yahoo.io.IOUtils;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
@@ -21,24 +19,27 @@ import com.yahoo.vespa.config.GetConfigRequest;
 import com.yahoo.vespa.config.protocol.ConfigResponse;
 import com.yahoo.vespa.config.protocol.DefContent;
 import com.yahoo.vespa.config.protocol.VespaVersion;
+import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.vespa.config.server.host.HostRegistries;
 import com.yahoo.vespa.config.server.ReloadListener;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.TestComponentRegistry;
+import com.yahoo.vespa.config.server.rpc.UncompressedConfigResponseFactory;
 import com.yahoo.vespa.config.server.application.Application;
-import com.yahoo.vespa.config.server.application.ApplicationSet;
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.config.server.deploy.ZooKeeperDeployer;
-import com.yahoo.vespa.config.server.host.HostRegistries;
 import com.yahoo.vespa.config.server.model.TestModelFactory;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.monitoring.Metrics;
-import com.yahoo.vespa.config.server.rpc.UncompressedConfigResponseFactory;
 import com.yahoo.vespa.config.server.session.RemoteSession;
 import com.yahoo.vespa.config.server.session.SessionZooKeeperClient;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.VespaModelFactory;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -47,22 +48,11 @@ import org.xml.sax.SAXException;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * @author Ulf Lilleengen
@@ -93,7 +83,7 @@ public class TenantRequestHandlerTest {
         Metrics sh = Metrics.createTestMetrics();
         List<ReloadListener> listeners = new ArrayList<>();
         listeners.add(listener);
-        server = new TenantRequestHandler(sh, tenant, listeners, new UncompressedConfigResponseFactory(), new HostRegistries(), curator);
+        server = new TenantRequestHandler(sh, tenant, listeners, new UncompressedConfigResponseFactory(), new HostRegistries());
         componentRegistry = new TestComponentRegistry.Builder()
                 .curator(curator)
                 .modelFactoryRegistry(createRegistry())
@@ -176,8 +166,6 @@ public class TenantRequestHandlerTest {
     public void testReloadConfig() throws IOException {
         ApplicationId applicationId = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build();
 
-        server.applications().createApplication(applicationId);
-        server.applications().createPutTransaction(applicationId, 1).commit();
         server.reloadConfig(reloadConfig(1));
         assertThat(listener.reloaded.get(), is(1));
         // Using only payload list for this simple test
@@ -197,7 +185,6 @@ public class TenantRequestHandlerTest {
 
         listener.reloaded.set(0);
         feedApp(app2, 2, defaultApp(), true);
-        server.applications().createPutTransaction(applicationId, 2).commit();
         server.reloadConfig(reloadConfig(2L));
         configResponse = getConfigResponse(SimpletypesConfig.class, server, defaultApp(), vespaVersion, "");
         assertTrue(configResponse.isInternalRedeploy());
@@ -209,34 +196,19 @@ public class TenantRequestHandlerTest {
 
     @Test
     public void testRemoveApplication() {
-        ApplicationId appId = ApplicationId.from(tenant.value(), "default", "default");
-        server.reloadConfig(reloadConfig(1));
-        assertThat(listener.reloaded.get(), is(0));
-
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
         server.reloadConfig(reloadConfig(1));
-        assertThat(listener.reloaded.get(), is(1));
-
         assertThat(listener.removed.get(), is(0));
-
-        server.removeApplication(appId);
-        assertThat(listener.removed.get(), is(0));
-
-        server.applications().createDeleteTransaction(appId).commit();
-        server.removeApplication(appId);
+        server.removeApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build());
         assertThat(listener.removed.get(), is(1));
     }
 
     @Test
     public void testResolveForAppId() {
         long id = 1L;
+        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(id)));
         ApplicationId appId = new ApplicationId.Builder()
                               .tenant(tenant)
                               .applicationName("myapp").instanceName("myinst").build();
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
-        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(id)));
         zkc.writeApplicationId(appId);
         RemoteSession session = new RemoteSession(appId.tenant(), id, componentRegistry, zkc);
         server.reloadConfig(session.ensureApplicationLoaded());
@@ -274,8 +246,6 @@ public class TenantRequestHandlerTest {
     }
 
     private void feedAndReloadApp(File appDir, long sessionId, ApplicationId appId) throws IOException {
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, sessionId).commit();
         feedApp(appDir, sessionId, appId, false);
         SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(sessionId)));
         zkc.writeApplicationId(appId);
@@ -311,11 +281,9 @@ public class TenantRequestHandlerTest {
     @Test
     public void testHasApplication() {
         assertdefaultAppNotFound();
-        ApplicationId appId = ApplicationId.from(tenant.value(), "default", "default");
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
         server.reloadConfig(reloadConfig(1));
-        assertTrue(server.hasApplication(appId, Optional.of(vespaVersion)));
+        assertTrue(server.hasApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build(),
+                                         Optional.of(vespaVersion)));
     }
 
     private void assertdefaultAppNotFound() {
@@ -324,13 +292,10 @@ public class TenantRequestHandlerTest {
 
     @Test
     public void testMultipleApplicationsReload() {
-        ApplicationId appId = ApplicationId.from(tenant.value(), "foo", "default");
         assertdefaultAppNotFound();
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
         server.reloadConfig(reloadConfig(1, "foo"));
         assertdefaultAppNotFound();
-        assertTrue(server.hasApplication(appId,
+        assertTrue(server.hasApplication(new ApplicationId.Builder().tenant(tenant).applicationName("foo").build(),
                                          Optional.of(vespaVersion)));
         assertThat(server.resolveApplicationId("doesnotexist"), is(ApplicationId.defaultId()));
         assertThat(server.resolveApplicationId("mytesthost"), is(new ApplicationId.Builder()
@@ -343,8 +308,6 @@ public class TenantRequestHandlerTest {
         assertdefaultAppNotFound();
 
         VespaModel model = new VespaModel(FilesApplicationPackage.fromFile(new File("src/test/apps/app")));
-        server.applications().createApplication(ApplicationId.defaultId());
-        server.applications().createPutTransaction(ApplicationId.defaultId(), 1).commit();
         server.reloadConfig(ApplicationSet.fromSingle(new Application(model,
                                                                       new ServerCache(),
                                                                       1,