Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Code formatting.
Adding author tags.
Added test for jdbc.
Fixed typo.

See #1744
Original pull request #1745
This commit is contained in:
Jens Schauder
2024-03-12 16:40:00 +01:00
parent 4a787171e3
commit 1600740fb7
4 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
View File

@@ -58,6 +58,7 @@ import org.springframework.util.ClassUtils;
* @author Roman Chigvintsev
* @author Manousos Mathioudakis
* @author Jens Schauder
* @author Yan Qiang
*/
public class QueryMapper {
@@ -142,15 +143,13 @@ public class QueryMapper {
SqlSort.validate(order);
OrderByField simpleOrderByField = createSimpleOrderByField(table, entity, order);
OrderByField orderBy = simpleOrderByField
.withNullHandling(order.getNullHandling());
OrderByField orderBy = simpleOrderByField.withNullHandling(order.getNullHandling());
mappedOrder.add(order.isAscending() ? orderBy.asc() : orderBy.desc());
}
return mappedOrder;
}
private OrderByField createSimpleOrderByField(Table table, RelationalPersistentEntity<?> entity, Sort.Order order) {
if (order instanceof SqlSort.SqlOrder sqlOrder && sqlOrder.isUnsafe()) {
@@ -364,7 +363,7 @@ public class QueryMapper {
Class<?> typeHint;
Comparator comparator = criteria.getComparator();
if (criteria.getValue()instanceof Parameter parameter) {
if (criteria.getValue() instanceof Parameter parameter) {
mappedValue = convertValue(comparator, parameter.getValue(), propertyField.getTypeHint());
typeHint = getTypeHint(mappedValue, actualType.getType(), parameter);
@@ -411,7 +410,8 @@ public class QueryMapper {
@Nullable
private Object convertValue(Comparator comparator, @Nullable Object value, TypeInformation<?> typeHint) {
if ((Comparator.IN.equals(comparator) || Comparator.NOT_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());