From d25de89fec8e2467098e8af3d69d060b8b9848da Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 10 Jul 2023 09:26:47 +0200 Subject: [PATCH] Polishing. Stick to TtlFunction & nullability contracts. Update deprecation with since tag. Original Pull Request: #2597 --- .../data/redis/cache/RedisCacheConfiguration.java | 11 +++-------- .../redis/cache/RedisCacheConfigurationUnitTests.java | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java index bb661aa34..cdae34f7c 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java @@ -334,16 +334,11 @@ public class RedisCacheConfiguration { * was called during cache configuration. * * @return the configured {@link Duration TTL expiration}. - * @deprecated use {@link #getTtlFunction()} instead. + * @deprecated since 3.2.0. Use {@link #getTtlFunction()} instead. */ - @Deprecated - @SuppressWarnings("all") + @Deprecated(since = "3.2.0") public Duration getTtl() { - - TtlFunction ttlFunction = getTtlFunction(); - - return ttlFunction instanceof FixedDurationTtlFunction it ? it.duration() - : ttlFunction.getTimeToLive(null, null); + return getTtlFunction().getTimeToLive(Object.class, null); } /** diff --git a/src/test/java/org/springframework/data/redis/cache/RedisCacheConfigurationUnitTests.java b/src/test/java/org/springframework/data/redis/cache/RedisCacheConfigurationUnitTests.java index a919e4901..4f54eb144 100644 --- a/src/test/java/org/springframework/data/redis/cache/RedisCacheConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/RedisCacheConfigurationUnitTests.java @@ -98,7 +98,7 @@ class RedisCacheConfigurationUnitTests { assertThat(cacheConfiguration.getTtl()).isEqualTo(thirtyMinutes); assertThat(cacheConfiguration.getTtl()).isEqualTo(twoHours); - verify(mockTtlFunction, times(2)).getTimeToLive(isNull(), isNull()); + verify(mockTtlFunction, times(2)).getTimeToLive(any(), isNull()); verifyNoMoreInteractions(mockTtlFunction); }