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

[jOOQ/jOOQ#9288] More refactorings to reuse collect()

Browse Source 
- In Result.intoSet()
- In Result.getValues()
- In ResultQuery.fetch()
- In ResultQuery.fetchSet()
This commit is contained in:
Lukas Eder 2021-05-17 16:17:55 +02:00
parent 0cc3a86704
commit bb3f3e30ea
4 changed files with 242 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java
View File

@ -40,6 +40,7 @@ package org.jooq.impl;
import static org.jooq.impl.QueryPartListView.wrap;
import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.converterOrFail;
import static org.jooq.impl.Tools.indexOrFail;
import static org.jooq.impl.Tools.map;
@ -52,6 +53,7 @@ import java.util.stream.Stream;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.Converter;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.Name;
@ -93,21 +95,64 @@ final class FieldsImpl<R extends Record> extends AbstractQueryPart implements Re
return r -> r.get(fieldIndex);
}
@Override
public final <U> RecordMapper<R, U> mapper(int fieldIndex, Configuration configuration, Class<? extends U> type) {
return mapper(fieldIndex, configuration.converterProvider().provide(field(fieldIndex).getType(), type));
}
@Override
public final <U> RecordMapper<R, U> mapper(int fieldIndex, Converter<?, ? extends U> converter) {
return r -> r.get(fieldIndex, converter);
}
@Override
public final RecordMapper<R, ?> mapper(String fieldName) {
return mapper(field(fieldName));
}
@Override
public final <U> RecordMapper<R, U> mapper(String fieldName, Configuration configuration, Class<? extends U> type) {
return mapper(fieldName, converterOrFail(configuration, field(fieldName).getType(), type));
}
@Override
public final <U> RecordMapper<R, U> mapper(String fieldName, Converter<?, ? extends U> converter) {
return r -> r.get(fieldName, converter);
}
@Override
public final RecordMapper<R, ?> mapper(Name fieldName) {
return mapper(field(fieldName));
}
@Override
public final <U> RecordMapper<R, U> mapper(Name fieldName, Configuration configuration, Class<? extends U> type) {
return mapper(fieldName, converterOrFail(configuration, field(fieldName).getType(), type));
}
@Override
public final <U> RecordMapper<R, U> mapper(Name fieldName, Converter<?, ? extends U> converter) {
return r -> r.get(fieldName, converter);
}
@SuppressWarnings("unchecked")
@Override
public final <T> RecordMapper<R, T> mapper(Field<T> field) {
return (RecordMapper<R, T>) mapper(indexOrFail(fieldsRow(), field));
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public final <U> RecordMapper<R, U> mapper(Field<?> field, Configuration configuration, Class<? extends U> type) {
return mapper(field, (Converter) converterOrFail(configuration, field.getType(), type));
}
@SuppressWarnings("unchecked")
@Override
public final <T, U> RecordMapper<R, U> mapper(Field<T> field, Converter<? super T, ? extends U> converter) {
return (RecordMapper<R, U>) mapper(indexOrFail(fieldsRow(), field), converter);
}
@Override
public final <S extends Record> RecordMapper<R, S> mapper(Table<S> table) {
return r -> r.into(table);

57
jOOQ/src/main/java/org/jooq/impl/Mappable.java
View File

@ -38,6 +38,7 @@
package org.jooq.impl;
import org.jooq.Configuration;
import org.jooq.Converter;
import org.jooq.Field;
import org.jooq.Name;
import org.jooq.Record;
@ -60,24 +61,80 @@ interface Mappable<R extends Record> {
@NotNull
RecordMapper<R, ?> mapper(int fieldIndex);
/**
* Create a record mapper that extracts a value by field index and converts
* it using the {@link Configuration#converterProvider()}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(int fieldIndex, Configuration configuration, Class<? extends U> type);
/**
* Create a record mapper that extracts a value by field index and converts
* it using a {@link Converter}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(int fieldIndex, Converter<?, ? extends U> converter);
/**
* Create a record mapper that extracts a value by field name.
*/
@NotNull
RecordMapper<R, ?> mapper(String fieldName);
/**
* Create a record mapper that extracts a value by field name and converts
* it using the {@link Configuration#converterProvider()}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(String fieldName, Configuration configuration, Class<? extends U> type);
/**
* Create a record mapper that extracts a value by field name and converts
* it using a {@link Converter}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(String fieldName, Converter<?, ? extends U> converter);
/**
* Create a record mapper that extracts a value by field name.
*/
@NotNull
RecordMapper<R, ?> mapper(Name fieldName);
/**
* Create a record mapper that extracts a value by field name and converts
* it using the {@link Configuration#converterProvider()}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(Name fieldName, Configuration configuration, Class<? extends U> type);
/**
* Create a record mapper that extracts a value by field name and converts
* it using a {@link Converter}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(Name fieldName, Converter<?, ? extends U> converter);
/**
* Create a record mapper that extracts a value by field reference.
*/
@NotNull
<T> RecordMapper<R, T> mapper(Field<T> field);
/**
* Create a record mapper that extracts a value by field reference and converts
* it using the {@link Configuration#converterProvider()}.
*/
@NotNull
<U> RecordMapper<R, U> mapper(Field<?> field, Configuration configuration, Class<? extends U> type);
/**
* Create a record mapper that extracts a value by field reference and
* converts it using a {@link Converter}.
*/
@NotNull
<T, U> RecordMapper<R, U> mapper(Field<T> field, Converter<? super T, ? extends U> converter);
/**
* Create a record mapper that maps records to a new
* {@link RecordQualifier#getRecordType()}.

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

@ -185,14 +185,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> List<U> getValues(Field<?> field, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return getValues(indexOrFail(fieldsRow(), field), type);
return collect(intoList(recordType().mapper(field, Tools.configuration(this), type)));
}
@Override
public final <T, U> List<U> getValues(Field<T> field, Converter<? super T, ? extends U> converter) {
// [#9288] TODO: Refactor this
return Convert.convert(getValues(field), converter);
return collect(intoList(recordType().mapper(field, converter)));
}
@Override
@ -202,15 +200,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> List<U> getValues(int fieldIndex, Class<? extends U> type) {
// [#9288] TODO: Refactor this
Converter converter = converterOrFail(this, field(safeIndex(fieldIndex)).getType(), (Class) type);
return Tools.map(this, r -> (U) converter.from(r.get(fieldIndex)));
return collect(intoList(recordType().mapper(fieldIndex, Tools.configuration(this), type)));
}
@Override
public final <U> List<U> getValues(int fieldIndex, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return Convert.convert(getValues(fieldIndex), converter);
return collect(intoList(recordType().mapper(fieldIndex, converter)));
}
@Override
@ -220,14 +215,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> List<U> getValues(String fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return getValues(indexOrFail(fieldsRow(), fieldName), type);
return collect(intoList(recordType().mapper(fieldName, Tools.configuration(this), type)));
}
@Override
public final <U> List<U> getValues(String fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return Convert.convert(getValues(fieldName), converter);
return collect(intoList(recordType().mapper(fieldName, converter)));
}
@Override
@ -237,14 +230,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> List<U> getValues(Name fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return getValues(indexOrFail(fieldsRow(), fieldName), type);
return collect(intoList(recordType().mapper(fieldName, Tools.configuration(this), type)));
}
@Override
public final <U> List<U> getValues(Name fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return Convert.convert(getValues(fieldName), converter);
return collect(intoList(recordType().mapper(fieldName, converter)));
}
final void addRecord(R record) {
@ -849,14 +840,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> Set<U> intoSet(int fieldIndex, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldIndex, type));
return collect(Records.intoSet(recordType().mapper(fieldIndex, Tools.configuration(this), type)));
}
@Override
public final <U> Set<U> intoSet(int fieldIndex, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldIndex, converter));
return collect(Records.intoSet(recordType().mapper(fieldIndex, converter)));
}
@Override
@ -866,14 +855,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> Set<U> intoSet(String fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldName, type));
return collect(Records.intoSet(recordType().mapper(fieldName, Tools.configuration(this), type)));
}
@Override
public final <U> Set<U> intoSet(String fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldName, converter));
return collect(Records.intoSet(recordType().mapper(fieldName, converter)));
}
@Override
@ -883,14 +870,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> Set<U> intoSet(Name fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldName, type));
return collect(Records.intoSet(recordType().mapper(fieldName, Tools.configuration(this), type)));
}
@Override
public final <U> Set<U> intoSet(Name fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(fieldName, converter));
return collect(Records.intoSet(recordType().mapper(fieldName, converter)));
}
@Override
@ -900,14 +885,12 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
@Override
public final <U> Set<U> intoSet(Field<?> field, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(field, type));
return collect(Records.intoSet(recordType().mapper(field, Tools.configuration(this), type)));
}
@Override
public final <T, U> Set<U> intoSet(Field<T> field, Converter<? super T, ? extends U> converter) {
// [#9288] TODO: Refactor this
return new LinkedHashSet<>(getValues(field, converter));
return collect(Records.intoSet(recordType().mapper(field, converter)));
}
@Override

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

@ -37,6 +37,10 @@
*/
package org.jooq.impl;
import static org.jooq.Records.intoGroups;
import static org.jooq.Records.intoList;
import static org.jooq.Records.intoMap;
import static org.jooq.Records.intoSet;
import static org.jooq.impl.Tools.blocking;
import java.lang.reflect.Array;
@ -86,7 +90,6 @@ import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.RecordHandler;
import org.jooq.RecordMapper;
import org.jooq.Records;
import org.jooq.Result;
import org.jooq.ResultQuery;
import org.jooq.Results;
@ -295,12 +298,12 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <E> Stream<E> fetchStreamInto(Class<? extends E> type) {
return fetchStream().map(r -> r.into(type));
return fetchStream().map(mapper(Tools.configuration(this), type));
}
@Override
default <Z extends Record> Stream<Z> fetchStreamInto(Table<Z> table) {
return fetchStream().map(r -> r.into(table));
return fetchStream().map(mapper(table));
}
@Override
@ -327,62 +330,62 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <T> List<T> fetch(Field<T> field) {
return fetch().getValues(field);
return collect(intoList(mapper(field)));
}
@Override
default <U> List<U> fetch(Field<?> field, Class<? extends U> type) {
return fetch().getValues(field, type);
return collect(intoList(mapper(field, Tools.configuration(this), type)));
}
@Override
default <T, U> List<U> fetch(Field<T> field, Converter<? super T, ? extends U> converter) {
return fetch().getValues(field, converter);
return collect(intoList(mapper(field, converter)));
}
@Override
default List<?> fetch(int fieldIndex) {
return fetch().getValues(fieldIndex);
return collect(intoList(mapper(fieldIndex)));
}
@Override
default <U> List<U> fetch(int fieldIndex, Class<? extends U> type) {
return fetch().getValues(fieldIndex, type);
return collect(intoList(mapper(fieldIndex, Tools.configuration(this), type)));
}
@Override
default <U> List<U> fetch(int fieldIndex, Converter<?, ? extends U> converter) {
return fetch().getValues(fieldIndex, converter);
return collect(intoList(mapper(fieldIndex, converter)));
}
@Override
default List<?> fetch(String fieldName) {
return fetch().getValues(fieldName);
return collect(intoList(mapper(fieldName)));
}
@Override
default <U> List<U> fetch(String fieldName, Class<? extends U> type) {
return fetch().getValues(fieldName, type);
return collect(intoList(mapper(fieldName, Tools.configuration(this), type)));
}
@Override
default <U> List<U> fetch(String fieldName, Converter<?, ? extends U> converter) {
return fetch().getValues(fieldName, converter);
return collect(intoList(mapper(fieldName, converter)));
}
@Override
default List<?> fetch(Name fieldName) {
return fetch().getValues(fieldName);
return collect(intoList(mapper(fieldName)));
}
@Override
default <U> List<U> fetch(Name fieldName, Class<? extends U> type) {
return fetch().getValues(fieldName, type);
return collect(intoList(mapper(fieldName, Tools.configuration(this), type)));
}
@Override
default <U> List<U> fetch(Name fieldName, Converter<?, ? extends U> converter) {
return fetch().getValues(fieldName, converter);
return collect(intoList(mapper(fieldName, converter)));
}
@Override
@ -783,82 +786,82 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, R> fetchMap(Field<K> key) {
return collect(Records.intoMap(mapper(key)));
return collect(intoMap(mapper(key)));
}
@Override
default Map<?, R> fetchMap(int keyFieldIndex) {
return collect(Records.intoMap(mapper(keyFieldIndex)));
return collect(intoMap(mapper(keyFieldIndex)));
}
@Override
default Map<?, R> fetchMap(String keyFieldName) {
return collect(Records.intoMap(mapper(keyFieldName)));
return collect(intoMap(mapper(keyFieldName)));
}
@Override
default Map<?, R> fetchMap(Name keyFieldName) {
return collect(Records.intoMap(mapper(keyFieldName)));
return collect(intoMap(mapper(keyFieldName)));
}
@Override
default <K, V> Map<K, V> fetchMap(Field<K> key, Field<V> value) {
return collect(Records.intoMap(mapper(key), mapper(value)));
return collect(intoMap(mapper(key), mapper(value)));
}
@Override
default Map<?, ?> fetchMap(int keyFieldIndex, int valueFieldIndex) {
return collect(Records.intoMap(mapper(keyFieldIndex), mapper(valueFieldIndex)));
return collect(intoMap(mapper(keyFieldIndex), mapper(valueFieldIndex)));
}
@Override
default Map<?, ?> fetchMap(String keyFieldName, String valueFieldName) {
return collect(Records.intoMap(mapper(keyFieldName), mapper(valueFieldName)));
return collect(intoMap(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default Map<?, ?> fetchMap(Name keyFieldName, Name valueFieldName) {
return collect(Records.intoMap(mapper(keyFieldName), mapper(valueFieldName)));
return collect(intoMap(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default <K, E> Map<K, E> fetchMap(Field<K> key, Class<? extends E> type) {
return collect(Records.intoMap(mapper(key), mapper(Tools.configuration(this), type)));
return collect(intoMap(mapper(key), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(int keyFieldIndex, Class<? extends E> type) {
return collect(Records.intoMap(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
return collect(intoMap(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(String keyFieldName, Class<? extends E> type) {
return collect(Records.intoMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(intoMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, E> fetchMap(Name keyFieldName, Class<? extends E> type) {
return collect(Records.intoMap(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(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(Records.intoMap(mapper(key), mapper));
return collect(intoMap(mapper(key), mapper));
}
@Override
default <E> Map<?, E> fetchMap(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(Records.intoMap(mapper(keyFieldIndex), mapper));
return collect(intoMap(mapper(keyFieldIndex), mapper));
}
@Override
default <E> Map<?, E> fetchMap(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(Records.intoMap(mapper(keyFieldName), mapper));
return collect(intoMap(mapper(keyFieldName), mapper));
}
@Override
default <E> Map<?, E> fetchMap(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(Records.intoMap(mapper(keyFieldName), mapper));
return collect(intoMap(mapper(keyFieldName), mapper));
}
@Override
@ -943,52 +946,52 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, R> fetchMap(Class<? extends K> keyType) {
return collect(Records.intoMap(mapper(Tools.configuration(this), keyType)));
return collect(intoMap(mapper(Tools.configuration(this), keyType)));
}
@Override
default <K, V> Map<K, V> fetchMap(Class<? extends K> keyType, Class<? extends V> valueType) {
return collect(Records.intoMap(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
return collect(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(Records.intoMap(mapper(Tools.configuration(this), keyType), valueMapper));
return collect(intoMap(mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
default <K> Map<K, R> fetchMap(RecordMapper<? super R, K> keyMapper) {
return collect(Records.intoMap(keyMapper));
return collect(intoMap(keyMapper));
}
@Override
default <K, V> Map<K, V> fetchMap(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(Records.intoMap(keyMapper, mapper(Tools.configuration(this), valueType)));
return collect(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(Records.intoMap(keyMapper, valueMapper));
return collect(intoMap(keyMapper, valueMapper));
}
@Override
default <S extends Record> Map<S, R> fetchMap(Table<S> table) {
return collect(Records.intoMap(mapper(table)));
return collect(intoMap(mapper(table)));
}
@Override
default <S extends Record, T extends Record> Map<S, T> fetchMap(Table<S> keyTable, Table<T> valueTable) {
return collect(Records.intoMap(mapper(keyTable), mapper(valueTable)));
return collect(intoMap(mapper(keyTable), mapper(valueTable)));
}
@Override
default <E, S extends Record> Map<S, E> fetchMap(Table<S> table, Class<? extends E> type) {
return collect(Records.intoMap(mapper(table), mapper(Tools.configuration(this), type)));
return collect(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(Records.intoMap(mapper(table), mapper));
return collect(intoMap(mapper(table), mapper));
}
@Override
@ -998,82 +1001,82 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, Result<R>> fetchGroups(Field<K> key) {
return collect(Records.intoGroups(mapper(key)));
return collect(intoGroups(mapper(key)));
}
@Override
default Map<?, Result<R>> fetchGroups(int keyFieldIndex) {
return collect(Records.intoGroups(mapper(keyFieldIndex)));
return collect(intoGroups(mapper(keyFieldIndex)));
}
@Override
default Map<?, Result<R>> fetchGroups(String keyFieldName) {
return collect(Records.intoGroups(mapper(keyFieldName)));
return collect(intoGroups(mapper(keyFieldName)));
}
@Override
default Map<?, Result<R>> fetchGroups(Name keyFieldName) {
return collect(Records.intoGroups(mapper(keyFieldName)));
return collect(intoGroups(mapper(keyFieldName)));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(Field<K> key, Field<V> value) {
return collect(Records.intoGroups(mapper(key), mapper(value)));
return collect(intoGroups(mapper(key), mapper(value)));
}
@Override
default Map<?, List<?>> fetchGroups(int keyFieldIndex, int valueFieldIndex) {
return (Map) collect(Records.intoGroups(mapper(keyFieldIndex), mapper(valueFieldIndex)));
return (Map) collect(intoGroups(mapper(keyFieldIndex), mapper(valueFieldIndex)));
}
@Override
default Map<?, List<?>> fetchGroups(String keyFieldName, String valueFieldName) {
return (Map) collect(Records.intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
return (Map) collect(intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default Map<?, List<?>> fetchGroups(Name keyFieldName, Name valueFieldName) {
return (Map) collect(Records.intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
return (Map) collect(intoGroups(mapper(keyFieldName), mapper(valueFieldName)));
}
@Override
default <K, E> Map<K, List<E>> fetchGroups(Field<K> key, Class<? extends E> type) {
return collect(Records.intoGroups(mapper(key), mapper(Tools.configuration(this), type)));
return collect(intoGroups(mapper(key), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(int keyFieldIndex, Class<? extends E> type) {
return collect(Records.intoGroups(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
return collect(intoGroups(mapper(keyFieldIndex), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(String keyFieldName, Class<? extends E> type) {
return collect(Records.intoGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(intoGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
}
@Override
default <E> Map<?, List<E>> fetchGroups(Name keyFieldName, Class<? extends E> type) {
return collect(Records.intoGroups(mapper(keyFieldName), mapper(Tools.configuration(this), type)));
return collect(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(Records.intoGroups(mapper(key), mapper));
return collect(intoGroups(mapper(key), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(int keyFieldIndex, RecordMapper<? super R, E> mapper) {
return collect(Records.intoGroups(mapper(keyFieldIndex), mapper));
return collect(intoGroups(mapper(keyFieldIndex), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(String keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(Records.intoGroups(mapper(keyFieldName), mapper));
return collect(intoGroups(mapper(keyFieldName), mapper));
}
@Override
default <E> Map<?, List<E>> fetchGroups(Name keyFieldName, RecordMapper<? super R, E> mapper) {
return collect(Records.intoGroups(mapper(keyFieldName), mapper));
return collect(intoGroups(mapper(keyFieldName), mapper));
}
@Override
@ -1158,53 +1161,53 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <K> Map<K, Result<R>> fetchGroups(Class<? extends K> keyType) {
return collect(Records.intoGroups(mapper(Tools.configuration(this), keyType)));
return collect(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(Records.intoGroups(mapper(Tools.configuration(this), keyType), mapper(Tools.configuration(this), valueType)));
return collect(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(Records.intoGroups(mapper(Tools.configuration(this), keyType), valueMapper));
return collect(intoGroups(mapper(Tools.configuration(this), keyType), valueMapper));
}
@Override
default <K> Map<K, Result<R>> fetchGroups(RecordMapper<? super R, K> keyMapper) {
return collect(Records.intoGroups(keyMapper));
return collect(intoGroups(keyMapper));
}
@Override
default <K, V> Map<K, List<V>> fetchGroups(RecordMapper<? super R, K> keyMapper, Class<V> valueType) {
return collect(Records.intoGroups(keyMapper, mapper(Tools.configuration(this), valueType)));
return collect(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(Records.intoGroups(keyMapper, valueMapper));
return collect(intoGroups(keyMapper, valueMapper));
}
@Override
default <S extends Record> Map<S, Result<R>> fetchGroups(Table<S> table) {
return collect(Records.intoGroups(mapper(table)));
return collect(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(Records.intoGroups(recordType().mapper(keyTable), recordType().mapper(valueTable))) yet
// [#9288] TODO: Can't use collect(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(Records.intoGroups(mapper(table), mapper(Tools.configuration(this), type)));
return collect(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(Records.intoGroups(mapper(table), mapper));
return collect(intoGroups(mapper(table), mapper));
}
@Override
@ -1295,79 +1298,71 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
@Override
default <E> Set<E> fetchSet(RecordMapper<? super R, E> mapper) {
return collect(Records.intoSet(mapper));
return collect(intoSet(mapper));
}
@Override
default Set<?> fetchSet(int fieldIndex) {
return collect(Records.intoSet(mapper(fieldIndex)));
return collect(intoSet(mapper(fieldIndex)));
}
@Override
default <U> Set<U> fetchSet(int fieldIndex, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldIndex, type);
return collect(intoSet(mapper(fieldIndex, Tools.configuration(this), type)));
}
@Override
default <U> Set<U> fetchSet(int fieldIndex, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldIndex, converter);
return collect(intoSet(mapper(fieldIndex, converter)));
}
@Override
default Set<?> fetchSet(String fieldName) {
return collect(Records.intoSet(mapper(fieldName)));
return collect(intoSet(mapper(fieldName)));
}
@Override
default <U> Set<U> fetchSet(String fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldName, type);
return collect(intoSet(mapper(fieldName, Tools.configuration(this), type)));
}
@Override
default <U> Set<U> fetchSet(String fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldName, converter);
return collect(intoSet(mapper(fieldName, converter)));
}
@Override
default Set<?> fetchSet(Name fieldName) {
return collect(Records.intoSet(mapper(fieldName)));
return collect(intoSet(mapper(fieldName)));
}
@Override
default <U> Set<U> fetchSet(Name fieldName, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldName, type);
return collect(intoSet(mapper(fieldName, Tools.configuration(this), type)));
}
@Override
default <U> Set<U> fetchSet(Name fieldName, Converter<?, ? extends U> converter) {
// [#9288] TODO: Refactor this
return fetch().intoSet(fieldName, converter);
return collect(intoSet(mapper(fieldName, converter)));
}
@Override
default <T> Set<T> fetchSet(Field<T> field) {
return collect(Records.intoSet(mapper(field)));
return collect(intoSet(mapper(field)));
}
@Override
default <U> Set<U> fetchSet(Field<?> field, Class<? extends U> type) {
// [#9288] TODO: Refactor this
return fetch().intoSet(field, type);
return collect(intoSet(mapper(field, Tools.configuration(this), type)));
}
@Override
default <T, U> Set<U> fetchSet(Field<T> field, Converter<? super T, ? extends U> converter) {
// [#9288] TODO: Refactor this
return fetch().intoSet(field, converter);
return collect(intoSet(mapper(field, converter)));
}
@Override
default <U> List<U> fetchInto(Class<? extends U> type) {
return fetch().into(type);
return collect(intoList(mapper(Tools.configuration(this), type)));
}
@Override
@ -1398,27 +1393,66 @@ interface ResultQueryTrait<R extends Record> extends QueryPartInternal, ResultQu
return false;
}
@Override
default RecordMapper<R, ?> mapper(int fieldIndex) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldIndex));
}
@Override
default <U> RecordMapper<R, U> mapper(int fieldIndex, Configuration configuration, Class<? extends U> type) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldIndex, configuration, type));
}
@Override
default <U> RecordMapper<R, U> mapper(int fieldIndex, Converter<?, ? extends U> converter) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldIndex, converter));
}
@Override
default RecordMapper<R, ?> mapper(String fieldName) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName));
}
@Override
default <U> RecordMapper<R, U> mapper(String fieldName, Configuration configuration, Class<? extends U> type) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName, configuration, type));
}
@Override
default <U> RecordMapper<R, U> mapper(String fieldName, Converter<?, ? extends U> converter) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName, converter));
}
@Override
default RecordMapper<R, ?> mapper(Name fieldName) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName));
}
@Override
default <U> RecordMapper<R, U> mapper(Name fieldName, Configuration configuration, Class<? extends U> type) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName, configuration, type));
}
@Override
default <U> RecordMapper<R, U> mapper(Name fieldName, Converter<?, ? extends U> converter) {
return new DelayedRecordMapper<>(t -> t.mapper(fieldName, converter));
}
@Override
default <T> RecordMapper<R, T> mapper(Field<T> field) {
return new DelayedRecordMapper<>(t -> t.mapper(field));
}
@Override
default <U> RecordMapper<R, U> mapper(Field<?> field, Configuration configuration, Class<? extends U> type) {
return new DelayedRecordMapper<>(t -> t.mapper(field, configuration, type));
}
@Override
default <T, U> RecordMapper<R, U> mapper(Field<T> field, Converter<? super T, ? extends U> converter) {
return new DelayedRecordMapper<>(t -> t.mapper(field, converter));
}
@Override
default <S extends Record> RecordMapper<R, S> mapper(Table<S> table) {
return new DelayedRecordMapper<>(t -> t.mapper(table));