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

[jOOQ/jOOQ#10694] Some refactorings

Browse Source
This commit is contained in:
Lukas Eder 2020-09-25 15:50:48 +02:00
parent f541eda04d
commit 157bde3056
4 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jOOQ/src/main/java/org/jooq/Converter.java
View File

@ -40,6 +40,7 @@ package org.jooq;
import java.io.Serializable;
import java.util.function.Function;
import org.jooq.impl.AbstractConverter;
import org.jooq.impl.SQLDataType;
import org.jetbrains.annotations.NotNull;
@ -164,7 +165,7 @@ public interface Converter<T, U> extends Serializable {
Function<? super T, ? extends U> from,
Function<? super U, ? extends T> to
) {
return new Converter<T, U>() {
return new AbstractConverter<T, U>(fromType, toType) {
/**
* Generated UID
@ -180,21 +181,6 @@ public interface Converter<T, U> extends Serializable {
public final T to(U u) {
return to.apply(u);
}
@Override
public final Class<T> fromType() {
return fromType;
}
@Override
public final Class<U> toType() {
return toType;
}
@Override
public String toString() {
return "Converter [ " + fromType.getName() + " -> " + toType.getName() + " ]";
}
};
}

12
jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
View File

@ -108,7 +108,7 @@ public final class DefaultConverterProvider implements ConverterProvider {
|| Record.class.isAssignableFrom(tWrapper)
|| Struct.class.isAssignableFrom(tWrapper) && UDTRecord.class.isAssignableFrom(uWrapper)
) {
return new Converter<T, U>() {
return new AbstractConverter<T, U>(tType, uType) {
/**
* Generated UID.
@ -124,16 +124,6 @@ public final class DefaultConverterProvider implements ConverterProvider {
public T to(U u) {
return Convert.convert(u, tType);
}
@Override
public Class<T> fromType() {
return tType;
}
@Override
public Class<U> toType() {
return uType;
}
};
}
else

15
jOOQ/src/main/java/org/jooq/impl/RowField.java
View File

@ -43,7 +43,6 @@ import static org.jooq.impl.Names.N_ROW;
import static org.jooq.impl.Tools.BooleanDataKey.DATA_LIST_ALREADY_INDENTED;
import org.jooq.Context;
import org.jooq.Converter;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.Name;
@ -69,7 +68,9 @@ final class RowField<ROW extends Row, REC extends Record> extends AbstractField<
@SuppressWarnings({ "serial", "unchecked", "rawtypes" })
RowField(final ROW row, Name as) {
super(as, (DataType) SQLDataType.RECORD, CommentImpl.NO_COMMENT, binding(new Converter<Object, REC>() {
super(as, (DataType) SQLDataType.RECORD, CommentImpl.NO_COMMENT, binding(new AbstractConverter<Object, REC>(
Object.class, (Class<REC>) Tools.recordType(row.size())
) {
@Override
public REC from(final Object t) {
// So far, this is only supported for PostgreSQL
@ -80,16 +81,6 @@ final class RowField<ROW extends Row, REC extends Record> extends AbstractField<
public Object to(REC u) {
throw new UnsupportedOperationException("Converting from nested records to bind values is not yet supported");
}
@Override
public Class<Object> fromType() {
return Object.class;
}
@Override
public Class<REC> toType() {
return (Class<REC>) Tools.recordType(row.size());
}
}));
this.row = row;

12
jOOQ/src/main/java/org/jooq/impl/XMLasDOMBinding.java
View File

@ -77,7 +77,7 @@ public class XMLasDOMBinding extends AbstractVarcharBinding<Node> {
private final Converter<Object, Node> converter;
public XMLasDOMBinding() {
this.converter = new Converter<Object, Node>() {
this.converter = new AbstractConverter<Object, Node>(Object.class, Node.class) {
/**
* Generated UID
@ -93,16 +93,6 @@ public class XMLasDOMBinding extends AbstractVarcharBinding<Node> {
public Object to(Node u) {
return u == null ? null : XMLasDOMBinding.toString(u);
}
@Override
public Class<Object> fromType() {
return Object.class;
}
@Override
public Class<Node> toType() {
return Node.class;
}
};
}