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

Removed the List wrapping.

Browse Source
This commit is contained in:
Ruben Dijkstra 2014-04-15 22:18:43 +02:00
parent 610cb634c2
commit 4b2882f2ce
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
querydsl-core/src/main/java/com/mysema/query/util/ConstructorUtils.java
View File

@ -32,7 +32,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/**
@ -191,14 +190,14 @@ public class ConstructorUtils {
@Override
public Object[] apply(Object[] args) {
Iterator<Object> iterator = Arrays
.asList(checkNotNull(args))
.iterator();
checkNotNull(args);
int current = 0;
// constructor args
Object[] cargs = new Object[paramTypes.length];
for (int i = 0; i < cargs.length - 1; i++) {
set(cargs, i, iterator.next());
set(cargs, i, args[current++]);
}
// array with vargs
int size = args.length - cargs.length + 1;
@ -206,7 +205,7 @@ public class ConstructorUtils {
componentType, size);
cargs[cargs.length - 1] = vargs;
for (int i = 0; i < Array.getLength(vargs); i++) {
set(vargs, i, iterator.next());
set(vargs, i, args[current++]);
}
return cargs;
}
@ -247,17 +246,16 @@ public class ConstructorUtils {
@Override
public Object[] apply(Object[] args) {
List<Object> argList = Arrays
.asList(checkNotNull(args));
checkNotNull(args);
for (Map.Entry<Integer, Class<?>> primitiveEntry : primitiveLocations.entrySet()) {
Integer location = primitiveEntry.getKey();
if (argList.get(location) == null) {
if (args[location] == null) {
Class<?> primitiveClass = primitiveEntry.getValue();
argList.set(location, defaultPrimitives.getInstance(primitiveClass));
args[location] = defaultPrimitives.getInstance(primitiveClass);
}
}
return argList.toArray();
return args;
}
}