diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-07-12 09:24:26 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-07-12 09:24:26 +0200 |
commit | 65e8e5f0c61bacaad1301dce436f677c5a8f0f91 (patch) | |
tree | 86f8cc121f1e116007637ed456d3d9a0776e7241 /configserver | |
parent | b86c6ec74808ac85ad5d84f90e3f18d9d2f87b53 (diff) |
Minor fixes
Diffstat (limited to 'configserver')
3 files changed, 3 insertions, 5 deletions
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 0de85a00e24..27ee040fe4f 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 @@ -799,7 +799,7 @@ public class SessionRepository { private void updateSessionStateWatcher(long sessionId, RemoteSession remoteSession) { SessionStateWatcher sessionStateWatcher = sessionStateWatchers.get(sessionId); if (sessionStateWatcher == null) { - com.yahoo.vespa.curator.Curator.FileCache fileCache = curator.createFileCache(getSessionStatePath(sessionId).getAbsolute(), false); + Curator.FileCache fileCache = curator.createFileCache(getSessionStatePath(sessionId).getAbsolute(), false); fileCache.addListener(this::nodeChanged); sessionStateWatchers.put(sessionId, new SessionStateWatcher(fileCache, remoteSession, metricUpdater, zkWatcherExecutor, this)); } else { 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 529cdd19990..c7b19968f0a 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 @@ -156,9 +156,7 @@ public class SessionZooKeeperClient { } public Optional<ApplicationId> readApplicationId() { - Optional<byte[]> data = curator.getData(applicationIdPath()); - if (data.isEmpty()) return Optional.empty(); - return Optional.of(ApplicationId.fromSerializedForm(Utf8.toString(data.get()))); + return curator.getData(applicationIdPath()).map(d -> ApplicationId.fromSerializedForm(Utf8.toString(d))); } void writeApplicationPackageReference(Optional<FileReference> applicationPackageReference) { 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 0709e92fcc0..b10a90de714 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 @@ -259,7 +259,7 @@ public class TenantRepository { return metaData.orElse(new TenantMetaData(tenant.getName(), tenant.getCreatedTime(), tenant.getCreatedTime())); } - private static Set<TenantName> readTenantsFromZooKeeper(com.yahoo.vespa.curator.Curator curator) { + private static Set<TenantName> readTenantsFromZooKeeper(Curator curator) { return curator.getChildren(tenantsPath).stream().map(TenantName::from).collect(Collectors.toSet()); } |