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

[jOOQ/jOOQ#9288] Avoid naming conflicts with j.u.s.Collectors

Browse Source
This commit is contained in:
Lukas Eder 2021-05-17 10:12:06 +02:00
parent 90c1d98536
commit 02296fc206
3 changed files with 133 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jOOQ/src/main/java/org/jooq/Records.java
View File

@ -95,7 +95,7 @@ public final class Records {
* .fetch(BOOK.TITLE);
* </pre></code>
*/
public static final <E, R extends Record1<E>> Collector<R, ?, List<E>> toList() {
public static final <E, R extends Record1<E>> Collector<R, ?, List<E>> intoList() {
return Collectors.mapping(Record1::value1, Collectors.toCollection(ArrayList::new));
}
@ -121,7 +121,7 @@ public final class Records {
* .fetch(BOOK.TITLE);
* </pre></code>
*/
public static final <E, R extends Record> Collector<R, ?, List<E>> toList(Function<? super R, ? extends E> function) {
public static final <E, R extends Record> Collector<R, ?, List<E>> intoList(Function<? super R, ? extends E> function) {
return Collectors.mapping(function, Collectors.toCollection(ArrayList::new));
}
@ -149,8 +149,8 @@ public final class Records {
* .fetchSet(BOOK.TITLE);
* </pre></code>
*/
public static final <E, R extends Record1<E>> Collector<R, ?, Set<E>> toSet() {
return toSet(Record1::value1);
public static final <E, R extends Record1<E>> Collector<R, ?, Set<E>> intoSet() {
return intoSet(Record1::value1);
}
/**
@ -175,7 +175,7 @@ public final class Records {
* .fetchSet(BOOK.TITLE);
* </pre></code>
*/
public static final <E, R extends Record> Collector<R, ?, Set<E>> toSet(Function<? super R, ? extends E> function) {
public static final <E, R extends Record> Collector<R, ?, Set<E>> intoSet(Function<? super R, ? extends E> function) {
return Collectors.mapping(function, Collectors.toCollection(LinkedHashSet::new));
}
@ -206,8 +206,8 @@ public final class Records {
* .fetchMap(BOOK.ID, BOOK.TITLE);
* </pre></code>
*/
public static final <K, V, R extends Record2<K, V>> Collector<R, ?, Map<K, V>> toMap() {
return toMap(Record2::value1, Record2::value2);
public static final <K, V, R extends Record2<K, V>> Collector<R, ?, Map<K, V>> intoMap() {
return intoMap(Record2::value1, Record2::value2);
}
/**
@ -236,8 +236,8 @@ public final class Records {
* .fetchMap(BOOK.ID);
* </pre></code>
*/
public static final <K, R extends Record> Collector<R, ?, Map<K, R>> toMap(Function<? super R, ? extends K> keyMapper) {
return toMap(keyMapper, r -> r);
public static final <K, R extends Record> Collector<R, ?, Map<K, R>> intoMap(Function<? super R, ? extends K> keyMapper) {
return intoMap(keyMapper, r -> r);
}
/**
@ -267,7 +267,7 @@ public final class Records {
* .fetchMap(BOOK.ID, BOOK.TITLE);
* </pre></code>
*/
public static final <K, V, R extends Record> Collector<R, ?, Map<K, V>> toMap(
public static final <K, V, R extends Record> Collector<R, ?, Map<K, V>> intoMap(
Function<? super R, ? extends K> keyMapper,
Function<? super R, ? extends V> valueMapper
) {
@ -305,8 +305,8 @@ public final class Records {
* .fetchGroups(BOOK.ID, BOOK.TITLE);
* </pre></code>
*/
public static final <K, V, R extends Record2<K, V>> Collector<R, ?, Map<K, List<V>>> toGroups() {
return toGroups(Record2::value1, Record2::value2);
public static final <K, V, R extends Record2<K, V>> Collector<R, ?, Map<K, List<V>>> intoGroups() {
return intoGroups(Record2::value1, Record2::value2);
}
/**
@ -334,7 +334,7 @@ public final class Records {
* </pre></code>
*/
@SuppressWarnings("unchecked")
public static final <K, R extends Record> Collector<R, ?, Map<K, Result<R>>> toGroups(Function<? super R, ? extends K> keyMapper) {
public static final <K, R extends Record> Collector<R, ?, Map<K, Result<R>>> intoGroups(Function<? super R, ? extends K> keyMapper) {
return Collectors.groupingBy(
keyMapper,
LinkedHashMap::new,
@ -379,7 +379,7 @@ public final class Records {
* .fetchGroups(BOOK.ID, BOOK.TITLE);
* </pre></code>
*/
public static final <K, V, R extends Record> Collector<R, ?, Map<K, List<V>>> toGroups(
public static final <K, V, R extends Record> Collector<R, ?, Map<K, List<V>>> intoGroups(
Function<? super R, ? extends K> keyMapper,
Function<? super R, ? extends V> valueMapper
) {

127
jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
View File

@ -38,10 +38,7 @@
package org.jooq.impl;
import static org.jooq.Records.toGroups;
import static org.jooq.Records.toList;
import static org.jooq.Records.toMap;
import static org.jooq.Records.toSet;
import static org.jooq.Records.intoList;
import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.converterOrFail;
import static org.jooq.impl.Tools.indexOrFail;
@ -183,7 +180,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <T> List<T> getValues(Field<T> field) {
return collect(toList(recordType().mapper(field)));
return collect(intoList(recordType().mapper(field)));
}
@Override
@ -200,7 +197,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final List<?> getValues(int fieldIndex) {
return collect(toList(recordType().mapper(fieldIndex)));
return collect(intoList(recordType().mapper(fieldIndex)));
}
@Override
@ -218,7 +215,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final List<?> getValues(String fieldName) {
return collect(toList(recordType().mapper(fieldName)));
return collect(intoList(recordType().mapper(fieldName)));
}
@Override
@ -235,7 +232,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final List<?> getValues(Name fieldName) {
return collect(toList(recordType().mapper(fieldName)));
return collect(intoList(recordType().mapper(fieldName)));
}
@Override
@ -261,42 +258,42 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <K> Map<K, R> intoMap(Field<K> key) {
return collect(toMap(recordType().mapper(key)));
return collect(Records.intoMap(recordType().mapper(key)));
}
@Override
public final Map<?, R> intoMap(int keyFieldIndex) {
return collect(toMap(recordType().mapper(keyFieldIndex)));
return collect(Records.intoMap(recordType().mapper(keyFieldIndex)));
}
@Override
public final Map<?, R> intoMap(String keyFieldName) {
return collect(toMap(recordType().mapper(keyFieldName)));
return collect(Records.intoMap(recordType().mapper(keyFieldName)));
}
@Override
public final Map<?, R> intoMap(Name keyFieldName) {
return collect(toMap(recordType().mapper(keyFieldName)));
return collect(Records.intoMap(recordType().mapper(keyFieldName)));
}
@Override
public final <K, V> Map<K, V> intoMap(Field<K> key, Field<V> value) {
return collect(toMap(recordType().mapper(key), recordType().mapper(value)));
return collect(Records.intoMap(recordType().mapper(key), recordType().mapper(value)));
}
@Override
public final Map<?, ?> intoMap(int keyFieldIndex, int valueFieldIndex) {
return collect(toMap(recordType().mapper(keyFieldIndex), recordType().mapper(valueFieldIndex)));
return collect(Records.intoMap(recordType().mapper(keyFieldIndex), recordType().mapper(valueFieldIndex)));
}
@Override
public final Map<?, ?> intoMap(String keyFieldName, String valueFieldName) {
return collect(toMap(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
return collect(Records.intoMap(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
}
@Override
public final Map<?, ?> intoMap(Name keyFieldName, Name valueFieldName) {
return collect(toMap(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
return collect(Records.intoMap(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
}
@Override
@ -424,172 +421,172 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <K> Map<K, R> intoMap(Class<? extends K> keyType) {
return collect(toMap(recordType().mapper(Tools.configuration(this), keyType)));
return collect(Records.intoMap(recordType().mapper(Tools.configuration(this), keyType)));
}
@Override
public final <K, V> Map<K, V> intoMap(Class<? extends K> keyType, Class<? extends V> valueType) {
return collect(toMap(recordType().mapper(Tools.configuration(this), keyType), recordType().mapper(Tools.configuration(this), valueType)));
return collect(Records.intoMap(recordType().mapper(Tools.configuration(this), keyType), recordType().mapper(Tools.configuration(this), valueType)));
}
@Override
public final <K, V> Map<K, V> intoMap(Class<? extends K> keyType, RecordMapper<? super R, V> valueMapper) {
return collect(toMap(recordType().mapper(Tools.configuration(this), keyType), valueMapper));
return collect(Records.intoMap(recordType().mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
public final <K> Map<K, R> intoMap(RecordMapper<? super R, K> keyMapper) {
return collect(toMap(keyMapper));
return collect(Records.intoMap(keyMapper));
}
@Override
public final <K, V> Map<K, V> intoMap(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(toMap(keyMapper, recordType().mapper(Tools.configuration(this), valueType)));
return collect(Records.intoMap(keyMapper, recordType().mapper(Tools.configuration(this), valueType)));
}
@Override
public final <K, V> Map<K, V> intoMap(RecordMapper<? super R, K> keyMapper, RecordMapper<? super R, V> valueMapper) {
return collect(toMap(keyMapper, valueMapper));
return collect(Records.intoMap(keyMapper, valueMapper));
}
@Override
public final <S extends Record> Map<S, R> intoMap(Table<S> table) {
return collect(toMap(recordType().mapper(table)));
return collect(Records.intoMap(recordType().mapper(table)));
}
@Override
public final <S extends Record, T extends Record> Map<S, T> intoMap(Table<S> keyTable, Table<T> valueTable) {
return collect(toMap(recordType().mapper(keyTable), recordType().mapper(valueTable)));
return collect(Records.intoMap(recordType().mapper(keyTable), recordType().mapper(valueTable)));
}
@Override
public final <E, S extends Record> Map<S, E> intoMap(Table<S> table, Class<? extends E> type) {
return collect(toMap(recordType().mapper(table), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(recordType().mapper(table), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E, S extends Record> Map<S, E> intoMap(Table<S> table, RecordMapper<? super R, E> mapper) {
return collect(toMap(recordType().mapper(table), mapper));
return collect(Records.intoMap(recordType().mapper(table), mapper));
}
@Override
public final <E> Map<?, E> intoMap(int keyFieldIndex, Class<? extends E> type) {
return collect(toMap(recordType().mapper(keyFieldIndex), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(recordType().mapper(keyFieldIndex), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E> Map<?, E> intoMap(String keyFieldName, Class<? extends E> type) {
return collect(toMap(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E> Map<?, E> intoMap(Name keyFieldName, Class<? extends E> type) {
return collect(toMap(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <K, E> Map<K, E> intoMap(Field<K> key, Class<? extends E> type) {
return collect(toMap(recordType().mapper(key), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(recordType().mapper(key), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E> Map<?, E> intoMap(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(toMap(recordType().mapper(keyFieldIndex), mapper));
return collect(Records.intoMap(recordType().mapper(keyFieldIndex), mapper));
}
@Override
public final <E> Map<?, E> intoMap(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toMap(recordType().mapper(keyFieldName), mapper));
return collect(Records.intoMap(recordType().mapper(keyFieldName), mapper));
}
@Override
public final <E> Map<?, E> intoMap(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toMap(recordType().mapper(keyFieldName), mapper));
return collect(Records.intoMap(recordType().mapper(keyFieldName), mapper));
}
@Override
public final <K, E> Map<K, E> intoMap(Field<K> key, RecordMapper<? super R, E> mapper) {
return collect(toMap(recordType().mapper(key), mapper));
return collect(Records.intoMap(recordType().mapper(key), mapper));
}
@Override
public final <K> Map<K, Result<R>> intoGroups(Field<K> key) {
return collect(toGroups(recordType().mapper(key)));
return collect(Records.intoGroups(recordType().mapper(key)));
}
@Override
public final Map<?, Result<R>> intoGroups(int keyFieldIndex) {
return collect(toGroups(recordType().mapper(keyFieldIndex)));
return collect(Records.intoGroups(recordType().mapper(keyFieldIndex)));
}
@Override
public final Map<?, Result<R>> intoGroups(String keyFieldName) {
return collect(toGroups(recordType().mapper(keyFieldName)));
return collect(Records.intoGroups(recordType().mapper(keyFieldName)));
}
@Override
public final Map<?, Result<R>> intoGroups(Name keyFieldName) {
return collect(toGroups(recordType().mapper(keyFieldName)));
return collect(Records.intoGroups(recordType().mapper(keyFieldName)));
}
@Override
public final <K, V> Map<K, List<V>> intoGroups(Field<K> key, Field<V> value) {
return collect(toGroups(recordType().mapper(key), recordType().mapper(value)));
return collect(Records.intoGroups(recordType().mapper(key), recordType().mapper(value)));
}
@Override
public final Map<?, List<?>> intoGroups(int keyFieldIndex, int valueFieldIndex) {
return (Map) collect(toGroups(recordType().mapper(keyFieldIndex), recordType().mapper(valueFieldIndex)));
return (Map) collect(Records.intoGroups(recordType().mapper(keyFieldIndex), recordType().mapper(valueFieldIndex)));
}
@Override
public final Map<?, List<?>> intoGroups(String keyFieldName, String valueFieldName) {
return (Map) collect(toGroups(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
return (Map) collect(Records.intoGroups(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
}
@Override
public final Map<?, List<?>> intoGroups(Name keyFieldName, Name valueFieldName) {
return (Map) collect(toGroups(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
return (Map) collect(Records.intoGroups(recordType().mapper(keyFieldName), recordType().mapper(valueFieldName)));
}
@Override
public final <E> Map<?, List<E>> intoGroups(int keyFieldIndex, Class<? extends E> type) {
return collect(toGroups(recordType().mapper(keyFieldIndex), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(recordType().mapper(keyFieldIndex), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E> Map<?, List<E>> intoGroups(String keyFieldName, Class<? extends E> type) {
return collect(toGroups(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E> Map<?, List<E>> intoGroups(Name keyFieldName, Class<? extends E> type) {
return collect(toGroups(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(recordType().mapper(keyFieldName), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <K, E> Map<K, List<E>> intoGroups(Field<K> key, Class<? extends E> type) {
return collect(toGroups(recordType().mapper(key), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(recordType().mapper(key), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <K, E> Map<K, List<E>> intoGroups(Field<K> key, RecordMapper<? super R, E> mapper) {
return collect(toGroups(recordType().mapper(key), mapper));
return collect(Records.intoGroups(recordType().mapper(key), mapper));
}
@Override
public final <E> Map<?, List<E>> intoGroups(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(toGroups(recordType().mapper(keyFieldIndex), mapper));
return collect(Records.intoGroups(recordType().mapper(keyFieldIndex), mapper));
}
@Override
public final <E> Map<?, List<E>> intoGroups(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toGroups(recordType().mapper(keyFieldName), mapper));
return collect(Records.intoGroups(recordType().mapper(keyFieldName), mapper));
}
@Override
public final <E> Map<?, List<E>> intoGroups(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toGroups(recordType().mapper(keyFieldName), mapper));
return collect(Records.intoGroups(recordType().mapper(keyFieldName), mapper));
}
@Override
@ -715,42 +712,42 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <K> Map<K, Result<R>> intoGroups(Class<? extends K> keyType) {
return collect(toGroups(recordType().mapper(Tools.configuration(this), keyType)));
return collect(Records.intoGroups(recordType().mapper(Tools.configuration(this), keyType)));
}
@Override
public final <K, V> Map<K, List<V>> intoGroups(Class<? extends K> keyType, Class<? extends V> valueType) {
return collect(toGroups(recordType().mapper(Tools.configuration(this), keyType), recordType().mapper(Tools.configuration(this), valueType)));
return collect(Records.intoGroups(recordType().mapper(Tools.configuration(this), keyType), recordType().mapper(Tools.configuration(this), valueType)));
}
@Override
public final <K, V> Map<K, List<V>> intoGroups(Class<? extends K> keyType, RecordMapper<? super R, V> valueMapper) {
return collect(toGroups(recordType().mapper(Tools.configuration(this), keyType), valueMapper));
return collect(Records.intoGroups(recordType().mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
public final <K> Map<K, Result<R>> intoGroups(RecordMapper<? super R, K> keyMapper) {
return collect(toGroups(keyMapper));
return collect(Records.intoGroups(keyMapper));
}
@Override
public final <K, V> Map<K, List<V>> intoGroups(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(toGroups(keyMapper, recordType().mapper(Tools.configuration(this), valueType)));
return collect(Records.intoGroups(keyMapper, recordType().mapper(Tools.configuration(this), valueType)));
}
@Override
public final <K, V> Map<K, List<V>> intoGroups(RecordMapper<? super R, K> keyMapper, RecordMapper<? super R, V> valueMapper) {
return collect(toGroups(keyMapper, valueMapper));
return collect(Records.intoGroups(keyMapper, valueMapper));
}
@Override
public final <S extends Record> Map<S, Result<R>> intoGroups(Table<S> table) {
return collect(toGroups(recordType().mapper(table)));
return collect(Records.intoGroups(recordType().mapper(table)));
}
@Override
public final <S extends Record, T extends Record> Map<S, Result<T>> intoGroups(Table<S> keyTable, Table<T> valueTable) {
// [#9288] TODO: Can't use collect(toGroups(recordType().mapper(keyTable), recordType().mapper(valueTable))) yet
// [#9288] TODO: Can't use collect(Records.intoGroups(recordType().mapper(keyTable), recordType().mapper(valueTable))) yet
Map<S, Result<T>> map = new LinkedHashMap<>();
for (R record : this)
@ -761,12 +758,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <E, S extends Record> Map<S, List<E>> intoGroups(Table<S> table, Class<? extends E> type) {
return collect(toGroups(recordType().mapper(table), recordType().mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(recordType().mapper(table), recordType().mapper(Tools.configuration(this), type)));
}
@Override
public final <E, S extends Record> Map<S, List<E>> intoGroups(Table<S> table, RecordMapper<? super R, E> mapper) {
return collect(toGroups(recordType().mapper(table), mapper));
return collect(Records.intoGroups(recordType().mapper(table), mapper));
}
@Override
@ -842,12 +839,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <E> Set<E> intoSet(RecordMapper<? super R, E> mapper) {
return collect(toSet(mapper));
return collect(Records.intoSet(mapper));
}
@Override
public final Set<?> intoSet(int fieldIndex) {
return collect(toSet(recordType().mapper(fieldIndex)));
return collect(Records.intoSet(recordType().mapper(fieldIndex)));
}
@Override
@ -864,7 +861,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final Set<?> intoSet(String fieldName) {
return collect(toSet(recordType().mapper(fieldName)));
return collect(Records.intoSet(recordType().mapper(fieldName)));
}
@Override
@ -881,7 +878,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final Set<?> intoSet(Name fieldName) {
return collect(toSet(recordType().mapper(fieldName)));
return collect(Records.intoSet(recordType().mapper(fieldName)));
}
@Override
@ -898,7 +895,7 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <T> Set<T> intoSet(Field<T> field) {
return collect(toSet(recordType().mapper(field)));
return collect(Records.intoSet(recordType().mapper(field)));
}
@Override

117
jOOQ/src/main/java/org/jooq/impl/ResultQueryTrait.java
View File

@ -37,9 +37,6 @@
*/
package org.jooq.impl;
import static org.jooq.Records.toGroups;
import static org.jooq.Records.toMap;
import static org.jooq.Records.toSet;
import static org.jooq.impl.Tools.blocking;
import java.lang.reflect.Array;
@ -786,82 +783,82 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, R> fetchMap(Field<K> key) {
return collect(toMap(mapper(key)));
return collect(Records.intoMap(mapper(key)));
}
@Override
default Map<?, R> fetchMap(int keyFieldIndex) {
return collect(toMap(mapper(keyFieldIndex)));
return collect(Records.intoMap(mapper(keyFieldIndex)));
}
@Override
default Map<?, R> fetchMap(String keyFieldName) {
return collect(toMap(mapper(keyFieldName)));
return collect(Records.intoMap(mapper(keyFieldName)));
}
@Override
default Map<?, R> fetchMap(Name keyFieldName) {
return collect(toMap(mapper(keyFieldName)));
return collect(Records.intoMap(mapper(keyFieldName)));
}
@Override
default <K, V> Map<K, V> fetchMap(Field<K> key, Field<V> value) {
return collect(toMap(mapper(key), mapper(value)));
return collect(Records.intoMap(mapper(key), mapper(value)));
}
@Override
default Map<?, ?> fetchMap(int keyFieldIndex, int valueFieldIndex) {
return collect(toMap(mapper(keyFieldIndex), mapper(valueFieldIndex)));
return collect(Records.intoMap(mapper(keyFieldIndex), mapper(valueFieldIndex)));
}
@Override
default Map<?, ?> fetchMap(String keyFieldName, String valueFieldName) {
return collect(toMap(mapper(keyFieldName), mapper(valueFieldName)));
return collect(Records.intoMap(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default Map<?, ?> fetchMap(Name keyFieldName, Name valueFieldName) {
return collect(toMap(mapper(keyFieldName), mapper(valueFieldName)));
return collect(Records.intoMap(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default <K, E> Map<K, E> fetchMap(Field<K> key, Class<? extends E> type) {
return collect(toMap(mapper(key), mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(mapper(key), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(int keyFieldIndex, Class<? extends E> type) {
return collect(toMap(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(String keyFieldName, Class<? extends E> type) {
return collect(toMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(Name keyFieldName, Class<? extends E> type) {
return collect(toMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <K, E> Map<K, E> fetchMap(Field<K> key, RecordMapper<? super R, E> mapper) {
return collect(toMap(mapper(key), mapper));
return collect(Records.intoMap(mapper(key), mapper));
}
@Override
default <E> Map<?, E> fetchMap(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(toMap(mapper(keyFieldIndex), mapper));
return collect(Records.intoMap(mapper(keyFieldIndex), mapper));
}
@Override
default <E> Map<?, E> fetchMap(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toMap(mapper(keyFieldName), mapper));
return collect(Records.intoMap(mapper(keyFieldName), mapper));
}
@Override
default <E> Map<?, E> fetchMap(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toMap(mapper(keyFieldName), mapper));
return collect(Records.intoMap(mapper(keyFieldName), mapper));
}
@Override
@ -946,52 +943,52 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, R> fetchMap(Class<? extends K> keyType) {
return collect(toMap(mapper(Tools.configuration(this), keyType)));
return collect(Records.intoMap(mapper(Tools.configuration(this), keyType)));
}
@Override
default <K, V> Map<K, V> fetchMap(Class<? extends K> keyType, Class<? extends V> valueType) {
return collect(toMap(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
return collect(Records.intoMap(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
}
@Override
default <K, V> Map<K, V> fetchMap(Class<? extends K> keyType, RecordMapper<? super R, V> valueMapper) {
return collect(toMap(mapper(Tools.configuration(this), keyType), valueMapper));
return collect(Records.intoMap(mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
default <K> Map<K, R> fetchMap(RecordMapper<? super R, K> keyMapper) {
return collect(toMap(keyMapper));
return collect(Records.intoMap(keyMapper));
}
@Override
default <K, V> Map<K, V> fetchMap(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(toMap(keyMapper, mapper(Tools.configuration(this), valueType)));
return collect(Records.intoMap(keyMapper, mapper(Tools.configuration(this), valueType)));
}
@Override
default <K, V> Map<K, V> fetchMap(RecordMapper<? super R, K> keyMapper, RecordMapper<? super R, V> valueMapper) {
return collect(toMap(keyMapper, valueMapper));
return collect(Records.intoMap(keyMapper, valueMapper));
}
@Override
default <S extends Record> Map<S, R> fetchMap(Table<S> table) {
return collect(toMap(mapper(table)));
return collect(Records.intoMap(mapper(table)));
}
@Override
default <S extends Record, T extends Record> Map<S, T> fetchMap(Table<S> keyTable, Table<T> valueTable) {
return collect(toMap(mapper(keyTable), mapper(valueTable)));
return collect(Records.intoMap(mapper(keyTable), mapper(valueTable)));
}
@Override
default <E, S extends Record> Map<S, E> fetchMap(Table<S> table, Class<? extends E> type) {
return collect(toMap(mapper(table), mapper(Tools.configuration(this), type)));
return collect(Records.intoMap(mapper(table), mapper(Tools.configuration(this), type)));
}
@Override
default <E, S extends Record> Map<S, E> fetchMap(Table<S> table, RecordMapper<? super R, E> mapper) {
return collect(toMap(mapper(table), mapper));
return collect(Records.intoMap(mapper(table), mapper));
}
@Override
@ -1001,82 +998,82 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, Result<R>> fetchGroups(Field<K> key) {
return collect(toGroups(mapper(key)));
return collect(Records.intoGroups(mapper(key)));
}
@Override
default Map<?, Result<R>> fetchGroups(int keyFieldIndex) {
return collect(toGroups(mapper(keyFieldIndex)));
return collect(Records.intoGroups(mapper(keyFieldIndex)));
}
@Override
default Map<?, Result<R>> fetchGroups(String keyFieldName) {
return collect(toGroups(mapper(keyFieldName)));
return collect(Records.intoGroups(mapper(keyFieldName)));
}
@Override
default Map<?, Result<R>> fetchGroups(Name keyFieldName) {
return collect(toGroups(mapper(keyFieldName)));
return collect(Records.intoGroups(mapper(keyFieldName)));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(Field<K> key, Field<V> value) {
return collect(toGroups(mapper(key), mapper(value)));
return collect(Records.intoGroups(mapper(key), mapper(value)));
}
@Override
default Map<?, List<?>> fetchGroups(int keyFieldIndex, int valueFieldIndex) {
return (Map) collect(toGroups(mapper(keyFieldIndex), mapper(valueFieldIndex)));
return (Map) collect(Records.intoGroups(mapper(keyFieldIndex), mapper(valueFieldIndex)));
}
@Override
default Map<?, List<?>> fetchGroups(String keyFieldName, String valueFieldName) {
return (Map) collect(toGroups(mapper(keyFieldName), mapper(valueFieldName)));
return (Map) collect(Records.intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default Map<?, List<?>> fetchGroups(Name keyFieldName, Name valueFieldName) {
return (Map) collect(toGroups(mapper(keyFieldName), mapper(valueFieldName)));
return (Map) collect(Records.intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default <K, E> Map<K, List<E>> fetchGroups(Field<K> key, Class<? extends E> type) {
return collect(toGroups(mapper(key), mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(mapper(key), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(int keyFieldIndex, Class<? extends E> type) {
return collect(toGroups(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(String keyFieldName, Class<? extends E> type) {
return collect(toGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(Name keyFieldName, Class<? extends E> type) {
return collect(toGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <K, E> Map<K, List<E>> fetchGroups(Field<K> key, RecordMapper<? super R, E> mapper) {
return collect(toGroups(mapper(key), mapper));
return collect(Records.intoGroups(mapper(key), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(toGroups(mapper(keyFieldIndex), mapper));
return collect(Records.intoGroups(mapper(keyFieldIndex), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toGroups(mapper(keyFieldName), mapper));
return collect(Records.intoGroups(mapper(keyFieldName), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(toGroups(mapper(keyFieldName), mapper));
return collect(Records.intoGroups(mapper(keyFieldName), mapper));
}
@Override
@ -1161,53 +1158,53 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, Result<R>> fetchGroups(Class<? extends K> keyType) {
return collect(toGroups(mapper(Tools.configuration(this), keyType)));
return collect(Records.intoGroups(mapper(Tools.configuration(this), keyType)));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(Class<? extends K> keyType, Class<? extends V> valueType) {
return collect(toGroups(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
return collect(Records.intoGroups(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(Class<? extends K> keyType, RecordMapper<? super R, V> valueMapper) {
return collect(toGroups(mapper(Tools.configuration(this), keyType), valueMapper));
return collect(Records.intoGroups(mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
default <K> Map<K, Result<R>> fetchGroups(RecordMapper<? super R, K> keyMapper) {
return collect(toGroups(keyMapper));
return collect(Records.intoGroups(keyMapper));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(toGroups(keyMapper, mapper(Tools.configuration(this), valueType)));
return collect(Records.intoGroups(keyMapper, mapper(Tools.configuration(this), valueType)));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(RecordMapper<? super R, K> keyMapper, RecordMapper<? super R, V> valueMapper) {
return collect(toGroups(keyMapper, valueMapper));
return collect(Records.intoGroups(keyMapper, valueMapper));
}
@Override
default <S extends Record> Map<S, Result<R>> fetchGroups(Table<S> table) {
return collect(toGroups(mapper(table)));
return collect(Records.intoGroups(mapper(table)));
}
@Override
default <S extends Record, T extends Record> Map<S, Result<T>> fetchGroups(Table<S> keyTable, Table<T> valueTable) {
// [#9288] TODO: Can't use collect(toGroups(recordType().mapper(keyTable), recordType().mapper(valueTable))) yet
// [#9288] TODO: Can't use collect(Records.intoGroups(recordType().mapper(keyTable), recordType().mapper(valueTable))) yet
return fetch().intoGroups(keyTable, valueTable);
}
@Override
default <E, S extends Record> Map<S, List<E>> fetchGroups(Table<S> table, Class<? extends E> type) {
return collect(toGroups(mapper(table), mapper(Tools.configuration(this), type)));
return collect(Records.intoGroups(mapper(table), mapper(Tools.configuration(this), type)));
}
@Override
default <E, S extends Record> Map<S, List<E>> fetchGroups(Table<S> table, RecordMapper<? super R, E> mapper) {
return collect(toGroups(mapper(table), mapper));
return collect(Records.intoGroups(mapper(table), mapper));
}
@Override
@ -1298,12 +1295,12 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <E> Set<E> fetchSet(RecordMapper<? super R, E> mapper) {
return collect(toSet(mapper));
return collect(Records.intoSet(mapper));
}
@Override
default Set<?> fetchSet(int fieldIndex) {
return collect(toSet(mapper(fieldIndex)));
return collect(Records.intoSet(mapper(fieldIndex)));
}
@Override
@ -1320,7 +1317,7 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default Set<?> fetchSet(String fieldName) {
return collect(toSet(mapper(fieldName)));
return collect(Records.intoSet(mapper(fieldName)));
}
@Override
@ -1337,7 +1334,7 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default Set<?> fetchSet(Name fieldName) {
return collect(toSet(mapper(fieldName)));
return collect(Records.intoSet(mapper(fieldName)));
}
@Override
@ -1354,7 +1351,7 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <T> Set<T> fetchSet(Field<T> field) {
return collect(toSet(mapper(field)));
return collect(Records.intoSet(mapper(field)));
}
@Override