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 a46eb63f79..202ddee446 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java @@ -376,16 +376,16 @@ public SerializationPair getValueSerializationPair() { } /** - * Returns a computed {@link Duration TTL expiration timeout} based on cache entry key/value - * if a {@link TtlFunction} was confiugred using {@link #entryTtl(TtlFunction)}. + * Returns a computed {@link Duration TTL expiration timeout} based on cache entry key/value if a {@link TtlFunction} + * was confiugred using {@link #entryTtl(TtlFunction)}. *

- * Otherwise, returns the user-provided, fixed {@link Duration} if {@link #entryTtl(Duration)} - * was called during cache configuration. + * Otherwise, returns the user-provided, fixed {@link Duration} if {@link #entryTtl(Duration)} was called during cache + * configuration. * * @return the configured {@link Duration TTL expiration}. - * @deprecated since 3.2.0. Use {@link #getTtlFunction()} instead. + * @deprecated since 3.2. Use {@link #getTtlFunction()} instead. */ - @Deprecated(since = "3.2.0") + @Deprecated(since = "3.2") public Duration getTtl() { return getTtlFunction().getTimeToLive(Object.class, null); } diff --git a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java index bff07ac46a..972360985d 100644 --- a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java +++ b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java @@ -43,7 +43,7 @@ public T read(ByteBuffer buffer) { return (T) buffer; } - return serializer.deserialize(ByteUtils.extractBytes(buffer)); + return serializer.deserialize(ByteUtils.getBytes(buffer)); } } diff --git a/src/main/java/org/springframework/data/redis/util/ByteUtils.java b/src/main/java/org/springframework/data/redis/util/ByteUtils.java index d3775d1220..f6ad110bee 100644 --- a/src/main/java/org/springframework/data/redis/util/ByteUtils.java +++ b/src/main/java/org/springframework/data/redis/util/ByteUtils.java @@ -31,6 +31,7 @@ * @author Christoph Strobl * @author Mark Paluch * @author Guy Korland + * @author John Blum * @since 1.7 */ public final class ByteUtils { @@ -251,13 +252,10 @@ public static ByteBuffer getByteBuffer(String theString, Charset charset) { * @param buffer must not be {@literal null}. * @return the extracted bytes. * @since 2.1 + * @deprecated Since 3.2. Use {@link #getBytes(ByteBuffer)} instead. */ + @Deprecated(since = "3.2") public static byte[] extractBytes(ByteBuffer buffer) { - - ByteBuffer duplicate = buffer.duplicate(); - byte[] bytes = new byte[duplicate.remaining()]; - duplicate.get(bytes); - - return bytes; + return getBytes(buffer); } }