HHH-12730 Remove the deprecated methods previouly added

We don't need them as everything is now dealt with the transformer.

Author: gsmet

hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java

@@ -13,7 +13,6 @@
 import java.util.Iterator;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.loader.CollectionAliases;
 import org.hibernate.persister.collection.CollectionPersister;
@@ -84,7 +83,7 @@ public interface PersistentCollection {
 	 * database state is now synchronized with the memory state.
 	 */
 	void postAction();
-	
+
 	/**
 	 * Return the user-visible collection (or array) instance
 	 *
@@ -103,7 +102,7 @@ public interface PersistentCollection {
 	 * @return Whether to end the read.
 	 */
 	boolean endRead();
-	
+
 	/**
 	 * Called after initializing from cache
 	 *
@@ -128,20 +127,6 @@ public interface PersistentCollection {
 	 */
 	boolean unsetSession(SharedSessionContractImplementor currentSession);
 
-	/**
-	 * Disassociate this collection from the given session.
-	 *
-	 * @param currentSession The session we are disassociating from.  Used for validations.
-	 *
-	 * @return true if this was currently associated with the given session
-	 *
-	 * @deprecated {@link #unsetSession(SharedSessionContractImplementor)} should be used instead.
-	 */
-	@Deprecated
-	default boolean unsetSession(SessionImplementor currentSession) {
-		return unsetSession( (SharedSessionContractImplementor) currentSession );
-	}
-
 	/**
 	 * Associate the collection with the given session.
 	 *
@@ -154,23 +139,6 @@ default boolean unsetSession(SessionImplementor currentSession) {
 	 */
 	boolean setCurrentSession(SharedSessionContractImplementor session) throws HibernateException;
 
-	/**
-	 * Associate the collection with the given session.
-	 *
-	 * @param session The session to associate with
-	 *
-	 * @return false if the collection was already associated with the session
-	 *
-	 * @throws HibernateException if the collection was already associated
-	 * with another open session
-	 *
-	 * @deprecated {@link #setCurrentSession(SharedSessionContractImplementor)} should be used instead.
-	 */
-	@Deprecated
-	default boolean setCurrentSession(SessionImplementor session) throws HibernateException {
-		return setCurrentSession( (SharedSessionContractImplementor) session );
-	}
-
 	/**
 	 * Read the state of the collection from a disassembled cached value
 	 *
@@ -216,7 +184,7 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return The identifier value
 	 */
 	Object getIdentifier(Object entry, int i);
-	
+
 	/**
 	 * Get the index of the given collection entry
 	 *
@@ -227,7 +195,7 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return The index value
 	 */
 	Object getIndex(Object entry, int i, CollectionPersister persister);
-	
+
 	/**
 	 * Get the value of the given collection entry.  Generally the given entry parameter value will just be returned.
 	 * Might get a different value for a duplicate entries in a Set.
@@ -237,7 +205,7 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return The corresponding object that is part of the collection elements.
 	 */
 	Object getElement(Object entry);
-	
+
 	/**
 	 * Get the snapshot value of the given collection entry
 	 *
@@ -275,7 +243,7 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return {@code true} if the given snapshot is empty
 	 */
 	boolean isSnapshotEmpty(Serializable snapshot);
-	
+
 	/**
 	 * Disassemble the collection to get it ready for the cache
 	 *
@@ -387,7 +355,7 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return The iterator
 	 */
 	Iterator queuedAdditionIterator();
-	
+
 	/**
 	 * Get the "queued" orphans
 	 *
@@ -396,28 +364,28 @@ Object readFrom(ResultSet rs, CollectionPersister role, CollectionAliases descri
 	 * @return The orphaned elements
 	 */
 	Collection getQueuedOrphans(String entityName);
-	
+
 	/**
 	 * Get the current collection key value
 	 *
 	 * @return the current collection key value
 	 */
 	Serializable getKey();
-	
+
 	/**
 	 * Get the current role name
 	 *
 	 * @return the collection role name
 	 */
 	String getRole();
-	
+
 	/**
 	 * Is the collection unreferenced?
 	 *
 	 * @return {@code true} if the collection is no longer referenced by an owner
 	 */
 	boolean isUnreferenced();
-	
+
 	/**
 	 * Is the collection dirty? Note that this is only
 	 * reliable during the flush cycle, after the
@@ -437,19 +405,19 @@ default boolean isElementRemoved(){
 	 * to the database.
 	 */
 	void clearDirty();
-	
+
 	/**
 	 * Get the snapshot cached by the collection instance
 	 *
 	 * @return The internally stored snapshot state
 	 */
 	Serializable getStoredSnapshot();
-	
+
 	/**
 	 * Mark the collection as dirty
 	 */
 	void dirty();
-	
+
 	/**
 	 * Called before inserting rows, to ensure that any surrogate keys
 	 * are fully generated
@@ -476,5 +444,5 @@ default boolean isElementRemoved(){
 	 * @return The orphans
 	 */
 	Collection getOrphans(Serializable snapshot, String entityName);
-	
+
 }

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

@@ -20,7 +20,6 @@
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -107,13 +106,13 @@ protected static Size getDefaultSize() {
 	protected Size getDictatedSize() {
 		return dictatedSize;
 	}
-	
+
 	// final implementations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	public final JavaTypeDescriptor<T> getJavaTypeDescriptor() {
 		return javaTypeDescriptor;
 	}
-	
+
 	public final void setJavaTypeDescriptor( JavaTypeDescriptor<T> javaTypeDescriptor ) {
 		this.javaTypeDescriptor = javaTypeDescriptor;
 	}
@@ -258,15 +257,6 @@ public final T nullSafeGet(ResultSet rs, String name, final SharedSessionContrac
 		return nullSafeGet( rs, name, (WrapperOptions) session );
 	}
 
