CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#259 skipped null values in GLists and GSets

Browse Source
This commit is contained in:
Timo Westkämper 2012-10-30 17:23:11 +02:00
parent d2c86cafed
commit d13a92a164
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy2Test.java
View File

@ -123,7 +123,7 @@ public class GroupBy2Test {
UserDto dto2 = userDtos.get(32l);
assertEquals(3, dto2.roleIds.size());
assertEquals(3, dto2.roleNames.size());
assertEquals(1, dto2.roleNames.size());
assertEquals(3, dto2.secIds.size());
}

7
querydsl-core/src/main/java/com/mysema/query/group/GAvg.java
View File

@ -39,9 +39,12 @@ public class GAvg<T extends Number & Comparable<T>> extends AbstractGroupExpress
private BigDecimal sum = BigDecimal.ZERO;
@Override
public void add(T t) {
public void add(T t) {
count++;
sum = sum.add(new BigDecimal(t.toString()));
if (t != null) {
sum = sum.add(new BigDecimal(t.toString()));
}
}
@Override

4
querydsl-core/src/main/java/com/mysema/query/group/GList.java
View File

@ -39,7 +39,9 @@ class GList<T> extends AbstractGroupExpression<T, List<T>> {
@Override
public void add(T o) {
list.add(o);
if (o != null) {
list.add(o);
}
}
@Override

4
querydsl-core/src/main/java/com/mysema/query/group/GSet.java
View File

@ -39,7 +39,9 @@ class GSet<T> extends AbstractGroupExpression<T, Set<T>> {
@Override
public void add(T o) {
set.add(o);
if (o != null) {
set.add(o);
}
}
@Override

4
querydsl-core/src/main/java/com/mysema/query/group/GSum.java
View File

@ -39,7 +39,9 @@ public class GSum<T extends Number & Comparable<T>> extends AbstractGroupExpress
@Override
public void add(T t) {
sum = sum.add(new BigDecimal(t.toString()));
if (t != null) {
sum = sum.add(new BigDecimal(t.toString()));
}
}
@Override