From dcc9f66d78e6a1ef84a837bc4e9f9dbdde78f5ed Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Tue, 30 Jul 2024 14:52:07 -0500
Subject: [PATCH] clean up @deprecation

---
 .../main/java/org/hibernate/transform/package-info.java  | 9 ++++++---
 .../tuple/entity/CompositeGeneratorBuilder.java          | 2 ++
 .../src/main/java/org/hibernate/tuple/package-info.java  | 5 ++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/transform/package-info.java b/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
index 0f2f286d53..5bac4e23af 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
@@ -9,9 +9,12 @@
  * Defines strategies for post-processing criteria query
  * results into a form convenient to the application.
  * <p>
- * @deprecated use {@link org.hibernate.query.TupleTransformer}
- * and/or {@link org.hibernate.query.ResultListTransformer}
+ * @apiNote This entire package is considered deprecated.  Use
+ * {@link org.hibernate.query.TupleTransformer} and/or
+ * {@link org.hibernate.query.ResultListTransformer}
  * which are defined in {@link org.hibernate.query}.
  */
-@Deprecated
+@Remove
 package org.hibernate.transform;
+
+import org.hibernate.Remove;
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
index c5e2afddcf..a1466e010c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.tuple.entity;
 
+import org.hibernate.Internal;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
@@ -28,6 +29,7 @@ import static org.hibernate.generator.EventTypeSets.NONE;
 /**
  * Handles value generation for composite properties.
  */
+@Internal
 class CompositeGeneratorBuilder {
 	private final String entityName;
 	private final Property mappingProperty;
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/package-info.java b/hibernate-core/src/main/java/org/hibernate/tuple/package-info.java
index 74a3e8a8ab..e3a3460364 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/package-info.java
@@ -9,10 +9,9 @@
  * Most contracts here have been replaced by the new runtime
  * {@linkplain org.hibernate.metamodel.mapping mapping model}.
  * <p>
- * @deprecated Value-generation related contracts have been replaced by
- * {@link org.hibernate.generator}
+ * @apiNote This entire package (and sub-packages) is considered deprecated
  */
-@Remove @Deprecated
+@Remove
 package org.hibernate.tuple;
 
 import org.hibernate.Remove;