diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java index e455c3eec4..0b24fbe2a8 100644 --- a/jOOQ/src/main/java/org/jooq/tools/Convert.java +++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java @@ -296,6 +296,10 @@ public final class Convert { } } + public static final U[] convertCollection(Collection from, Class to){ + return new ConvertAll(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 implements Converter { + private static class ConvertAll implements Converter { /** * 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) { diff --git a/jOOQ/src/test/java/org/jooq/tools/ConvertTest.java b/jOOQ/src/test/java/org/jooq/tools/ConvertTest.java index 3ef136e993..9158950ea6 100644 --- a/jOOQ/src/test/java/org/jooq/tools/ConvertTest.java +++ b/jOOQ/src/test/java/org/jooq/tools/ConvertTest.java @@ -28,8 +28,15 @@ public class ConvertTest { @Test public void testFromCollection(){ List 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 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(), String[].class))); } }