HHH-14857 Deprecations in preparation for 6

Author: sebersole

documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java

@@ -69,7 +69,7 @@ public void testLifecycle() {
 		try {
 			Map settings = buildSettings();
 			settings.put(
-				org.hibernate.jpa.AvailableSettings.LOADED_CLASSES,
+				org.hibernate.cfg.AvailableSettings.LOADED_CLASSES,
 				Collections.singletonList(
 					Person.class
 				)

documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java

@@ -59,7 +59,7 @@ public void testLifecycle() {
 		try {
 			Map settings = buildSettings();
 			settings.put(
-				org.hibernate.jpa.AvailableSettings.LOADED_CLASSES,
+				AvailableSettings.LOADED_CLASSES,
 				Arrays.asList(
 					ApplicationCustomer.class,
 					CustomTrackingRevisionEntity.class

documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java

@@ -83,7 +83,7 @@ public void test() {
         try {
             Map settings = buildSettings();
             settings.put(
-                org.hibernate.jpa.AvailableSettings.LOADED_CLASSES,
+                AvailableSettings.LOADED_CLASSES,
                 Arrays.asList(
                     ApplicationCustomer.class,
                     CustomTrackingRevisionEntity.class

documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java

@@ -75,7 +75,7 @@ public void testLifecycle() {
 		try {
 			Map settings = buildSettings();
 			settings.put(
-				org.hibernate.jpa.AvailableSettings.LOADED_CLASSES,
+				AvailableSettings.LOADED_CLASSES,
 				Arrays.asList(
 					ApplicationCustomer.class,
 					CustomTrackingRevisionEntity.class,

documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java

@@ -21,7 +21,6 @@
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.configuration.EnversSettings;
 import org.hibernate.envers.strategy.ValidityAuditStrategy;
-import org.hibernate.jpa.AvailableSettings;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import org.junit.Test;

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

@@ -22,7 +22,10 @@
  *
  * @author Emmanuel Bernard
  * @author Steve Ebersole
+ *
+ * @deprecated To be removed in 6.0
  */
+@Deprecated
 @java.lang.annotation.Target( { PACKAGE, TYPE, METHOD, FIELD } )
 @Retention( RUNTIME )
 @Repeatable(AnyMetaDefs.class)

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

@@ -17,9 +17,12 @@
  *
  * @author Emmanuel Bernard
  * @author Steve Ebersole
+ *
+ * @deprecated To be removed in 6.0
  */
 @java.lang.annotation.Target( { PACKAGE, TYPE } )
 @Retention( RUNTIME )
+@Deprecated
 public @interface AnyMetaDefs {
 	/**
 	 * The collective set of any meta-defs.

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

@@ -26,8 +26,14 @@
 public @interface CollectionId {
 	/**
 	 * Collection id column(s).
+	 *
+	 * @deprecated Only basic (single column) collection-ids are supported.
+	 * Use {@link #column} instead
 	 */
-	Column[] columns();
+	@Deprecated
+	Column[] columns() default {};
+
+	Column column() default @Column;
 
 	/**
 	 * id type, type.type() must be set.

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

@@ -20,9 +20,12 @@
  * @see org.hibernate.usertype.UserCollectionType
  *
  * @author Steve Ebersole
+ *
+ * @deprecated Custom handling for "collection types" will be handled differently in 6.0
  */
 @java.lang.annotation.Target({FIELD, METHOD})
 @Retention(RUNTIME)
+@Deprecated
 public @interface CollectionType {
 	/**
 	 * Names the type.

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

@@ -16,9 +16,12 @@
  * Allows defining the type of the key of a persistent map.
  *
  * @author Steve Ebersole
+ *
+ * @deprecated 6.0 will introduce a new type-safe {@code CustomType} annotation
  */
 @java.lang.annotation.Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Deprecated
 public @interface MapKeyType {
 	/**
 	 * The map key type definition.