Rename methods

6 files changed, 48 insertions, 22 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
index 42ccf4c436b..bd2bad4db93 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
@@ -87,10 +87,10 @@ public class ApplicationCuratorDatabase {
      * Returns a transaction which writes the given session id as the currently active for the given application.
      *
      * @param applicationId An {@link ApplicationId} that represents an active application.
-     * @param sessionId Id of the session containing the application package for this id.
+     * @param sessionId session id belonging to the application package for this application id.
      */
-    public Transaction createPutTransaction(ApplicationId applicationId, long sessionId) {
-        return new CuratorTransaction(curator).add(CuratorOperations.setData(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId)));
+    public Transaction createWriteActiveTransaction(Transaction transaction, ApplicationId applicationId, long sessionId) {
+        return transaction.add(CuratorOperations.setData(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId)));
     }
 
     /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index db4a94c6e1a..af29f6e8530 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -131,10 +131,10 @@ public class TenantApplications implements RequestHandler, HostValidator {
      * Returns a transaction which writes the given session id as the currently active for the given application.
      *
      * @param applicationId An {@link ApplicationId} that represents an active application.
-     * @param sessionId Id of the session containing the application package for this id.
+     * @param sessionId session id belonging to the application package for this application id.
      */
-    public Transaction createPutTransaction(ApplicationId applicationId, long sessionId) {
-        return database().createPutTransaction(applicationId, sessionId);
+    public Transaction createWriteActiveTransaction(Transaction transaction, ApplicationId applicationId, long sessionId) {
+        return database().createWriteActiveTransaction(transaction, applicationId, sessionId);
     }
 
     /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 64793454517..3144665ec91 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -974,7 +974,7 @@ public class SessionRepository {
 
     public Transaction createActivateTransaction(Session session) {
         Transaction transaction = createSetStatusTransaction(session, Session.Status.ACTIVATE);
-        transaction.add(applicationRepo.createPutTransaction(session.getApplicationId(), session.getSessionId()).operations());
+        transaction.add(applicationRepo.createWriteActiveTransaction(transaction, session.getApplicationId(), session.getSessionId()).operations());
         return transaction;
     }
 
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 a380a01b855..81544f4ed61 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
@@ -26,6 +26,7 @@ import com.yahoo.vespa.config.server.tenant.TestTenantRepository;
 import com.yahoo.vespa.curator.CompletionTimeoutException;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
+import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.model.VespaModel;
@@ -36,6 +37,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.xml.sax.SAXException;
+
 import java.io.File;
 import java.io.IOException;
 import java.time.Clock;
@@ -120,11 +122,11 @@ public class TenantApplicationsTest {
         TenantApplications repo = createZKAppRepo();
         ApplicationId myapp = createApplicationId("myapp");
         repo.createApplication(myapp);
-        repo.createPutTransaction(myapp, 3).commit();
+        writeActiveTransaction(repo, myapp, 3);
         String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
         assertNotNull(curatorFramework.checkExists().forPath(path));
         assertEquals("3", Utf8.toString(curatorFramework.getData().forPath(path)));
-        repo.createPutTransaction(myapp, 5).commit();
+        writeActiveTransaction(repo, myapp, 5);
         assertNotNull(curatorFramework.checkExists().forPath(path));
         assertEquals("5", Utf8.toString(curatorFramework.getData().forPath(path)));
     }
@@ -136,12 +138,12 @@ public class TenantApplicationsTest {
         ApplicationId id2 = createApplicationId("myapp2");
         repo.createApplication(id1);
         repo.createApplication(id2);
-        repo.createPutTransaction(id1, 1).commit();
-        repo.createPutTransaction(id2, 1).commit();
+        writeActiveTransaction(repo, id1, 1);
+        writeActiveTransaction(repo, id2, 1);
         assertEquals(2, repo.activeApplications().size());
-        repo.createDeleteTransaction(id1).commit();
+        deleteApplication(repo, id1);
         assertEquals(1, repo.activeApplications().size());
-        repo.createDeleteTransaction(id2).commit();
+        deleteApplication(repo, id2);
         assertEquals(0, repo.activeApplications().size());
     }
 
@@ -164,7 +166,7 @@ public class TenantApplicationsTest {
         TenantApplications applications = createZKAppRepo(flagSource);
         ApplicationId app1 = createApplicationId("myapp");
         applications.createApplication(app1);
-        applications.createPutTransaction(app1, 1).commit();
+        writeActiveTransaction(applications, app1, 1);
 
         Version deployedVersion0 = Version.fromString("6.1");
         applications.activateApplication(createApplicationVersions(app1, deployedVersion0), 1);
@@ -203,13 +205,13 @@ public class TenantApplicationsTest {
 
     @Test
     public void testListConfigs() throws IOException, SAXException {
-        TenantApplications applications = createTenantApplications(TenantName.defaultName(), new MockCurator(), configserverConfig, new MockConfigActivationListener(), new InMemoryFlagSource());
+        TenantApplications applications = createTenantApplications(TenantName.defaultName(), curator, configserverConfig, new MockConfigActivationListener(), new InMemoryFlagSource());
         assertFalse(applications.hasApplication(ApplicationId.defaultId(), Optional.of(vespaVersion)));
 
         VespaModel model = new VespaModel(FilesApplicationPackage.fromFile(new File("src/test/apps/app")));
         ApplicationId applicationId = ApplicationId.defaultId();
         applications.createApplication(applicationId);
-        applications.createPutTransaction(applicationId, 1).commit();
+        writeActiveTransaction(applications, applicationId, 1);
         applications.activateApplication(ApplicationVersions.from(new Application(model,
                                                                                   new ServerCache(),
                                                                                   1,
@@ -325,4 +327,16 @@ public class TenantApplicationsTest {
                                       flagSource);
     }
 
+    private static void deleteApplication(TenantApplications repo, ApplicationId id1) {
+        try (var transaction = repo.createDeleteTransaction(id1)) {
+            transaction.commit();
+        }
+    }
+
+    private void writeActiveTransaction(TenantApplications repo, ApplicationId id1, int x) {
+        try (var transaction = new CuratorTransaction(curator)) {
+            repo.createWriteActiveTransaction(transaction, id1, x).commit();
+        }
+    }
+
 }
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 76790e6264d..841867921da 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
@@ -15,6 +15,7 @@ import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.http.SessionHandlerTest;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.config.server.tenant.TestTenantRepository;
+import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -38,6 +39,7 @@ public class ListApplicationsHandlerTest {
 
     private TenantApplications applicationRepo, applicationRepo2;
     private ListApplicationsHandler handler;
+    private TenantRepository tenantRepository;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -48,7 +50,7 @@ public class ListApplicationsHandlerTest {
                 .configServerDBDir(temporaryFolder.newFolder().getAbsolutePath())
                 .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath())
                 .build();
-        TenantRepository tenantRepository = new TestTenantRepository.Builder()
+        tenantRepository = new TestTenantRepository.Builder()
                 .withConfigserverConfig(configserverConfig)
                 .build();
         tenantRepository.addTenant(mytenant);
@@ -67,12 +69,12 @@ public class ListApplicationsHandlerTest {
                 "[]");
         ApplicationId id1 = ApplicationId.from("mytenant", "foo", "quux");
         applicationRepo.createApplication(id1);
-        applicationRepo.createPutTransaction(id1, 1).commit();
+        writeActiveTransaction(applicationRepo, id1, 1);
         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();
+        writeActiveTransaction(applicationRepo, id2, 1);
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "bali/environment/dev/region/us-east/instance/quux\"," +
                         "\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]"
@@ -98,10 +100,10 @@ public class ListApplicationsHandlerTest {
     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();
+        writeActiveTransaction(applicationRepo, id1, 1);
         ApplicationId id2 = ApplicationId.from("foobar", "quux", "foo");
         applicationRepo2.createApplication(id2);
-        applicationRepo2.createPutTransaction(id2, 1).commit();
+        writeActiveTransaction(applicationRepo2, id2, 1);
         String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");
@@ -124,4 +126,11 @@ public class ListApplicationsHandlerTest {
         assertEquals(expectedStatus, response.getStatus());
         assertEquals(expectedResponse, SessionHandlerTest.getRenderedString(response));
     }
+
+    private void writeActiveTransaction(TenantApplications repo, ApplicationId id1, int x) {
+        try (var transaction = new CuratorTransaction(tenantRepository.getCurator())) {
+            repo.createWriteActiveTransaction(transaction, id1, x).commit();
+        }
+    }
+
 }
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 7cfe96bf30e..02ee3202475 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
@@ -29,6 +29,7 @@ import com.yahoo.vespa.config.server.monitoring.Metrics;
 import com.yahoo.vespa.config.server.provision.HostProvisionerProvider;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
+import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.model.VespaModel;
@@ -106,7 +107,9 @@ public class TenantRepositoryTest {
         TenantApplications applicationRepo = tenantRepository.getTenant(tenant1).getApplicationRepo();
         ApplicationId id = ApplicationId.from(tenant1, ApplicationName.defaultName(), InstanceName.defaultName());
         applicationRepo.createApplication(id);
-        applicationRepo.createPutTransaction(id, 4).commit();
+        try (var transaction = new CuratorTransaction(curator)) {
+            applicationRepo.createWriteActiveTransaction(transaction, id, 4).commit();
+        }
         applicationRepo.activateApplication(ApplicationVersions.from(new Application(new VespaModel(MockApplicationPackage.createEmpty()),
                                                                                      new ServerCache(),
                                                                                      4L,