Move some session method to superclass

3 files changed, 14 insertions, 14 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index e61c884cbf6..831f4ba3679 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -24,6 +24,7 @@ import com.yahoo.vespa.curator.Curator;
 import java.io.File;
 import java.time.Instant;
 import java.util.Optional;
+import java.util.logging.Level;
 
 /**
  * A LocalSession is a session that has been created locally on this configserver. A local session can be edited and
@@ -67,6 +68,7 @@ public class LocalSession extends Session implements Comparable<LocalSession> {
                                        Path tenantPath,
                                        Instant now) {
         applicationRepo.createApplication(params.getApplicationId()); // TODO jvenstad: This is wrong, but it has to be done now, since preparation can change the application ID of a session :(
+        logger.log(Level.FINE, "Created application " + params.getApplicationId());
         Curator.CompletionWaiter waiter = zooKeeperClient.createPrepareWaiter();
         ConfigChangeActions actions = sessionPreparer.prepare(hostValidator, logger, params,
                                                               currentActiveApplicationSet, tenantPath, now,
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index a1d767b0d1c..d0082d34114 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -140,22 +140,8 @@ public class RemoteSession extends Session {
         return zooKeeperClient.getAllocatedHosts();
     }
 
-    // Note: Assumes monotonically increasing session ids
-    public boolean isNewerThan(long sessionId) {
-        return getSessionId() > sessionId;
-    }
-
-    public Transaction createDeactivateTransaction() {
-        return createSetStatusTransaction(Status.DEACTIVATE);
-    }
-
-    private Transaction createSetStatusTransaction(Status status) {
-        return zooKeeperClient.createWriteStatusTransaction(status);
-    }
-
     public ApplicationMetaData getMetaData() {
         return zooKeeperClient.loadApplicationPackage().getMetaData();
     }
 
-
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index a57bfeda12e..7803bd05e0a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.transaction.Transaction;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 
 import java.time.Instant;
@@ -116,4 +117,15 @@ public abstract class Session {
         return zooKeeperClient.getAllocatedHosts();
     }
 
+    public Transaction createDeactivateTransaction() {
+        return createSetStatusTransaction(Status.DEACTIVATE);
+    }
+
+    private Transaction createSetStatusTransaction(Status status) {
+        return zooKeeperClient.createWriteStatusTransaction(status);
+    }
+
+    // Note: Assumes monotonically increasing session ids
+    public boolean isNewerThan(long sessionId) { return getSessionId() > sessionId; }
+
 }