Skip to content

Commit d25de89

Browse files
Polishing.
Stick to TtlFunction & nullability contracts. Update deprecation with since tag. Original Pull Request: #2597
1 parent fe88d31 commit d25de89

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,11 @@ public SerializationPair<Object> getValueSerializationPair() {
334334
* was called during cache configuration.
335335
*
336336
* @return the configured {@link Duration TTL expiration}.
337-
* @deprecated use {@link #getTtlFunction()} instead.
337+
* @deprecated since 3.2.0. Use {@link #getTtlFunction()} instead.
338338
*/
339-
@Deprecated
340-
@SuppressWarnings("all")
339+
@Deprecated(since = "3.2.0")
341340
public Duration getTtl() {
342-
343-
TtlFunction ttlFunction = getTtlFunction();
344-
345-
return ttlFunction instanceof FixedDurationTtlFunction it ? it.duration()
346-
: ttlFunction.getTimeToLive(null, null);
341+
return getTtlFunction().getTimeToLive(Object.class, null);
347342
}
348343

349344
/**

src/test/java/org/springframework/data/redis/cache/RedisCacheConfigurationUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void getTtlCanReturnDynamicDuration() {
9898
assertThat(cacheConfiguration.getTtl()).isEqualTo(thirtyMinutes);
9999
assertThat(cacheConfiguration.getTtl()).isEqualTo(twoHours);
100100

101-
verify(mockTtlFunction, times(2)).getTimeToLive(isNull(), isNull());
101+
verify(mockTtlFunction, times(2)).getTimeToLive(any(), isNull());
102102
verifyNoMoreInteractions(mockTtlFunction);
103103
}
104104

0 commit comments

Comments
 (0)