[#3879] Rename Result.intoArray() into Result.intoArrays()

This commit is contained in:
lukaseder 2014-12-23 09:14:31 +01:00
parent b2189425e1
commit 47935ef01f
4 changed files with 15 additions and 5 deletions

View File

@ -1020,6 +1020,12 @@ public interface Result<R extends Record> extends List<R>, Attachable {
<E, S extends Record> Map<S, List<E>> intoGroups(Table<S> table, RecordMapper<? super R, E> mapper)
throws IllegalArgumentException, MappingException;
/**
* @deprecated - 3.6.0 - [#3879] - Use {@link #intoArrays()} instead.
*/
@Deprecated
Object[][] intoArray();
/**
* Convert this result into an array of arrays.
* <p>
@ -1032,13 +1038,11 @@ public interface Result<R extends Record> extends List<R>, Attachable {
* // For arbitrary values of i, j
* result.getValue(i, j) == result.intoArray()[i][j]
* </pre></code>
* <p>
* This is the same as calling <code>into(Object[].class)</code>
*
* @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.

View File

@ -1161,7 +1161,7 @@ public interface ResultQuery<R extends Record> extends Query, Iterable<R> {
*
* @return The result.
* @throws DataAccessException if something went wrong executing the query
* @see Result#intoArray()
* @see Result#intoArrays()
*/
Object[][] fetchArrays() throws DataAccessException;

View File

@ -661,7 +661,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
@Override
public final Object[][] fetchArrays() {
return fetch().intoArray();
return fetch().intoArrays();
}
@Override

View File

@ -1265,7 +1265,13 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
}
@Override
@Deprecated
public final Object[][] intoArray() {
return intoArrays();
}
@Override
public final Object[][] intoArrays() {
int size = size();
Object[][] array = new Object[size][];