Skip to content

Commit c83f5ac

Browse files
committed
Upgrade to Lettuce 6.5.1.RELEASE.
Closes #3070
1 parent 8579857 commit c83f5ac

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<beanutils>1.9.4</beanutils>
2525
<xstream>1.4.21</xstream>
2626
<pool>2.11.1</pool>
27-
<lettuce>6.4.1.RELEASE</lettuce>
27+
<lettuce>6.5.1.RELEASE</lettuce>
2828
<jedis>5.2.0</jedis>
2929
<multithreadedtc>1.01</multithreadedtc>
3030
<netty>4.1.115.Final</netty>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ private void validateCommandIfRunningInTransactionMode(ProtocolKeyword cmd, byte
10751075

10761076
private void validateCommand(ProtocolKeyword command, @Nullable byte[]... args) {
10771077

1078-
RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.name());
1078+
RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.toString());
10791079

10801080
if (!RedisCommand.UNKNOWN.equals(redisCommand) && redisCommand.requiresArguments()) {
10811081
try {

Diff for: src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public KeyValues getLowCardinalityKeyValues(LettuceObservationContext context) {
4242

4343
Endpoint ep = context.getRequiredEndpoint();
4444
KeyValues keyValues = KeyValues.of(LowCardinalityCommandKeyNames.DATABASE_SYSTEM.withValue("redis"), //
45-
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().name()));
45+
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().toString()));
4646

4747
if (ep instanceof SocketAddressEndpoint endpoint) {
4848

@@ -70,7 +70,7 @@ public KeyValues getHighCardinalityKeyValues(LettuceObservationContext context)
7070

7171
if (command.getArgs() != null) {
7272
return KeyValues.of(HighCardinalityCommandKeyNames.STATEMENT
73-
.withValue(command.getType().name() + " " + command.getArgs().toCommandString()));
73+
.withValue(command.getType().toString() + " " + command.getArgs().toCommandString()));
7474
}
7575
}
7676

@@ -79,6 +79,6 @@ public KeyValues getHighCardinalityKeyValues(LettuceObservationContext context)
7979

8080
@Override
8181
public String getContextualName(LettuceObservationContext context) {
82-
return context.getRequiredCommand().getType().name().toLowerCase(Locale.ROOT);
82+
return context.getRequiredCommand().getType().toString().toLowerCase(Locale.ROOT);
8383
}
8484
}

Diff for: src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ void maxRedirectsShouldBeSetOnClusterClientOptions() {
10711071

10721072
assertThat(options.getMaxRedirects()).isEqualTo(42);
10731073
assertThat(options.isValidateClusterNodeMembership()).isFalse();
1074-
assertThat(options.getTimeoutOptions().isApplyConnectionTimeout()).isFalse();
10751074
}
10761075

10771076
@Test // DATAREDIS-1142

0 commit comments

Comments
 (0)