From 557bc13df5836f8ee6abce7bb90d0c5eac26e618 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Jul 2022 08:40:17 +0200 Subject: [PATCH] Polishing Remove overrides for default methods. See gh-714 --- .../LifecycleAwareSessionManagerSupport.java | 11 +---------- .../vault/core/lease/SecretLeaseContainer.java | 10 ---------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java index 6feb9b03..747bb4e3 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java @@ -186,16 +186,6 @@ public abstract class LifecycleAwareSessionManagerSupport extends Authentication this.nextExecutionTime = nextExecutionTime; } - @Nullable - public Date nextExecutionTime(TriggerContext triggerContext) { - - if (this.fired.compareAndSet(false, true)) { - return this.nextExecutionTime; - } - - return null; - } - @Override public Instant nextExecution(TriggerContext triggerContext) { if (this.fired.compareAndSet(false, true)) { @@ -204,6 +194,7 @@ public abstract class LifecycleAwareSessionManagerSupport extends Authentication return null; } + } /** 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 30ef3534..7c46bb19 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 @@ -938,17 +938,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements I this.seconds = seconds; } - @Override @Nullable - public Date nextExecutionTime(TriggerContext triggerContext) { - - if (UPDATER.compareAndSet(this, STATUS_ARMED, STATUS_FIRED)) { - return new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(this.seconds)); - } - - return null; - } - @Override public Instant nextExecution(TriggerContext triggerContext) { if (UPDATER.compareAndSet(this, STATUS_ARMED, STATUS_FIRED)) {