HHH-15837 - Cleanup the tuple package

hibernate-core/src/main/java/org/hibernate/annotations/GenerationTime.java

@@ -6,14 +6,14 @@
  */
 package org.hibernate.annotations;
 
+import java.util.EnumSet;
+
 import org.hibernate.AssertionFailure;
 import org.hibernate.Internal;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
 import org.hibernate.tuple.GenerationTiming;
 
-import java.util.EnumSet;
-
 /**
  * Represents a class of events involving interaction with the database
  * that causes generation of a new value. Intended for use with the
@@ -64,8 +64,11 @@ public enum GenerationTime {
 
 	/**
 	 * @return the equivalent instance of {@link GenerationTiming}
+	 *
+	 * @deprecated Needed for backwards compatibility until the deprecated, legacy
+	 * generation stuff can be removed
 	 */
-	@Internal
+	@Internal @Deprecated(forRemoval = true)
 	public GenerationTiming getEquivalent() {
 		switch (this) {
 			case ALWAYS:

hibernate-core/src/main/java/org/hibernate/tuple/AnnotationValueGeneration.java

@@ -6,16 +6,16 @@
  */
 package org.hibernate.tuple;
 
-import org.hibernate.AssertionFailure;
-import org.hibernate.generator.AnnotationBasedGenerator;
-import org.hibernate.generator.Generator;
-import org.hibernate.generator.GeneratorCreationContext;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 
+import org.hibernate.AssertionFailure;
+import org.hibernate.generator.AnnotationBasedGenerator;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.GeneratorCreationContext;
+
 
 /**
  * An implementation of {@link ValueGeneration} which receives parameters from a custom
@@ -31,7 +31,10 @@ import java.lang.reflect.Method;
  * @author Gunnar Morling
  *
  * @see ValueGeneration
+ *
+ * @deprecated Replaced by {@link AnnotationBasedGenerator}
  */
+@Deprecated(since = "6", forRemoval = true)
 public interface AnnotationValueGeneration<A extends Annotation>
 		extends ValueGeneration, AnnotationBasedGenerator<A> {
 	/**

hibernate-core/src/main/java/org/hibernate/tuple/GenerationTiming.java

@@ -6,10 +6,11 @@
  */
 package org.hibernate.tuple;
 
+import java.util.Locale;
+
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.GenerationTime;
-
+import org.hibernate.generator.EventType;
-import java.util.Locale;
 
 /**
  * Represents the timing of {@link ValueGeneration value generation} that occurs
@@ -18,7 +19,12 @@ import java.util.Locale;
  * @author Steve Ebersole
  *
  * @see ValueGeneration
+ *
+ * @deprecated Replaced by {@link EventType} as id-generation has been
+ * redefined using the new broader {@linkplain org.hibernate.generator generation}
+ * approach.
  */
+@Deprecated(since = "6", forRemoval = true)
 public enum GenerationTiming {
 	/**
 	 * Value generation that never occurs.

hibernate-core/src/main/java/org/hibernate/tuple/TimestampGenerators.java

@@ -30,7 +30,10 @@ import org.hibernate.HibernateException;
  * Generators for obtaining the current VM timestamp in different representations.
  *
  * @author Gunnar Morling
+ *
+ * @deprecated This style of generation has been replaced by {@link org.hibernate.generator}
  */
+@Deprecated
 public final class TimestampGenerators {
 
 	private static final Map<Class<?>, ValueGenerator<?>> generators;

hibernate-core/src/main/java/org/hibernate/tuple/ValueGeneration.java

@@ -6,6 +6,8 @@
  */
 package org.hibernate.tuple;
 
+import java.util.EnumSet;
+
 import org.hibernate.Session;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -14,8 +16,6 @@ import org.hibernate.generator.Generator;
 import org.hibernate.generator.InDatabaseGenerator;
 import org.hibernate.generator.InMemoryGenerator;
 
-import java.util.EnumSet;
-
 /**
  * A value generator that can adapt to both Java value generation and database value generation.
  * <p>
@@ -26,7 +26,10 @@ import java.util.EnumSet;
  * @author Gavin King
  *
  * @see AnnotationValueGeneration
+ *
+ * @deprecated Replaced by {@link Generator}
  */
+@Deprecated(since = "6", forRemoval = true)
 public interface ValueGeneration extends InMemoryGenerator, InDatabaseGenerator {
 	/**
 	 * Specifies that the property value is generated:

hibernate-core/src/main/java/org/hibernate/tuple/ValueGenerator.java

@@ -7,12 +7,16 @@
 package org.hibernate.tuple;
 
 import org.hibernate.Session;
+import org.hibernate.generator.Generator;
 
 /**
  * Defines a generator for in-VM generation of (non-identifier) attribute values.
  *
+ * @deprecated Replaced by {@link Generator}
+ *
  * @author Steve Ebersole
  */
+@Deprecated(since = "6", forRemoval = true)
 public interface ValueGenerator<T> {
 	/**
 	 * Generate the value.

hibernate-core/src/main/java/org/hibernate/tuple/package-info.java

@@ -8,6 +8,9 @@
 /**
  * Most contracts here have been replaced by Hibernate's
  * {@linkplain org.hibernate.metamodel.mapping mapping-model}.
+ * <p/>
+ * Value-generation related contracts have been replaced by
+ * {@link org.hibernate.generator}
  */
 @Remove
 package org.hibernate.tuple;