From 49c16465792cebcfde95d5744e6c9a5374ff1657 Mon Sep 17 00:00:00 2001 From: Sudiksha Nanda Date: Thu, 28 Oct 2021 14:24:00 +0100 Subject: [PATCH 1/2] Rename serviceLifecycleGetter api --- timelock-api/src/main/conjure/timelock-management-api.yml | 4 ++-- .../timelock/management/TimeLockManagementResource.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/timelock-api/src/main/conjure/timelock-management-api.yml b/timelock-api/src/main/conjure/timelock-management-api.yml index 975c1abb6cf..0f32734c224 100644 --- a/timelock-api/src/main/conjure/timelock-management-api.yml +++ b/timelock-api/src/main/conjure/timelock-management-api.yml @@ -30,8 +30,8 @@ services: users will not see two different lock services servicing the same startTransactions request), but not atomic as a whole. - getServerId: - http: POST /getServerId + getServerLifecycleId: + http: POST /getServerLifecycleId returns: uuid docs: | Gets the randomly generated server id associated with the server's current lifecycle upon start up. diff --git a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/management/TimeLockManagementResource.java b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/management/TimeLockManagementResource.java index 281be9b6bc9..ce651f337c9 100644 --- a/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/management/TimeLockManagementResource.java +++ b/timelock-impl/src/main/java/com/palantir/atlasdb/timelock/management/TimeLockManagementResource.java @@ -117,7 +117,7 @@ public ListenableFuture invalidateResources(AuthHeader authHeader, Set getServerId(AuthHeader authHeader) { + public ListenableFuture getServerLifecycleId(AuthHeader authHeader) { return Futures.immediateFuture(serviceLifecycleController.getServerId()); } @@ -169,8 +169,8 @@ public void invalidateResources(AuthHeader authHeader, Set namespaces) { } @Override - public UUID getServerId(AuthHeader authHeader) { - return unwrap(resource.getServerId(authHeader)); + public UUID getServerLifecycleId(AuthHeader authHeader) { + return unwrap(resource.getServerLifecycleId(authHeader)); } @Override From 07c1a5d139d2f8bfb9f8a38700f729eeeefd1d65 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Thu, 28 Oct 2021 13:26:19 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-5734.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-5734.v2.yml diff --git a/changelog/@unreleased/pr-5734.v2.yml b/changelog/@unreleased/pr-5734.v2.yml new file mode 100644 index 00000000000..d8c34fb045b --- /dev/null +++ b/changelog/@unreleased/pr-5734.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Rename `getServerId` endpoint to `getServerLifecycleId`. + links: + - https://github.com/palantir/atlasdb/pull/5734