Remove unused class

2 files changed, 3 insertions, 77 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
deleted file mode 100644
index acbb1dc81ce..00000000000
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2018 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;
-
-import java.util.logging.Level;
-import com.yahoo.text.Utf8;
-import com.yahoo.vespa.curator.Curator;
-import org.apache.curator.framework.recipes.cache.ChildData;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-/**
- * Watches one particular local session (/config/v2/tenants/<tenantName>/sessions/<n>/sessionState in ZooKeeper)
- * to pick up when an application is deleted (the delete might be done on any config server in the cluster)
- *
- * @author Harald Musum
- */
-public class LocalSessionStateWatcher {
-
-    private static final Logger log = Logger.getLogger(LocalSessionStateWatcher.class.getName());
-
-    private final Curator.FileCache fileCache;
-    private final LocalSession session;
-    private final SessionRepository sessionRepository;
-    private final Executor zkWatcherExecutor;
-
-    LocalSessionStateWatcher(Curator.FileCache fileCache, LocalSession session,
-                             SessionRepository sessionRepository, Executor zkWatcherExecutor) {
-        this.fileCache = fileCache;
-        this.session = session;
-        this.sessionRepository = sessionRepository;
-        this.zkWatcherExecutor = zkWatcherExecutor;
-        this.fileCache.start();
-        this.fileCache.addListener(this::nodeChanged);
-    }
-
-    // Will delete session if it exists in local session repo
-    private void sessionChanged(Session.Status status) {
-        long sessionId = session.getSessionId();
-        log.log(status == Session.Status.DELETE ? Level.INFO : Level.FINE,
-                session.logPre() + "Session change: Local session " + sessionId + " changed status to " + status);
-
-        if (status.equals(Session.Status.DELETE) && sessionRepository.getLocalSession(sessionId) != null) {
-            log.log(Level.FINE, session.logPre() + "Deleting session " + sessionId);
-            sessionRepository.deleteLocalSession(session);
-        }
-    }
-
-    public long getSessionId() {
-        return session.getSessionId();
-    }
-
-    public void close() {
-        try {
-            fileCache.close();
-        } catch (Exception e) {
-            log.log(Level.WARNING, "Exception when closing watcher", e);
-        }
-    }
-
-    public void nodeChanged() {
-        zkWatcherExecutor.execute(() -> {
-            try {
-                ChildData node = fileCache.getCurrentData();
-                if (node != null) {
-                    sessionChanged(Session.Status.parse(Utf8.toString(node.getData())));
-                }
-            } catch (Exception e) {
-                log.log(Level.WARNING, session.logPre() + "Error handling session changed for session " + getSessionId(), e);
-            }
-        });
-    }
-
-}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index 0a8d6cdde69..14f2ef6f271 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -63,9 +63,9 @@ public class SessionStateWatcher {
         } else if (status.equals(Session.Status.DELETE)) {
             remoteSession.deactivate();
             log.log(Level.INFO, remoteSession.logPre() + "Session change: Local session " + sessionId + " changed status to " + status);
-            localSession.ifPresent(localSession1 -> {
-                 log.log(Level.FINE, remoteSession.logPre() + "Deleting session " + sessionId);
-                 sessionRepository.deleteLocalSession(localSession.get());
+            localSession.ifPresent(session -> {
+                 log.log(Level.FINE, session.logPre() + "Deleting session " + sessionId);
+                 sessionRepository.deleteLocalSession(session);
              });
         }
     }