From 1fde90afcadeeb23f97189dea4923020369c6c98 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 Aug 2018 15:53:10 +0200 Subject: [PATCH] Polishing. Remove final keyword from local variables. Extract renewal body creation to method. Add author tag. Original pull request: gh-282. See gh-262. --- .../vault/core/lease/SecretLeaseContainer.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java index 9809c245..6784d2c9 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java @@ -113,6 +113,7 @@ import org.springframework.web.client.HttpStatusCodeException; * * @author Mark Paluch * @author Steven Swor + * @author Erik Lindblom * @see RequestedSecret * @see SecretLeaseEventPublisher * @see Lease @@ -593,12 +594,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements @SuppressWarnings("unchecked") private Lease renew(Lease lease) { - final Map leaseRenewalData = new HashMap<>(); - leaseRenewalData.put("lease_id", lease.getLeaseId()); - leaseRenewalData.put("increment", Long.toString(lease.getLeaseDuration().getSeconds())); - - HttpEntity leaseRenewalEntity = new HttpEntity<>(leaseRenewalData); + HttpEntity leaseRenewalEntity = getLeaseRenewalBody(lease); ResponseEntity> entity = operations .doWithSession(restOperations -> (ResponseEntity) restOperations @@ -616,6 +613,16 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements renewable); } + private static HttpEntity getLeaseRenewalBody(Lease lease) { + + Map leaseRenewalData = new HashMap<>(); + leaseRenewalData.put("lease_id", lease.getLeaseId()); + leaseRenewalData.put("increment", + Long.toString(lease.getLeaseDuration().getSeconds())); + + return new HttpEntity<>(leaseRenewalData); + } + /** * Hook method called when a {@link Lease} expires. The default implementation is to * notify {@link LeaseListener}. Implementations can override this method in