Skip to content

Commit ffc6480

Browse files
mp911dejxblum
authored andcommitted
Use correct output for ZCARD command using LettuceConnection.execute(…).
We now provide a type hint for the ZCARD command. Closes #2473 Original pull request: #2482
1 parent 70ca4b2 commit ffc6480

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858

5959
import org.apache.commons.logging.Log;
6060
import org.apache.commons.logging.LogFactory;
61-
6261
import org.springframework.beans.BeanUtils;
6362
import org.springframework.core.convert.converter.Converter;
6463
import org.springframework.dao.DataAccessException;
@@ -1212,6 +1211,7 @@ static class TypeHints {
12121211
COMMAND_OUTPUT_TYPE_MAPPING.put(STRLEN, IntegerOutput.class);
12131212
COMMAND_OUTPUT_TYPE_MAPPING.put(TTL, IntegerOutput.class);
12141213
COMMAND_OUTPUT_TYPE_MAPPING.put(ZADD, IntegerOutput.class);
1214+
COMMAND_OUTPUT_TYPE_MAPPING.put(ZCARD, IntegerOutput.class);
12151215
COMMAND_OUTPUT_TYPE_MAPPING.put(ZCOUNT, IntegerOutput.class);
12161216
COMMAND_OUTPUT_TYPE_MAPPING.put(ZINTERSTORE, IntegerOutput.class);
12171217
COMMAND_OUTPUT_TYPE_MAPPING.put(ZRANK, IntegerOutput.class);

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,16 @@ void testExecuteShouldConvertArrayReplyCorrectly() {
274274
.contains("awesome".getBytes(), "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes());
275275
}
276276

277+
@Test // GH-2473
278+
void testExecuteZcardShouldReturnNumericValue() {
279+
280+
connection.zAdd("spring", 1, "awesome");
281+
connection.zAdd("spring", 1, "cool");
282+
connection.zAdd("spring", 1, "supercalifragilisticexpialidocious");
283+
284+
assertThat(connection.execute("ZCARD", "spring")).isInstanceOf(Long.class).isEqualTo(3L);
285+
}
286+
277287
@SuppressWarnings("unchecked")
278288
@Test
279289
public void testEvalShaArrayBytes() {

0 commit comments

Comments
 (0)