Move check and throwing into method, no need for optional

3 files changed, 5 insertions, 9 deletions

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 903323fcd58..835381b316d 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
@@ -17,7 +17,6 @@ import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.Transaction;
-import com.yahoo.vespa.config.server.NotFoundException;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import java.security.cert.X509Certificate;
@@ -158,10 +157,7 @@ public abstract class Session implements Comparable<Session>  {
     }
 
     /** Returns application id read from ZooKeeper. Will throw RuntimeException if not found */
-    public ApplicationId getApplicationId() {
-        return sessionZooKeeperClient.readApplicationId()
-                .orElseThrow(() -> new NotFoundException("Unable to read application id for session " + sessionId));
-    }
+    public ApplicationId getApplicationId() { return sessionZooKeeperClient.readApplicationId(); }
 
     public Tags getTags() {
         return sessionZooKeeperClient.readTags();
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 07aca116683..d3ac3ec3100 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
@@ -873,8 +873,7 @@ public class SessionRepository {
             log.log(Level.FINE, () -> "File reference for session id " + sessionId + ": " + fileReference + " not found");
             return;
         }
-        ApplicationId applicationId = sessionZKClient.readApplicationId()
-                                                     .orElseThrow(() -> new RuntimeException("Could not find application id for session " + sessionId));
+        ApplicationId applicationId = sessionZKClient.readApplicationId();
         log.log(Level.FINE, () -> "Creating local session for tenant '" + tenantName + "' with session id " + sessionId);
         try {
             createLocalSession(sessionDir, applicationId, sessionZKClient.readTags(), sessionId);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 9218b03af1e..37688e2676c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -169,8 +169,9 @@ public class SessionZooKeeperClient {
         curator.set(applicationIdPath(), Utf8.toBytes(id.serializedForm()));
     }
 
-    public Optional<ApplicationId> readApplicationId() {
-        return curator.getData(applicationIdPath()).map(d -> ApplicationId.fromSerializedForm(Utf8.toString(d)));
+    public ApplicationId readApplicationId() {
+        return curator.getData(applicationIdPath()).map(d -> ApplicationId.fromSerializedForm(Utf8.toString(d)))
+                      .orElseThrow(() -> new RuntimeException("Could not find application id for session " + sessionId));
     }
 
     private Path tagsPath() {