Renamed internal API

This commit is contained in:
Lukas Eder 2014-08-13 12:53:00 +02:00
parent 30ae346d14
commit 6f5e5d986a
3 changed files with 15 additions and 19 deletions

View File

@ -44,7 +44,7 @@ import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.conf.SettingsTools.executeStaticStatements;
import static org.jooq.impl.Utils.consumeWarnings;
import static org.jooq.impl.Utils.fields;
import static org.jooq.impl.Utils.getDataTypes;
import static org.jooq.impl.Utils.dataTypes;
import static org.jooq.impl.Utils.visitAll;
import java.sql.Connection;
@ -122,7 +122,7 @@ class BatchSingle implements BatchBindStep {
Connection connection = ctx.connection();
// [#1371] fetch bind variables to restore them again, later
DataType<?>[] paramTypes = getDataTypes(query.getParams().values().toArray(new Field[0]));
DataType<?>[] paramTypes = dataTypes(query.getParams().values().toArray(new Field[0]));
try {
listener.renderStart(ctx);

View File

@ -734,7 +734,7 @@ public class DefaultDSLContext implements DSLContext, Serializable {
@Override
public Cursor<Record> fetchLazy(ResultSet rs, Class<?>... types) {
return fetchLazy(rs, Utils.getDataTypes(types));
return fetchLazy(rs, Utils.dataTypes(types));
}
@Override

View File

@ -509,17 +509,16 @@ final class Utils {
/**
* Useful conversion method
*/
static final Class<?>[] getClasses(Field<?>[] fields) {
return getClasses(getDataTypes(fields));
static final Class<?>[] types(Field<?>[] fields) {
return types(dataTypes(fields));
}
/**
* Useful conversion method
*/
static final Class<?>[] getClasses(DataType<?>[] types) {
if (types == null) {
static final Class<?>[] types(DataType<?>[] types) {
if (types == null)
return null;
}
Class<?>[] result = new Class<?>[types.length];
@ -538,10 +537,9 @@ final class Utils {
/**
* Useful conversion method
*/
static final Class<?>[] getClasses(Object[] values) {
if (values == null) {
static final Class<?>[] types(Object[] values) {
if (values == null)
return null;
}
Class<?>[] result = new Class<?>[values.length];
@ -563,10 +561,9 @@ final class Utils {
/**
* Useful conversion method
*/
static final DataType<?>[] getDataTypes(Field<?>[] fields) {
if (fields == null) {
static final DataType<?>[] dataTypes(Field<?>[] fields) {
if (fields == null)
return null;
}
DataType<?>[] result = new DataType<?>[fields.length];
@ -585,10 +582,9 @@ final class Utils {
/**
* Useful conversion method
*/
static final DataType<?>[] getDataTypes(Class<?>[] types) {
if (types == null) {
static final DataType<?>[] dataTypes(Class<?>[] types) {
if (types == null)
return null;
}
DataType<?>[] result = new DataType<?>[types.length];
@ -607,8 +603,8 @@ final class Utils {
/**
* Useful conversion method
*/
static final DataType<?>[] getDataTypes(Object[] values) {
return getDataTypes(getClasses(values));
static final DataType<?>[] dataTypes(Object[] values) {
return dataTypes(types(values));
}
// ------------------------------------------------------------------------