Author: steve.ebersole(a)jboss.com Date: 2010-05-06 09:16:48 -0400 (Thu, 06 May 2010) New Revision: 19384 Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/Hibernate.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractBynaryType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongBinaryType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongStringType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/CharBooleanType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/ImmutableType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/MutableType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/NullableType.java core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/TypeFactory.java Log: HHH-5196 - Deprecate Type methods on org.hibernate.Hibernate Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/Hibernate.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/Hibernate.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/Hibernate.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -104,138 +104,206 @@ /** * Hibernate <tt>long</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType LONG = new LongType(); /** * Hibernate <tt>short</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType SHORT = new ShortType(); /** * Hibernate <tt>integer</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType INTEGER = new IntegerType(); /** * Hibernate <tt>byte</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType BYTE = new ByteType(); /** * Hibernate <tt>float</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType FLOAT = new FloatType(); /** * Hibernate <tt>double</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType DOUBLE = new DoubleType(); /** * Hibernate <tt>character</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CHARACTER = new CharacterType(); /** * Hibernate <tt>string</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType STRING = new StringType(); /** * Hibernate <tt>time</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType TIME = new TimeType(); /** * Hibernate <tt>date</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType DATE = new DateType(); /** * Hibernate <tt>timestamp</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType TIMESTAMP = new TimestampType(); /** * Hibernate <tt>boolean</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType BOOLEAN = new BooleanType(); /** * Hibernate <tt>true_false</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType TRUE_FALSE = new TrueFalseType(); /** * Hibernate <tt>yes_no</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType YES_NO = new YesNoType(); /** * Hibernate <tt>big_decimal</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType BIG_DECIMAL = new BigDecimalType(); /** * Hibernate <tt>big_integer</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType BIG_INTEGER = new BigIntegerType(); /** * Hibernate <tt>binary</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType BINARY = new BinaryType(); /** * Hibernate <tt>wrapper-binary</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType WRAPPER_BINARY = new WrapperBinaryType(); /** * Hibernate char[] type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CHAR_ARRAY = new CharArrayType(); /** * Hibernate Character[] type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CHARACTER_ARRAY = new CharacterArrayType(); /** * Hibernate <tt>image</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType IMAGE = new ImageType(); /** * Hibernate <tt>text</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType TEXT = new TextType(); /** * Hibernate <tt>materialized_blob</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType MATERIALIZED_BLOB = new MaterializedBlobType(); /** * Hibernate <tt>materialized_clob</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType MATERIALIZED_CLOB = new MaterializedClobType(); /** * Hibernate <tt>blob</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final Type BLOB = new BlobType(); /** * Hibernate <tt>clob</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final Type CLOB = new ClobType(); /** * Hibernate <tt>calendar</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CALENDAR = new CalendarType(); /** * Hibernate <tt>calendar_date</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CALENDAR_DATE = new CalendarDateType(); /** * Hibernate <tt>locale</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType LOCALE = new LocaleType(); /** * Hibernate <tt>currency</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CURRENCY = new CurrencyType(); /** * Hibernate <tt>timezone</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType TIMEZONE = new TimeZoneType(); /** * Hibernate <tt>class</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType CLASS = new ClassType(); /** * Hibernate <tt>serializable</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final NullableType SERIALIZABLE = new SerializableType( Serializable.class ); /** * Hibernate <tt>object</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static final Type OBJECT = new AnyType(); @@ -249,6 +317,8 @@ /** * A Hibernate <tt>serializable</tt> type. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Type serializable(Class serializableClass) { return new SerializableType( serializableClass ); @@ -260,6 +330,8 @@ * @param metaType a type mapping <tt>java.lang.Class</tt> to a single column * @param identifierType the entity identifier type * @return the Type + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type any(Type metaType, Type identifierType) { return new AnyType( metaType, identifierType ); @@ -269,6 +341,8 @@ * A Hibernate persistent object (entity) type. * * @param persistentClass a mapped entity class + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type entity(Class persistentClass) { // not really a many-to-one association *necessarily* @@ -279,6 +353,8 @@ * A Hibernate persistent object (entity) type. * * @param entityName a mapped entity class + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type entity(String entityName) { // not really a many-to-one association *necessarily* @@ -289,6 +365,8 @@ * A Hibernate custom type. * * @param userTypeClass a class that implements <tt>UserType</tt> + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type custom(Class userTypeClass) throws HibernateException { return custom( userTypeClass, null ); @@ -301,6 +379,8 @@ * @param parameterNames the names of the parameters passed to the type * @param parameterValues the values of the parameters passed to the type. They must match * up with the order and length of the parameterNames array. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type custom(Class userTypeClass, String[] parameterNames, String[] parameterValues) throws HibernateException { @@ -316,6 +396,8 @@ * * @param userTypeClass a class that implements <tt>UserType and ParameterizableType</tt> * @param parameters the parameters as a collection of name/value pairs + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5182 */ public static Type custom(Class userTypeClass, Properties parameters) throws HibernateException { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractBynaryType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractBynaryType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractBynaryType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -44,6 +44,8 @@ * * @author Gavin King * @author Emmanuel Bernard + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class AbstractBynaryType extends MutableType implements VersionType, Comparator { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -40,6 +40,8 @@ * Logic to bind stream of char into a VARCHAR * * @author Emmanuel Bernard + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class AbstractCharArrayType extends MutableType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongBinaryType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongBinaryType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongBinaryType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -29,6 +29,8 @@ * An abstract type for mapping long binary SQL types to Java byte[]. * * @author Gail Badner + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class AbstractLongBinaryType extends AbstractBynaryType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongStringType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongStringType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/AbstractLongStringType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -37,6 +37,8 @@ /** * An abstract type for mapping long string SQL types to a Java String. * @author Gavin King, Bertrand Renuart (from TextType) + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class AbstractLongStringType extends ImmutableType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/CharBooleanType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/CharBooleanType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/CharBooleanType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -36,6 +36,8 @@ /** * Superclass for types that map Java boolean to SQL CHAR(1). * @author Gavin King + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class CharBooleanType extends BooleanType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/ImmutableType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/ImmutableType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/ImmutableType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -34,6 +34,8 @@ /** * Superclass of nullable immutable types. * @author Gavin King + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class ImmutableType extends NullableType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/MutableType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/MutableType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/MutableType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -34,6 +34,8 @@ /** * Superclass for mutable nullable types * @author Gavin King + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class MutableType extends NullableType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/NullableType.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/NullableType.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/NullableType.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -45,6 +45,8 @@ * Superclass of single-column nullable types. * * @author Gavin King + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public abstract class NullableType extends AbstractType { Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/TypeFactory.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-05-06 12:23:42 UTC (rev 19383) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-05-06 13:16:48 UTC (rev 19384) @@ -247,6 +247,8 @@ /** * Given the name of a Hibernate basic type, return an instance of * <tt>org.hibernate.type.Type</tt>. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Type basic(String name) { return (Type) BASIC_TYPES.get( name ); @@ -255,6 +257,8 @@ /** * Uses heuristics to deduce a Hibernate type given a string naming the type or Java class. * Return an instance of <tt>org.hibernate.type.Type</tt>. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Type heuristicType(String typeName) throws MappingException { return heuristicType( typeName, null ); @@ -263,6 +267,8 @@ /** * Uses heuristics to deduce a Hibernate type given a string naming the type or Java class. * Return an instance of <tt>org.hibernate.type.Type</tt>. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Type heuristicType(String typeName, Properties parameters) throws MappingException { @@ -407,6 +413,8 @@ * @param copy an array indicating which values to include in the copy * @param target The array into which to copy the values * @param session The orginating session + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static void deepCopy( final Object[] values, @@ -434,6 +442,8 @@ * @param row The values * @param types The value types * @param session The orginating session + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static void beforeAssemble( final Serializable[] row, @@ -455,6 +465,8 @@ * @param session The orginating session * @param owner The entity "owning" the values * @return The assembled state + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Object[] assemble( final Serializable[] row, @@ -482,6 +494,8 @@ * @param session The orginating session * @param owner The entity "owning" the values * @return The disassembled state + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Serializable[] disassemble( final Object[] row, @@ -514,6 +528,8 @@ * @param owner The entity "owning" the values * @param copyCache A map representing a cache of already replaced state * @return The replaced state + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Object[] replace( final Object[] original, @@ -546,6 +562,8 @@ * @param copyCache A map representing a cache of already replaced state * @param foreignKeyDirection FK directionality to be applied to the replacement * @return The replaced state + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Object[] replace( final Object[] original, @@ -583,6 +601,8 @@ * @param copyCache A map representing a cache of already replaced state * @param foreignKeyDirection FK directionality to be applied to the replacement * @return The replaced state + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static Object[] replaceAssociations( final Object[] original, @@ -630,6 +650,8 @@ * @param anyUninitializedProperties Does the entity currently hold any uninitialized property values? * @param session The session from which the dirty check request originated. * @return Array containing indices of the dirty properties, or null if no properties considered dirty. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static int[] findDirty( final StandardProperty[] properties, @@ -677,6 +699,8 @@ * @param anyUninitializedProperties Does the entity currently hold any uninitialized property values? * @param session The session from which the dirty check request originated. * @return Array containing indices of the modified properties, or null if no properties considered modified. + * + * @deprecated see http://opensource.atlassian.com/projects/hibernate/browse/HHH-5138 */ public static int[] findModified( final StandardProperty[] properties,