Remove the LocalSessionLoader interface

6 files changed, 18 insertions, 23 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionLoader.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionLoader.java
deleted file mode 100644
index b82ac22e88e..00000000000
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionLoader.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.session;
-
-/**
- * Interface of a component that is able to load a session given a session id.
- *
- * @author Ulf Lilleengen
- */
-public interface LocalSessionLoader {
-
-    LocalSession loadSession(long sessionId);
-
-}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
index 3f20d3669cb..837c067a52d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java
@@ -46,7 +46,7 @@ public class LocalSessionRepo {
     private final TenantFileSystemDirs tenantFileSystemDirs;
     private final LongFlag expiryTimeFlag;
 
-    public LocalSessionRepo(TenantName tenantName, GlobalComponentRegistry componentRegistry, LocalSessionLoader loader) {
+    public LocalSessionRepo(TenantName tenantName, GlobalComponentRegistry componentRegistry, SessionFactory loader) {
         sessionCache = new SessionCache<>();
         this.clock = componentRegistry.getClock();
         this.curator = componentRegistry.getCurator();
@@ -73,7 +73,7 @@ public class LocalSessionRepo {
         return sessionCache.getSessions();
     }
 
-    private void loadSessions(LocalSessionLoader loader) {
+    private void loadSessions(SessionFactory loader) {
         File[] sessions = tenantFileSystemDirs.sessionsPath().listFiles(sessionApplicationsFilter);
         if (sessions == null) {
             return;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
index c880019e0c8..d9b30e889e8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
@@ -12,6 +12,7 @@ import java.io.File;
  *
  * @author Ulf Lilleengen
  */
+// TODO: remove interface
 public interface SessionFactory {
 
     /**
@@ -38,4 +39,10 @@ public interface SessionFactory {
 
     RemoteSession createRemoteSession(long sessionId);
 
+    /**
+     * Returns a new session instance for the given session id.
+     */
+    // TODO: rename
+    LocalSession loadSession(long sessionId);
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
index bc930916ba8..99e052ca312 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
@@ -34,7 +34,8 @@ import java.util.logging.Logger;
  *
  * @author Ulf Lilleengen
  */
-public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
+// TODO: rename to SessionFactory
+public class SessionFactoryImpl implements SessionFactory {
 
     private static final Logger log = Logger.getLogger(SessionFactoryImpl.class.getName());
     private static final long nonExistingActiveSession = 0;
@@ -166,6 +167,7 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
         return new SessionZooKeeperClient(curator, configCurator, sessionPath, serverId, nodeFlavors);
     }
 
+    // TODO: move helpers down
     private File getAndValidateExistingSessionAppDir(long sessionId) {
         File appDir = getSessionAppDir(sessionId);
         if (!appDir.exists() || !appDir.isDirectory()) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 3ddfdf412c9..a0e2ae6df7d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -15,7 +15,6 @@ import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.host.HostValidator;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.rpc.ConfigResponseFactory;
-import com.yahoo.vespa.config.server.session.LocalSessionLoader;
 import com.yahoo.vespa.config.server.session.LocalSessionRepo;
 import com.yahoo.vespa.config.server.session.RemoteSessionRepo;
 import com.yahoo.vespa.config.server.session.SessionFactory;
@@ -232,7 +231,7 @@ public class TenantRepository {
 
         SessionFactory sessionFactory = new SessionFactoryImpl(globalComponentRegistry, applicationRepo, hostValidator, tenantName);
         // TODO: Fix the casting
-        LocalSessionRepo localSessionRepo = new LocalSessionRepo(tenantName, globalComponentRegistry, (LocalSessionLoader) sessionFactory);
+        LocalSessionRepo localSessionRepo = new LocalSessionRepo(tenantName, globalComponentRegistry, sessionFactory);
         RemoteSessionRepo remoteSessionRepo = new RemoteSessionRepo(globalComponentRegistry,
                                                                     sessionFactory,
                                                                     reloadHandler,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
index 002308ea298..fa94ff2b6dc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
@@ -58,11 +58,11 @@ public class LocalSessionRepoTest {
                                             .sessionLifetime(5)
                                             .build())
                 .build();
-        LocalSessionLoader loader = new SessionFactoryImpl(globalComponentRegistry,
-                                                           TenantApplications.create(globalComponentRegistry, new MockReloadHandler(), tenantName),
-                                                           new HostRegistry<>(),
-                                                           tenantName);
-        repo = new LocalSessionRepo(tenantName, globalComponentRegistry, loader);
+        SessionFactory sessionFactory = new SessionFactoryImpl(globalComponentRegistry,
+                                                               TenantApplications.create(globalComponentRegistry, new MockReloadHandler(), tenantName),
+                                                               new HostRegistry<>(),
+                                                               tenantName);
+        repo = new LocalSessionRepo(tenantName, globalComponentRegistry, sessionFactory);
     }
 
     @Test