Simplify

4 files changed, 5 insertions, 6 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 b627fe9ba3b..df1fdddf409 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
@@ -121,7 +121,7 @@ public abstract class Session implements Comparable<Session>  {
     }
 
     void setApplicationPackageReference(FileReference applicationPackageReference) {
-        sessionZooKeeperClient.writeApplicationPackageReference(Optional.ofNullable(applicationPackageReference));
+        sessionZooKeeperClient.writeApplicationPackageReference(applicationPackageReference);
     }
 
     public void setVespaVersion(Version version) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index ae87a0dd182..94745be9d2a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -394,7 +394,7 @@ public class SessionPreparer {
             zkDeployer.deploy(applicationPackage, fileRegistryMap, allocatedHosts);
             // Note: When changing the below you need to also change similar calls in SessionRepository.createSessionFromExisting()
             zooKeeperClient.writeApplicationId(applicationId);
-            zooKeeperClient.writeApplicationPackageReference(Optional.of(fileReference));
+            zooKeeperClient.writeApplicationPackageReference(fileReference);
             zooKeeperClient.writeVespaVersion(vespaVersion);
             zooKeeperClient.writeDockerImageRepository(dockerImageRepository);
             zooKeeperClient.writeAthenzDomain(athenzDomain);
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 c2444e52f4d..e2e5e2bcce4 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
@@ -175,9 +175,8 @@ public class SessionZooKeeperClient {
                       .orElseThrow(() -> new NotFoundException("Could not find application id for session " + sessionId));
     }
 
-    void writeApplicationPackageReference(Optional<FileReference> applicationPackageReference) {
-        applicationPackageReference.ifPresent(
-                reference -> curator.set(applicationPackageReferencePath(), Utf8.toBytes(reference.value())));
+    void writeApplicationPackageReference(FileReference applicationPackageReference) {
+        curator.set(applicationPackageReferencePath(), Utf8.toBytes(applicationPackageReference.value()));
     }
 
     FileReference readApplicationPackageReference() {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
index 4a7aeafab7e..e5b44857685 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java
@@ -134,7 +134,7 @@ public class SessionZooKeeperClientTest {
     public void require_that_application_package_file_reference_can_be_written_and_read() {
         final FileReference testRef = new FileReference("test-ref");
         SessionZooKeeperClient zkc = createSessionZKClient(3);
-        zkc.writeApplicationPackageReference(Optional.of(testRef));
+        zkc.writeApplicationPackageReference(testRef);
         assertEquals(testRef, zkc.readApplicationPackageReference());
     }