From c363269a311c5aba71de0657634b005ef73f1297 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 21 Dec 2012 14:42:40 +0100 Subject: [PATCH] Refactored internal constant names --- .../java/org/jooq/impl/AbstractDataType.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java index 94ac7283e8..86eaecbc05 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java @@ -81,10 +81,10 @@ public abstract class AbstractDataType implements DataType { * Generated UID */ private static final long serialVersionUID = 4155588654449505119L; - private static final Map>[] typesByTypeName; - private static final Map, DataType>[] typesByType; - private static final Map, DataType>[] typesBySQLDataType; - private static final Map, DataType> sqlDataTypesByType; + private static final Map>[] TYPES_BY_NAME; + private static final Map, DataType>[] TYPES_BY_TYPE; + private static final Map, DataType>[] TYPES_BY_SQL_DATATYPE; + private static final Map, DataType> SQL_DATATYPES_BY_TYPE; private final SQLDialect dialect; @@ -98,17 +98,17 @@ public abstract class AbstractDataType implements DataType { private final boolean hasPrecisionAndScale; static { - typesBySQLDataType = new Map[SQLDialect.values().length]; - typesByTypeName = new Map[SQLDialect.values().length]; - typesByType = new Map[SQLDialect.values().length]; + TYPES_BY_SQL_DATATYPE = new Map[SQLDialect.values().length]; + TYPES_BY_NAME = new Map[SQLDialect.values().length]; + TYPES_BY_TYPE = new Map[SQLDialect.values().length]; for (SQLDialect dialect : SQLDialect.values()) { - typesBySQLDataType[dialect.ordinal()] = new LinkedHashMap, DataType>(); - typesByTypeName[dialect.ordinal()] = new LinkedHashMap>(); - typesByType[dialect.ordinal()] = new LinkedHashMap, DataType>(); + TYPES_BY_SQL_DATATYPE[dialect.ordinal()] = new LinkedHashMap, DataType>(); + TYPES_BY_NAME[dialect.ordinal()] = new LinkedHashMap>(); + TYPES_BY_TYPE[dialect.ordinal()] = new LinkedHashMap, DataType>(); } - sqlDataTypesByType = new LinkedHashMap, DataType>(); + SQL_DATATYPES_BY_TYPE = new LinkedHashMap, DataType>(); } protected AbstractDataType(SQLDialect dialect, SQLDataType sqldatatype, Class type, String typeName) { @@ -143,22 +143,22 @@ public abstract class AbstractDataType implements DataType { int ordinal = dialect == null ? SQLDialect.SQL99.ordinal() : dialect.ordinal(); String normalised = FieldTypeHelper.normalise(typeName); - if (typesByTypeName[ordinal].get(normalised) == null) { - typesByTypeName[ordinal].put(normalised, this); + if (TYPES_BY_NAME[ordinal].get(normalised) == null) { + TYPES_BY_NAME[ordinal].put(normalised, this); } - if (typesByType[ordinal].get(type) == null) { - typesByType[ordinal].put(type, this); + if (TYPES_BY_TYPE[ordinal].get(type) == null) { + TYPES_BY_TYPE[ordinal].put(type, this); } - if (typesBySQLDataType[ordinal].get(sqlDataType) == null) { - typesBySQLDataType[ordinal].put(sqlDataType, this); + if (TYPES_BY_SQL_DATATYPE[ordinal].get(sqlDataType) == null) { + TYPES_BY_SQL_DATATYPE[ordinal].put(sqlDataType, this); } // Global data types if (dialect == null) { - if (sqlDataTypesByType.get(type) == null) { - sqlDataTypesByType.put(type, this); + if (SQL_DATATYPES_BY_TYPE.get(type) == null) { + SQL_DATATYPES_BY_TYPE.put(type, this); } } } @@ -174,7 +174,7 @@ public abstract class AbstractDataType implements DataType { // If this is a SQLDataType find the most suited dialect-specific // data type if (getDialect() == null) { - DataType dataType = typesBySQLDataType[configuration.getDialect().ordinal()].get(this); + DataType dataType = TYPES_BY_SQL_DATATYPE[configuration.getDialect().ordinal()].get(this); if (dataType != null) { return (DataType) dataType; @@ -412,11 +412,11 @@ public abstract class AbstractDataType implements DataType { protected static DataType getDataType(SQLDialect dialect, String typeName) { String normalised = FieldTypeHelper.normalise(typeName); - DataType result = typesByTypeName[dialect.ordinal()].get(normalised); + DataType result = TYPES_BY_NAME[dialect.ordinal()].get(normalised); // UDT data types and others are registered using SQL99 if (result == null) { - result = typesByTypeName[SQLDialect.SQL99.ordinal()].get(normalised); + result = TYPES_BY_NAME[SQLDialect.SQL99.ordinal()].get(normalised); } if (result == null) { @@ -440,7 +440,7 @@ public abstract class AbstractDataType implements DataType { DataType result = null; if (dialect != null) { - result = typesByType[dialect.ordinal()].get(type); + result = TYPES_BY_TYPE[dialect.ordinal()].get(type); } if (result == null) { @@ -451,7 +451,7 @@ public abstract class AbstractDataType implements DataType { ArrayRecord.class.isAssignableFrom(type)) { for (SQLDialect d : SQLDialect.values()) { - result = typesByType[d.ordinal()].get(type); + result = TYPES_BY_TYPE[d.ordinal()].get(type); if (result != null) { break; @@ -461,8 +461,8 @@ public abstract class AbstractDataType implements DataType { } if (result == null) { - if (sqlDataTypesByType.get(type) != null) { - return (DataType) sqlDataTypesByType.get(type); + if (SQL_DATATYPES_BY_TYPE.get(type) != null) { + return (DataType) SQL_DATATYPES_BY_TYPE.get(type); } // All other data types are illegal