Skip to content

Commit

Permalink
Use Integer return type for Number return types except Double and Float.
Browse files Browse the repository at this point in the history
Lettuce's ValueOutput doesn't RESP 3 long values so we must use IntegerOutput instead.

Closes #3090
  • Loading branch information
mp911de committed Jan 13, 2025
1 parent 2bcdd36 commit 0c90dea
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ public static ReturnType fromJavaType(@Nullable Class<?> javaType) {
return ReturnType.BOOLEAN;
}

if (ClassUtils.isAssignable(Long.class, javaType)) {
if (ClassUtils.isAssignable(Double.class, javaType) || ClassUtils.isAssignable(Float.class, javaType)) {
return ReturnType.VALUE;
}

if (ClassUtils.isAssignable(Number.class, javaType)) {
return ReturnType.INTEGER;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,19 @@ class ReturnTypeUnitTests {
@ParameterizedTest // DATAREDIS-1245
@ValueSource(classes = { List.class, ArrayList.class, LinkedList.class })
void shouldConsiderListsAsMultiType(Class<?> listClass) {

assertThat(ReturnType.fromJavaType(listClass)).isEqualTo(ReturnType.MULTI);
}

@ParameterizedTest // GH-3090
@ValueSource(classes = { Integer.class, Long.class, Number.class })
void shouldConsiderIntegerType(Class<?> listClass) {
assertThat(ReturnType.fromJavaType(listClass)).isEqualTo(ReturnType.INTEGER);
}

@ParameterizedTest // GH-3090
@ValueSource(classes = { Double.class, Float.class, String.class })
void shouldConsiderValueType(Class<?> listClass) {
assertThat(ReturnType.fromJavaType(listClass)).isEqualTo(ReturnType.VALUE);
}

}

0 comments on commit 0c90dea

Please sign in to comment.