HHH-11263 - Deprecate o.h.type.TypeResolver

hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java

@@ -105,6 +105,7 @@ import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UniqueKey;
 import org.hibernate.query.spi.NamedQueryRepository;
+import org.hibernate.type.Type;
 import org.hibernate.type.TypeResolver;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -209,7 +210,14 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector
 		return bootstrapContext.getTypeConfiguration();
 	}
 
-	@Override
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return bootstrapContext.getTypeConfiguration().getTypeResolver();
 	}

hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java

@@ -49,6 +49,7 @@ import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Table;
 import org.hibernate.procedure.ProcedureCallMemento;
 import org.hibernate.query.spi.NamedQueryRepository;
+import org.hibernate.type.Type;
 import org.hibernate.type.TypeResolver;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -136,7 +137,14 @@ public class MetadataImpl implements MetadataImplementor, Serializable {
 		return bootstrapContext.getTypeConfiguration();
 	}
 
-	@Override
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return bootstrapContext.getTypeConfiguration().getTypeResolver();
 	}

hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java

@@ -38,9 +38,6 @@ import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
-import org.hibernate.type.TypeFactory;
-import org.hibernate.type.TypeResolver;
-import org.hibernate.type.spi.TypeConfiguration;
 import org.hibernate.usertype.CompositeUserType;
 import org.hibernate.usertype.UserType;
 

hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java

@@ -214,7 +214,14 @@ public abstract class AbstractDelegatingMetadata implements MetadataImplementor
 		return delegate.getTypeConfiguration();
 	}
 
-	@Override
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return delegate.getTypeResolver();
 	}

hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java

@@ -237,9 +237,11 @@ public interface MetadataBuildingOptions {
 	 */
 	List<MetadataSourceType> getSourceProcessOrdering();
 
-default String getSchemaCharset() {
+	default String getSchemaCharset() {
 		return null;
-	}/**
+	}
+
+	/**
 	 * Access to any SQL functions explicitly registered with the MetadataBuilder.  This
 	 * does not include Dialect defined functions, etc.
 	 *

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java

@@ -194,7 +194,14 @@ public class SessionFactoryDelegatingImpl implements SessionFactoryImplementor,
 		return delegate.getTypeHelper();
 	}
 
-	@Override
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return delegate.getTypeResolver();
 	}

hibernate-core/src/main/java/org/hibernate/hql/spi/id/inline/IdsClauseBuilder.java

@@ -14,6 +14,7 @@ import org.hibernate.type.CompositeType;
 import org.hibernate.type.LiteralType;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeResolver;
+import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * Builds the where clause that wraps the identifiers to be updated/deleted.
@@ -32,6 +33,23 @@ public abstract class IdsClauseBuilder {
 
 	private final List<Object[]> ids;
 
+	protected IdsClauseBuilder(
+			Dialect dialect,
+			Type identifierType,
+			TypeConfiguration typeConfiguration,
+			String[] columns,
+			List<Object[]> ids) {
+		this.dialect = dialect;
+		this.identifierType = identifierType;
+		this.typeResolver = typeConfiguration.getTypeResolver();
+		this.columns = columns;
+		this.ids = ids;
+	}
+
+	/**
+	 * @deprecated Use {{@link IdsClauseBuilder#IdsClauseBuilder(Dialect, Type, TypeConfiguration, String[], List)}} instead.
+	 */
+	@Deprecated
 	protected IdsClauseBuilder(
 			Dialect dialect,
 			Type identifierType,
@@ -49,6 +67,14 @@ public abstract class IdsClauseBuilder {
 		return identifierType;
 	}
 
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return typeResolver;
 	}

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -554,6 +554,14 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 		return null;
 	}
 
+	/**
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
+	 */
+	@Deprecated
 	public TypeResolver getTypeResolver() {
 		return typeResolver;
 	}

hibernate-core/src/main/java/org/hibernate/type/TypeResolver.java

@@ -19,7 +19,10 @@ import org.hibernate.usertype.UserType;
  * Acts as the contract for getting types and as the mediator between {@link BasicTypeRegistry} and {@link TypeFactory}.
  *
  * @author Steve Ebersole
+ *
+ * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
  */
+@Deprecated
 public class TypeResolver implements Serializable {
 	private final BasicTypeRegistry basicTypeRegistry;
 	private final TypeFactory typeFactory;

hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java

@@ -19,6 +19,7 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.internal.SessionFactoryRegistry;
 import org.hibernate.type.BasicTypeRegistry;
+import org.hibernate.type.Type;
 import org.hibernate.type.TypeFactory;
 import org.hibernate.type.TypeResolver;
 
@@ -69,8 +70,14 @@ public class TypeConfiguration implements SessionFactoryObserver, Serializable {
 
 	/**
 	 * Temporarily needed to support deprecations
-	 * @deprecated
+	 *
+	 * Retrieve the {@link Type} resolver associated with this factory.
+	 *
+	 * @return The type resolver
+	 *
+	 * @deprecated (since 5.3) No replacement, access to and handling of Types will be much different in 6.0
 	 */
+	@Deprecated
 	public TypeResolver getTypeResolver(){
 		return typeResolver;
 	}