Skip to content

Commit 6813256

Browse files
mp911dechristophstrobl
authored andcommitted
Clean up LettuceConverters.
Use lambdas where possible. Deprecate unused methods. Favor LettuceInvoker conversion methods over List to List/List to Set converters. See #1797 Original Pull Request #1948
1 parent 96fa2ec commit 6813256

File tree

9 files changed

+211
-263
lines changed

9 files changed

+211
-263
lines changed

src/main/java/org/springframework/data/redis/connection/convert/LongToBooleanConverter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
*/
2626
public class LongToBooleanConverter implements Converter<Long, Boolean> {
2727

28+
public static final LongToBooleanConverter INSTANCE = new LongToBooleanConverter();
29+
2830
/*
2931
* (non-Javadoc)
3032
* @see org.springframework.core.convert.converter.Converter#convert(Object)

src/main/java/org/springframework/data/redis/connection/convert/StringToRedisClientInfoConverter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
*/
3636
public class StringToRedisClientInfoConverter implements Converter<String[], List<RedisClientInfo>> {
3737

38+
public static final StringToRedisClientInfoConverter INSTANCE = new StringToRedisClientInfoConverter();
39+
3840
/*
3941
* (non-Javadoc)
4042
* @see org.springframework.core.convert.converter.Converter#convert(Object)

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,21 +598,23 @@ public List<Object> exec() {
598598
isMulti = false;
599599

600600
try {
601+
Converter<Exception, DataAccessException> exceptionConverter = this::convertLettuceAccessException;
602+
601603
if (isPipelined()) {
602604
RedisFuture<TransactionResult> exec = getAsyncDedicatedRedisCommands().exec();
603605

604606
LettuceTransactionResultConverter resultConverter = new LettuceTransactionResultConverter(
605-
new LinkedList<>(txResults), LettuceConverters.exceptionConverter());
607+
new LinkedList<>(txResults), exceptionConverter);
606608

607609
pipeline(newLettuceResult(exec, source -> resultConverter
608-
.convert(LettuceConverters.transactionResultUnwrapper().convert((TransactionResult) source))));
610+
.convert(LettuceConverters.transactionResultUnwrapper().convert(source))));
609611
return null;
610612
}
611613

612-
TransactionResult transactionResult = (getDedicatedRedisCommands()).exec();
614+
TransactionResult transactionResult = getDedicatedRedisCommands().exec();
613615
List<Object> results = LettuceConverters.transactionResultUnwrapper().convert(transactionResult);
614616
return convertPipelineAndTxResults
615-
? new LettuceTransactionResultConverter(txResults, LettuceConverters.exceptionConverter()).convert(results)
617+
? new LettuceTransactionResultConverter(txResults, exceptionConverter).convert(results)
616618
: results;
617619
} catch (Exception ex) {
618620
throw convertLettuceAccessException(ex);

0 commit comments

Comments
 (0)