Polishing.

Replace other occurences of Optional being used as conditional substitute.

Reformat code to use tab indents instead of spaces.

See #3203

Author: mp911de

src/main/java/org/springframework/data/redis/cache/BatchStrategies.java

@@ -26,6 +26,7 @@
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Collection of predefined {@link BatchStrategy} implementations using the Redis {@code KEYS} or {@code SCAN} command.
@@ -82,13 +83,13 @@ public long cleanCache(RedisConnection connection, String name, byte[] pattern)
 
 			RedisKeyCommands commands = connection.keyCommands();
 
-            Set<byte[]> keys = commands.keys(pattern);
+			Set<byte[]> keys = commands.keys(pattern);
 
-            if (keys == null || keys.isEmpty()) {
-                return 0;
-            }
+			if (CollectionUtils.isEmpty(keys)) {
+				return 0;
+			}
 
-            commands.del(keys.toArray(new byte[0][]));
+			commands.del(keys.toArray(new byte[0][]));
 
 			return keys.size();
 		}

src/main/java/org/springframework/data/redis/connection/RedisPassword.java

@@ -142,11 +142,6 @@ public Optional<char[]> toOptional() {
 		return Optional.empty();
 	}
 
-	@Override
-	public String toString() {
-		return "%s[%s]".formatted(getClass().getSimpleName(), isPresent() ? "*****" : "<none>");
-	}
-
 	@Override
 	public boolean equals(@Nullable Object o) {
 
@@ -164,4 +159,10 @@ public boolean equals(@Nullable Object o) {
 	public int hashCode() {
 		return Objects.hashCode(thePassword);
 	}
+
+	@Override
+	public String toString() {
+		return "%s[%s]".formatted(getClass().getSimpleName(), isPresent() ? "*****" : "<none>");
+	}
+
 }

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

@@ -51,6 +51,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.SmartLifecycle;
@@ -64,7 +65,6 @@
 import org.springframework.data.redis.connection.RedisConfiguration.ClusterConfiguration;
 import org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex;
 import org.springframework.data.redis.connection.RedisConfiguration.WithPassword;
-import org.springframework.data.util.Optionals;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -1194,8 +1194,13 @@ public void resetConnection() {
 
 		doInLock(() -> {
 
-			Optionals.toStream(Optional.ofNullable(this.connection), Optional.ofNullable(this.reactiveConnection))
-					.forEach(SharedConnection::resetConnection);
+			if (this.connection != null) {
+				this.connection.resetConnection();
+			}
+
+			if (this.reactiveConnection != null) {
+				this.reactiveConnection.resetConnection();
+			}
 
 			this.connection = null;
 			this.reactiveConnection = null;

src/main/java/org/springframework/data/redis/repository/support/QueryByExampleRedisExecutor.java

@@ -118,7 +118,6 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 
 	@Override
 	public <S extends T> Optional<S> findOne(Example<S> example) {
-
 		return Optional.ofNullable(doFindOne(example));
 	}