Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a43541b

Browse files
onobcmp911de
authored andcommitted
Polishing.
Signed-off-by: Chris Bono <chris.bono@broadcom.com> Original Pull Request: #3226 See: #3211 
1 parent 277bbbc commit a43541b

23 files changed

+1272
-1032
lines changed

‎src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,20 +1616,20 @@ public List<String> hVals(String key) {
16161616
return convertAndReturn(delegate.hVals(serialize(key)), byteListToStringList);
16171617
}
16181618

1619-
@Override
1620-
public List<String> hGetDel(String key, String... fields) {
1621-
return convertAndReturn(delegate.hGetDel(serialize(key), serializeMulti(fields)), byteListToStringList);
1622-
}
1619+
@Override
1620+
public List<String> hGetDel(String key, String... fields) {
1621+
return convertAndReturn(delegate.hGetDel(serialize(key), serializeMulti(fields)), byteListToStringList);
1622+
}
16231623

1624-
@Override
1625-
public List<String> hGetEx(String key, Expiration expiration, String... fields) {
1626-
return convertAndReturn(delegate.hGetEx(serialize(key), expiration, serializeMulti(fields)), byteListToStringList);
1627-
}
1624+
@Override
1625+
public List<String> hGetEx(String key, Expiration expiration, String... fields) {
1626+
return convertAndReturn(delegate.hGetEx(serialize(key), expiration, serializeMulti(fields)), byteListToStringList);
1627+
}
16281628

1629-
@Override
1630-
public Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes, HashFieldSetOption condition, Expiration expiration) {
1631-
return convertAndReturn(delegate.hSetEx(serialize(key), serialize(hashes), condition, expiration), Converters.identityConverter());
1632-
}
1629+
@Override
1630+
public Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes, HashFieldSetOption condition, Expiration expiration) {
1631+
return convertAndReturn(delegate.hSetEx(serialize(key), serialize(hashes), condition, expiration), Converters.identityConverter());
1632+
}
16331633

16341634
@Override
16351635
public Long incr(String key) {
@@ -2615,15 +2615,15 @@ public List<byte[]> hGetDel(@NonNull byte[] key, @NonNull byte[]... fields) {
26152615
}
26162616

26172617
@Override
2618-
public List<byte[]> hGetEx(@NonNull byte[] key, Expiration expiration, @NonNull byte[]... fields) {
2619-
return convertAndReturn(delegate.hGetEx(key, expiration, fields), Converters.identityConverter());
2620-
}
2618+
public List<byte[]> hGetEx(@NonNull byte[] key, @NullableExpiration expiration, @NonNull byte[]... fields) {
2619+
return convertAndReturn(delegate.hGetEx(key, expiration, fields), Converters.identityConverter());
2620+
}
26212621

26222622
@Override
2623-
public Boolean hSetEx(@NonNull byte[] key, @NonNull Map<byte[], byte[]> hashes, HashFieldSetOption condition,
2624-
Expiration expiration) {
2625-
return convertAndReturn(delegate.hSetEx(key, hashes, condition, expiration), Converters.identityConverter());
2626-
}
2623+
public Boolean hSetEx(@NonNull byte[] key, @NonNull Map<byte[], byte[]> hashes, @NonNullHashFieldSetOption condition,
2624+
@NullableExpiration expiration) {
2625+
return convertAndReturn(delegate.hSetEx(key, hashes, condition, expiration), Converters.identityConverter());
2626+
}
26272627

26282628
public @Nullable List<Long> applyExpiration(String key,
26292629
org.springframework.data.redis.core.types.Expiration expiration,

‎src/main/java/org/springframework/data/redis/connection/DefaultedRedisConnection.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Set;
2424
import java.util.concurrent.TimeUnit;
2525

26+
import org.jspecify.annotations.NonNull;
2627
import org.jspecify.annotations.NullUnmarked;
2728
import org.jspecify.annotations.Nullable;
2829
import org.springframework.data.geo.Circle;
@@ -1602,26 +1603,27 @@ default List<Long> hpTtl(byte[] key, byte[]... fields) {
16021603
return hashCommands().hpTtl(key, fields);
16031604
}
16041605

1605-
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1606-
@Override
1607-
@Deprecated
1608-
default List<byte[]> hGetDel(byte[] key, byte[]... fields) {
1609-
return hashCommands().hGetDel(key, fields);
1610-
}
1611-
1612-
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1613-
@Override
1614-
@Deprecated
1615-
default List<byte[]> hGetEx(byte[] key, Expiration expiration, byte[]... fields) {
1616-
return hashCommands().hGetEx(key, expiration, fields);
1617-
}
1618-
1619-
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1620-
@Override
1621-
@Deprecated
1622-
default Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, HashFieldSetOption condition, Expiration expiration) {
1623-
return hashCommands().hSetEx(key, hashes, condition, expiration);
1624-
}
1606+
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1607+
@Override
1608+
@Deprecated
1609+
default List<byte[]> hGetDel(byte[] key, byte[]... fields) {
1610+
return hashCommands().hGetDel(key, fields);
1611+
}
1612+
1613+
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1614+
@Override
1615+
@Deprecated
1616+
default List<byte[]> hGetEx(byte[] key, @Nullable Expiration expiration, byte[]... fields) {
1617+
return hashCommands().hGetEx(key, expiration, fields);
1618+
}
1619+
1620+
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
1621+
@Override
1622+
@Deprecated
1623+
default Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, @NonNull HashFieldSetOption condition,
1624+
@Nullable Expiration expiration) {
1625+
return hashCommands().hSetEx(key, hashes, condition, expiration);
1626+
}
16251627

16261628
/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
16271629
@Override

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /