github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addressed issues

Browse Source 
Added convertCollection method
This commit is contained in:
Nathan Fischer 2016-10-11 19:15:35 -07:00
parent d0385c90f3
commit b77fb5b0a6
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jOOQ/src/main/java/org/jooq/tools/Convert.java
View File

@ -296,6 +296,10 @@ public final class Convert {
}
}
public static final <U> U[] convertCollection(Collection from, Class<? extends U[]> to){
return new ConvertAll<U[]>(to).from(from);
}
/**
* Convert an object to a type.
*
@ -430,7 +434,7 @@ public final class Convert {
/**
* The converter to convert them all.
*/
static class ConvertAll<U> implements Converter<Object, U> {
private static class ConvertAll<U> implements Converter<Object, U> {
/**
* Generated UID
@ -496,6 +500,7 @@ public final class Convert {
else if (fromClass.isArray()) {
Object[] fromArray = (Object[]) from;
// [#3062] Default collections if no specific collection type was requested
if (Collection.class.isAssignableFrom(toClass) &&
toClass.isAssignableFrom(ArrayList.class)) {
return (U) new ArrayList(Arrays.asList(fromArray));
@ -517,7 +522,18 @@ public final class Convert {
else if (toClass.isArray()
&& Collection.class.isAssignableFrom(fromClass)){
Collection f = (Collection) from;
return (U) f.toArray();
Class componentType = toClass.getComponentType();
Object[] dest = (Object[]) Array.newInstance(componentType, f.size());
Object[] list = f.stream()
.map(e -> {
if (!componentType.isAssignableFrom(e.getClass()))
return convert(e, componentType);
return e;
}).toArray();
System.arraycopy(list, 0, dest, 0, dest.length);
return (U) dest;
}
else if (toClass == Optional.class) {

11
jOOQ/src/test/java/org/jooq/tools/ConvertTest.java
View File

@ -28,8 +28,15 @@ public class ConvertTest {
@Test
public void testFromCollection(){
List<String> list = asList("Hello", "world", "!");
String[] arr = new Convert.ConvertAll<>(String[].class).from(list);
String[] arr = Convert.convertCollection(list, String[].class);
assertEquals(list, asList(arr));
String[] numStrings = new String[]{"1", "2", "3"};
List<Integer> integerList = asList(1, 2, 3);
String[] convertedNumString = Convert.convertCollection(integerList, String[].class);
assertTrue(Arrays.equals(numStrings, convertedNumString));
assertTrue(Arrays.equals(new String[0], Convert.convertCollection(new LinkedList<Integer>(), String[].class)));
}
}