Skip to content

Add NOT_IN judgment to QueryMapper's convertValue function #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Add NOT_IN judgment to QueryMapper's convertValue function #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28f376f
Add NOT_IN judgment to QueryMapper's convertValue function
yande2011 Feb 29, 2024
c294005
add convert to unit test on QueryMapper, shouldMapIsNotIn not pass o…
yande2011 Mar 4, 2024
1eeddc1
Added test cases, NotIn can also work normally with CollectionToStrin…
yande2011 Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ private Condition mapEmbeddedObjectCondition(CriteriaDefinition criteria, MapSql
@Nullable
private Object convertValue(Comparator comparator, @Nullable Object value, TypeInformation<?> typeHint) {

if (Comparator.IN.equals(comparator) && value instanceof Collection<?> collection && !collection.isEmpty()) {
if ((Comparator.IN.equals(comparator) || Comparator.NOT_IN.equals(comparator)) && value instanceof Collection<?> collection && !collection.isEmpty()) {

Collection<Object> mapped = new ArrayList<>(collection.size());

Expand Down
2 changes: 1 addition & 1 deletion spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public Parameter getBindValue(Parameter value) {
@Nullable
private Object convertValue(Comparator comparator, @Nullable Object value, TypeInformation<?> typeHint) {

if (Comparator.IN.equals(comparator) && value instanceof Collection<?> collection && !collection.isEmpty()) {
if ((Comparator.IN.equals(comparator) || Comparator.NOT_IN.equals(comparator)) && value instanceof Collection<?> collection && !collection.isEmpty()) {

Collection<Object> mapped = new ArrayList<>(collection.size());

Expand Down
31 changes: 26 additions & 5 deletions ...g-data-r2dbc/src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
import static org.mockito.Mockito.*;
import static org.springframework.data.domain.Sort.Order.*;

import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.*;

import org.junit.jupiter.api.Test;
import org.springframework.core.convert.converter.Converter;
Expand Down Expand Up @@ -59,9 +57,11 @@ class QueryMapperUnitTests {
private QueryMapper mapper = createMapper(PostgresDialect.INSTANCE);

QueryMapper createMapper(R2dbcDialect dialect) {
return createMapper(dialect, JsonNodeToStringConverter.INSTANCE, StringToJsonNodeConverter.INSTANCE);
}

R2dbcCustomConversions conversions = R2dbcCustomConversions.of(dialect, JsonNodeToStringConverter.INSTANCE,
StringToJsonNodeConverter.INSTANCE);
QueryMapper createMapper(R2dbcDialect dialect, Converter<?, ?>... converters) {
R2dbcCustomConversions conversions = R2dbcCustomConversions.of(dialect, Arrays.asList(converters));

R2dbcMappingContext context = new R2dbcMappingContext();
context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
Expand Down Expand Up @@ -358,6 +358,18 @@ void shouldMapIsNotIn() {
assertThat(bindings.getCondition()).hasToString("person.name NOT IN (?[$1], ?[$2], ?[$3])");
}

@Test
void sholdMapIsNotInWithCollectionToStringConverter() {

mapper = createMapper(PostgresDialect.INSTANCE, JsonNodeToStringConverter.INSTANCE, StringToJsonNodeConverter.INSTANCE, CollectionToStringConverter.INSTANCE);

Criteria criteria = Criteria.where("name").notIn("a", "b", "c");

BoundCondition bindings = map(criteria);

assertThat(bindings.getCondition()).hasToString("person.name NOT IN (?[$1], ?[$2], ?[$3])");
}

@Test // gh-64
void shouldMapIsGt() {

Expand Down Expand Up @@ -574,6 +586,15 @@ public String convert(JsonNode source) {
}
}

enum CollectionToStringConverter implements Converter<Collection<?>, String> {
INSTANCE;
@Override
public String convert(Collection<?> source) {
return source.toString();
}
}


enum StringToJsonNodeConverter implements Converter<String, JsonNode> {
INSTANCE;

Expand Down