diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index 98cc9897f0..759c97af63 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -1020,6 +1020,12 @@ public interface Result extends List, Attachable { Map> intoGroups(Table table, RecordMapper mapper) throws IllegalArgumentException, MappingException; + /** + * @deprecated - 3.6.0 - [#3879] - Use {@link #intoArrays()} instead. + */ + @Deprecated + Object[][] intoArray(); + /** * Convert this result into an array of arrays. *

@@ -1032,13 +1038,11 @@ public interface Result extends List, Attachable { * // For arbitrary values of i, j * result.getValue(i, j) == result.intoArray()[i][j] * - *

- * This is the same as calling into(Object[].class) * * @return This result as an array of arrays * @see Record#intoArray() */ - Object[][] intoArray(); + Object[][] intoArrays(); /** * Return all values for a field index from the result. diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index eee3781120..e4828eecba 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -1161,7 +1161,7 @@ public interface ResultQuery extends Query, Iterable { * * @return The result. * @throws DataAccessException if something went wrong executing the query - * @see Result#intoArray() + * @see Result#intoArrays() */ Object[][] fetchArrays() throws DataAccessException; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index 35faa317ce..12e2382b2d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -661,7 +661,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple @Override public final Object[][] fetchArrays() { - return fetch().intoArray(); + return fetch().intoArrays(); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java index d673ca4674..13a2d40bf1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java @@ -1265,7 +1265,13 @@ class ResultImpl implements Result, AttachableInternal { } @Override + @Deprecated public final Object[][] intoArray() { + return intoArrays(); + } + + @Override + public final Object[][] intoArrays() { int size = size(); Object[][] array = new Object[size][];