Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Lettuce 6.5.1.RELEASE.

Browse Source 
Closes #3070
This commit is contained in:
Mark Paluch
2024-12-12 09:10:41 +01:00
parent 8579857cfc
commit c83f5ac56f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -24,7 +24,7 @@
<beanutils>1.9.4</beanutils>
<xstream>1.4.21</xstream>
<pool>2.11.1</pool>
<lettuce>6.4.1.RELEASE</lettuce>
<lettuce>6.5.1.RELEASE</lettuce>
<jedis>5.2.0</jedis>
<multithreadedtc>1.01</multithreadedtc>
<netty>4.1.115.Final</netty>

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

@@ -1075,7 +1075,7 @@ public class LettuceConnection extends AbstractRedisConnection {
private void validateCommand(ProtocolKeyword command, @Nullable byte[]... args) {
RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.name());
RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.toString());
if (!RedisCommand.UNKNOWN.equals(redisCommand) && redisCommand.requiresArguments()) {
try {

6
src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java
View File

@@ -42,7 +42,7 @@ record DefaultLettuceObservationConvention(
Endpoint ep = context.getRequiredEndpoint();
KeyValues keyValues = KeyValues.of(LowCardinalityCommandKeyNames.DATABASE_SYSTEM.withValue("redis"), //
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().name()));
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().toString()));
if (ep instanceof SocketAddressEndpoint endpoint) {
@@ -70,7 +70,7 @@ record DefaultLettuceObservationConvention(
if (command.getArgs() != null) {
return KeyValues.of(HighCardinalityCommandKeyNames.STATEMENT
.withValue(command.getType().name() + " " + command.getArgs().toCommandString()));
.withValue(command.getType().toString() + " " + command.getArgs().toCommandString()));
}
}
@@ -79,6 +79,6 @@ record DefaultLettuceObservationConvention(
@Override
public String getContextualName(LettuceObservationContext context) {
return context.getRequiredCommand().getType().name().toLowerCase(Locale.ROOT);
return context.getRequiredCommand().getType().toString().toLowerCase(Locale.ROOT);
}
}

1
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
View File

@@ -1071,7 +1071,6 @@ class LettuceConnectionFactoryUnitTests {
assertThat(options.getMaxRedirects()).isEqualTo(42);
assertThat(options.isValidateClusterNodeMembership()).isFalse();
assertThat(options.getTimeoutOptions().isApplyConnectionTimeout()).isFalse();
}
@Test // DATAREDIS-1142