From c83f5ac56ffa3b65fcd5cc4ff9b3f83742c97c27 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Thu, 12 Dec 2024 09:10:41 +0100
Subject: [PATCH] Upgrade to Lettuce 6.5.1.RELEASE.

Closes #3070
---
 pom.xml                                                     | 2 +-
 .../data/redis/connection/lettuce/LettuceConnection.java    | 2 +-
 .../observability/DefaultLettuceObservationConvention.java  | 6 +++---
 .../lettuce/LettuceConnectionFactoryUnitTests.java          | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 50848f2fb..fd73e23eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
index aca9bb7a2..bbf1755ab 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
@@ -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 {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java b/src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java
index 7d400eb9b..1f21776ed 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/observability/DefaultLettuceObservationConvention.java
@@ -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);
 	}
 }
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
index 548fce0f4..3242dacf7 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
@@ -1071,7 +1071,6 @@ class LettuceConnectionFactoryUnitTests {
 
 		assertThat(options.getMaxRedirects()).isEqualTo(42);
 		assertThat(options.isValidateClusterNodeMembership()).isFalse();
-		assertThat(options.getTimeoutOptions().isApplyConnectionTimeout()).isFalse();
 	}
 
 	@Test // DATAREDIS-1142