Skip to content

Commit b7506bc

Browse files
vominhtriuslpandzic
authored andcommitted
refactor: apply entity projection before query customization in queryMany
1 parent c7956be commit b7506bc

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface QuerydslJdbcFragment<T> {
2727

2828
List<T> queryMany(Function<SQLQuery<?>, SQLQuery<T>> query);
2929

30-
Page<T> queryMany(Function<SQLQuery<?>, SQLQuery<T>> query, Pageable pageable);
30+
Page<T> queryMany(Function<SQLQuery<T>, SQLQuery<T>> query, Pageable pageable);
3131

3232
/**
3333
* @return amount of affected rows

infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcPredicateExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Page<T> queryMany(SQLQuery<T> query, Pageable pageable) {
188188
Assert.notNull(query, "Query must not be null!");
189189
Assert.notNull(pageable, "Pageable must not be null!");
190190

191-
var content = queryMany(querydsl.applyPagination(pageable, query).select(constructorExpression));
191+
var content = queryMany(querydsl.applyPagination(pageable, query));
192192

193193
return PageableExecutionUtils.getPage(content, pageable, query::fetchCount);
194194
}

infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/SimpleQuerydslJdbcFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ public List<T> queryMany(Function<SQLQuery<?>, SQLQuery<T>> query) {
6666
}
6767

6868
@Override
69-
public Page<T> queryMany(Function<SQLQuery<?>, SQLQuery<T>> query, Pageable pageable) {
70-
return querydslJdbcPredicateExecutor.queryMany(query.apply(sqlQueryFactory.query()), pageable);
69+
public Page<T> queryMany(Function<SQLQuery<T>, SQLQuery<T>> query, Pageable pageable) {
70+
var newQuery = sqlQueryFactory.query().select(entityProjection());
71+
return querydslJdbcPredicateExecutor.queryMany(query.apply(newQuery), pageable);
7172
}
7273

7374
@Override

0 commit comments

Comments
 (0)