-	/**
-	 * @deprecated {@link #nullSafeGet(ResultSet, String, SharedSessionContractImplementor)}
-	 *             should be used instead.
-	 */
-	@Deprecated
-	public final T nullSafeGet(ResultSet rs, String name, final SessionImplementor session) throws SQLException {
-		return nullSafeGet( rs, name, (SharedSessionContractImplementor) session );
-	}
-
 	protected final T nullSafeGet(ResultSet rs, String name, WrapperOptions options) throws SQLException {
 		return remapSqlTypeDescriptor( options ).getExtractor( javaTypeDescriptor ).extract( rs, name, options );
 	}
@@ -275,14 +265,6 @@ public Object get(ResultSet rs, String name, SharedSessionContractImplementor se
 		return nullSafeGet( rs, name, session );
 	}
 
-	/**
-	 * @deprecated {@link #get(ResultSet, String, SharedSessionContractImplementor)} should be used instead.
-	 */
-	@Deprecated
-	public Object get(ResultSet rs, String name, SessionImplementor session) throws HibernateException, SQLException {
-		return get( rs, name, (SharedSessionContractImplementor) session );
-	}
-
 	@Override
 	@SuppressWarnings({ "unchecked" })
 	public final void nullSafeSet(
@@ -306,15 +288,6 @@ public void set(PreparedStatement st, T value, int index, SharedSessionContractI
 		nullSafeSet( st, value, index, session );
 	}
 
-	/**
-	 * @deprecated {@link #set(PreparedStatement, Object, int, SharedSessionContractImplementor)}
-	 *             should be used instead.
-	 */
-	@Deprecated
-	public void set(PreparedStatement st, T value, int index, SessionImplementor session) throws HibernateException, SQLException {
-		set( st, value, index, (SharedSessionContractImplementor) session );
-	}
-
 	@Override
 	@SuppressWarnings({ "unchecked" })
 	public final String toLoggableString(Object value, SessionFactoryImplementor factory) {

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

@@ -9,7 +9,6 @@
 import java.sql.CallableStatement;
 import java.sql.SQLException;
 
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
 /**
@@ -40,25 +39,6 @@ public interface ProcedureParameterExtractionAware<T> {
 	 */
 	T extract(CallableStatement statement, int startIndex, SharedSessionContractImplementor session) throws SQLException;
 
-	/**
-	 * Perform the extraction
-	 *
-	 * @param statement The CallableStatement from which to extract the parameter value(s).
-	 * @param startIndex The parameter index from which to start extracting; assumes the values (if multiple) are contiguous
-	 * @param session The originating session
-	 *
-	 * @return The extracted value.
-	 *
-	 * @throws SQLException Indicates an issue calling into the CallableStatement
-	 * @throws IllegalStateException Thrown if this method is called on instances that return {@code false} for {@link #canDoExtraction}
-	 *
-	 * @deprecated {@link #extract(CallableStatement, int, SharedSessionContractImplementor)} should be used instead.
-	 */
-	@Deprecated
-	default T extract(CallableStatement statement, int startIndex, SessionImplementor session) throws SQLException {
-		return extract( statement, startIndex, (SharedSessionContractImplementor) session );
-	}
-
 	/**
 	 * Perform the extraction
 	 *
@@ -72,23 +52,4 @@ default T extract(CallableStatement statement, int startIndex, SessionImplemento
 	 * @throws IllegalStateException Thrown if this method is called on instances that return {@code false} for {@link #canDoExtraction}
 	 */
 	T extract(CallableStatement statement, String[] paramNames, SharedSessionContractImplementor session) throws SQLException;
-
-	/**
-	 * Perform the extraction
-	 *
-	 * @param statement The CallableStatement from which to extract the parameter value(s).
-	 * @param paramNames The parameter names.
-	 * @param session The originating session
-	 *
-	 * @return The extracted value.
-	 *
-	 * @throws SQLException Indicates an issue calling into the CallableStatement
-	 * @throws IllegalStateException Thrown if this method is called on instances that return {@code false} for {@link #canDoExtraction}
-	 *
-	 * @deprecated {@link #extract(CallableStatement, String[], SharedSessionContractImplementor)} should be used instead.
-	 */
-	@Deprecated
-	default T extract(CallableStatement statement, String[] paramNames, SessionImplementor session) throws SQLException {
-		return extract( statement, paramNames, (SharedSessionContractImplementor) session );
-	}
 }

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

@@ -10,7 +10,6 @@
 import java.sql.SQLException;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
 /**
@@ -42,25 +41,4 @@ public interface ProcedureParameterNamedBinder {
 	 * @throws SQLException An error from the JDBC driver
 	 */
 	void nullSafeSet(CallableStatement statement, Object value, String name, SharedSessionContractImplementor session) throws SQLException;
-
-	/**
-	 * Bind a value to the JDBC prepared statement, ignoring some columns as dictated by the 'settable' parameter.
-	 * Implementors should handle the possibility of null values.
-	 * Does not support multi-column type
-	 *
-	 * @param statement The CallableStatement to which to bind
-	 * @param value the object to write
-	 * @param name parameter bind name
-	 * @param session The originating session
-	 *
-	 * @throws HibernateException An error from Hibernate
-	 * @throws SQLException An error from the JDBC driver
-	 *
-	 * @deprecated {@link #nullSafeSet(CallableStatement, Object, String, SharedSessionContractImplementor)}
-	 *             should be used instead.
-	 */
-	@Deprecated
-	default void nullSafeSet(CallableStatement statement, Object value, String name, SessionImplementor session) throws SQLException {
-		nullSafeSet( statement, value, name, (SharedSessionContractImplementor) session );
-	}
 }