DATAJPA-1198 - Polishing.

Compare types using equals(…). Reformat code.

Original pull request: #428.
This commit is contained in:
Mark Paluch
2020-09-23 09:21:27 +02:00
parent f5ba26eedf
commit 48597dca24
2 changed files with 6 additions and 4 deletions

View File

@@ -236,7 +236,7 @@ public class Querydsl {
while (path != null) {
sortPropertyExpression = !path.hasNext() && order.isIgnoreCase() && String.class == path.getType() //
sortPropertyExpression = !path.hasNext() && order.isIgnoreCase() && String.class.equals(path.getType()) //
? Expressions.stringPath((Path<?>) sortPropertyExpression, path.getSegment()).lower() //
: Expressions.path(path.getType(), (Path<?>) sortPropertyExpression, path.getSegment());

View File

@@ -17,12 +17,15 @@ package org.springframework.data.jpa.repository.support;
import static org.assertj.core.api.Assertions.*;
import java.util.stream.Stream;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.sample.User;
import org.springframework.test.context.ContextConfiguration;
@@ -32,8 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.querydsl.core.types.dsl.PathBuilder;
import com.querydsl.jpa.JPQLQuery;
import java.util.stream.Stream;
/**
* Integration tests for {@link Querydsl}.
*
@@ -71,8 +72,9 @@ public class QuerydslIntegrationTests {
.doesNotContain("nulls last");
}
@Test // DATAJPA-1198; DATAJPA-1779
@Test // DATAJPA-1779
public void orderWithIgnoreCaseAddLowerOnlyStringType() {
// firstname (String); id (Integer); dateOfBirth (Date)
Sort.Order[] orders = Stream.of("firstname", "id", "dateOfBirth").map(name -> Sort.Order.asc(name).ignoreCase()).toArray(Sort.Order[]::new);
JPQLQuery<User> result = querydsl.applySorting(Sort.by(orders), userQuery);