Polishing.

Reformat code, add since and author tags.

See #2883
Original pull request: #2918

Author: mp911de

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

@@ -42,6 +42,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Dahye Anne Lee
  * @since 2.0
  */
 public interface ReactiveKeyCommands {
@@ -177,12 +178,14 @@ default Mono<Boolean> exists(ByteBuffer key) {
 
 		return exists(Mono.just(new KeyCommand(key))).next().map(BooleanResponse::getOutput);
 	}
+
 	/**
 	 * Determine the number of given {@literal keys} that exist.
 	 *
 	 * @param keys must not be {@literal null} or {@literal empty}.
 	 * @return {@link Mono} emitting {@literal the number of existing keys}.
 	 * @see <a href="https://redis.io/docs/commands/exists/">Redis Documentation: EXISTS</a>
+	 * @since 3.5
 	 */
 	Mono<Long> exists(List<ByteBuffer> keys);
 

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

@@ -48,6 +48,7 @@
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Dahye Anne Lee
  * @since 2.0
  */
 class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
@@ -346,6 +347,7 @@ public Mono<Long> refcount(ByteBuffer key) {
 
 	@Override
 	public Mono<Long> exists(List<ByteBuffer> keys) {
+
 		Assert.notNull(keys, "Key list must not be null");
 		Assert.notEmpty(keys, "Key list must not be empty");
 

src/main/java/org/springframework/data/redis/core/ReactiveRedisOperations.java

@@ -54,6 +54,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Dahye Anne Lee
  * @since 2.0
  */
 public interface ReactiveRedisOperations<K, V> {
@@ -243,6 +244,16 @@ default Mono<Flux<? extends Message<String, V>>> listenToPatternLater(String...
 	 */
 	Mono<Boolean> hasKey(K key);
 
+	/**
+	 * Get the number of given {@code keys} that exists.
+	 *
+	 * @param keys must not be {@literal null} or {@literal empty}.
+	 * @return the number of existing keys in redis. 0 if there are no existing keys.
+	 * @see <a href="https://redis.io/docs/commands/exists/">Redis Documentation: EXISTS</a>
+	 * @since 3.5
+	 */
+	Mono<Long> countExistingKeys(Collection<K> keys);
+
 	/**
 	 * Determine the type stored at {@code key}.
 	 *
@@ -422,15 +433,6 @@ default Flux<K> scan() {
 	 */
 	Mono<Duration> getExpire(K key);
 
-	/**
-	 * Get the number of given {@code keys} that exists.
-	 *
-	 * @param keys must not be {@literal null} or {@literal empty}.
-	 * @return the number of existing keys in redis. 0 if there are no existing keys.
-	 * @see <a href="https://redis.io/docs/commands/exists/">Redis Documentation: EXISTS</a>
-	 */
-	Mono<Long> countExistingKeys(Collection<K> keys);
-
 	// -------------------------------------------------------------------------
 	// Methods dealing with Redis Lua scripts
 	// -------------------------------------------------------------------------

src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java

@@ -22,6 +22,7 @@
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -69,6 +70,7 @@
  * @author Christoph Strobl
  * @author Petromir Dzhunev
  * @author John Blum
+ * @author Dahye Anne Lee
  * @param <K> the Redis key type against which the template works (usually a String)
  * @param <V> the Redis value type against which the template works
  * @since 2.0
@@ -326,6 +328,14 @@ public Mono<Boolean> hasKey(K key) {
 		return doCreateMono(connection -> connection.keyCommands().exists(rawKey(key)));
 	}
 
+	@Override
+	public Mono<Long> countExistingKeys(Collection<K> keys) {
+
+		Assert.notNull(keys, "Keys must not be null");
+
+		return doCreateMono(connection -> connection.keyCommands().exists(rawKeys(keys)));
+	}
+
 	@Override
 	public Mono<DataType> type(K key) {
 
@@ -506,14 +516,6 @@ public Mono<Boolean> move(K key, int dbIndex) {
 		return doCreateMono(connection -> connection.keyCommands().move(rawKey(key), dbIndex));
 	}
 
-	@Override
-	public Mono<Long> countExistingKeys(Collection<K> keys) {
-		Assert.notNull(keys, "Keys must not be null");
-
-		ByteBuffer[] rawKeys = rawKeys(keys);
-		return doCreateMono(connection -> connection.keyCommands().exists(Arrays.asList(rawKeys)));
-	}
-
 	// -------------------------------------------------------------------------
 	// Methods dealing with Redis Lua scripts
 	// -------------------------------------------------------------------------
@@ -697,12 +699,12 @@ private ByteBuffer rawKey(K key) {
 		return getSerializationContext().getKeySerializationPair().getWriter().write(key);
 	}
 
-	private ByteBuffer[] rawKeys(Collection<K> keys) {
-		final ByteBuffer[] rawKeys = new ByteBuffer[keys.size()];
+	private List<ByteBuffer> rawKeys(Collection<K> keys) {
+
+		List<ByteBuffer> rawKeys = new ArrayList<>(keys.size());
 
-		int i = 0;
 		for (K key : keys) {
-			rawKeys[i++] = rawKey(key);
+			rawKeys.add(rawKey(key));
 		}
 
 		return rawKeys;

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsIntegrationTests.java

@@ -50,6 +50,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Dahye Anne Lee
  */
 public class LettuceReactiveKeyCommandsIntegrationTests extends LettuceReactiveCommandsTestSupport {
 
@@ -70,8 +71,9 @@ void existsShouldReturnFalseForNonExistingKeys() {
 		connection.keyCommands().exists(KEY_1_BBUFFER).as(StepVerifier::create).expectNext(false).verifyComplete();
 	}
 
-	@ParameterizedRedisTest
+	@ParameterizedRedisTest // GH-2883
 	void existsKeyReturnsKeyCount() {
+
 		nativeCommands.set(KEY_1, "1000");
 		nativeCommands.set(KEY_2, "2000");
 		nativeCommands.set(KEY_3, "3000");
@@ -80,8 +82,8 @@ void existsKeyReturnsKeyCount() {
 				.expectNext(3L).verifyComplete();
 	}
 
-	@ParameterizedRedisTest
-	void existsKeyReturnsZeroWhenKeyDoesNotExist() {
+	@ParameterizedRedisTest // GH-2883
+	void existsKeyReturnsZeroWhenKeysDoNotExist() {
 		connection.keyCommands().exists(List.of(KEY_1_BBUFFER, KEY_2_BBUFFER, KEY_3_BBUFFER)).as(StepVerifier::create)
 				.expectNext(0L).verifyComplete();
 	}

src/test/java/org/springframework/data/redis/core/ReactiveRedisTemplateIntegrationTests.java

@@ -24,10 +24,16 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.BeforeEach;
+
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.redis.ObjectFactory;
 import org.springframework.data.redis.Person;
@@ -60,6 +66,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Dahye Anne Lee
  */
 @MethodSource("testParams")
 public class ReactiveRedisTemplateIntegrationTests<K, V> {
@@ -127,6 +134,30 @@ void exists() {
 		redisTemplate.hasKey(key).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
+	@ParameterizedRedisTest // GH-2883
+	void countExistingKeysIfValidKeyExists() {
+
+		K key = keyFactory.instance();
+		K key2 = keyFactory.instance();
+		K key3 = keyFactory.instance();
+
+		ReactiveValueOperations<K, V> ops = redisTemplate.opsForValue();
+
+		ops.set(key, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
+		ops.set(key2, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
+		ops.set(key3, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
+
+		redisTemplate.countExistingKeys(Arrays.asList(key, key2, key3)).as(StepVerifier::create).expectNext(3L)
+				.verifyComplete();
+	}
+
+	@ParameterizedRedisTest // GH-2883
+	void countExistingKeysIfNotValidKeyExists() {
+
+		K key = keyFactory.instance();
+		redisTemplate.countExistingKeys(List.of(key)).as(StepVerifier::create).expectNext(0L).verifyComplete();
+	}
+
 	@ParameterizedRedisTest // DATAREDIS-743
 	void scan() {
 
@@ -580,23 +611,4 @@ void listenToPatternLaterShouldReceiveChannelMessagesCorrectly() {
 				.verify(Duration.ofSeconds(3));
 	}
 
-	@ParameterizedRedisTest
-	void countExistingKeysIfValidKeyExists() {
-
-		K key = keyFactory.instance();
-		K key2 = keyFactory.instance();
-		K key3 = keyFactory.instance();
-
-		redisTemplate.opsForValue().set(key, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
-		redisTemplate.opsForValue().set(key2, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
-		redisTemplate.opsForValue().set(key3, valueFactory.instance()).as(StepVerifier::create).expectNext(true).verifyComplete();
-
-		redisTemplate.countExistingKeys(Arrays.asList(key, key2, key3)).as(StepVerifier::create).expectNext(3L).verifyComplete();
-	}
-
-	@ParameterizedRedisTest
-	void countExistingKeysIfNotValidKeyExists() {
-		K key = keyFactory.instance();
-		redisTemplate.countExistingKeys(List.of(key)).as(StepVerifier::create).expectNext(0L).verifyComplete();
-	}
 }