diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-07-19 14:17:24 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-07-19 14:17:24 +0200 |
| commit | db065760955ba41e9a37831b28a0bd848eb48a0b (patch) | |
| tree | fff98cbd333b1619d7c7c413df1fec90038fe3a3 /configserver/src/main/java/com | |
| parent | fb1647ab7530724be62cfb7257ec017d881733e0 (diff) | |
Simplify
Diffstat (limited to 'configserver/src/main/java/com')
3 files changed, 4 insertions, 5 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() { |