remove some obsolete and deprecated code

Author: gavinking

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

@@ -171,17 +171,4 @@
 	 * @see Synchronize
 	 */
 	String[] querySpaces() default {};
-
-	/**
-	 * Is the {@linkplain #query() SQL query} a call to a stored procedure
-	 * or function?
-	 *
-	 * @deprecated Calling database procedures and functions through
-	 *             {@link org.hibernate.query.NativeQuery} is no longer supported;
-	 *             use {@link jakarta.persistence.NamedStoredProcedureQuery} instead.
-	 *
-	 * @see org.hibernate.jpa.HibernateHints#HINT_CALLABLE_FUNCTION
-	 */
-	@Deprecated(since = "6.0", forRemoval = true)
-	boolean callable() default false;
 }

hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java

@@ -32,7 +32,6 @@
 import org.hibernate.boot.query.SqlResultSetMappingDescriptor;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.jpa.HibernateHints;
 import org.hibernate.jpa.internal.util.FlushModeTypeHelper;
 import org.hibernate.models.spi.AnnotationTarget;
@@ -49,7 +48,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import static java.lang.Boolean.TRUE;
 import static org.hibernate.internal.CoreLogging.messageLogger;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.internal.util.collections.ArrayHelper.isEmpty;
@@ -234,28 +232,15 @@ public static void bindNativeQuery(
 		final NamedNativeQueryDefinition.Builder<?> builder =
 				createQueryDefinition( namedNativeQuery, registrationName, resultSetMappingName, resultClass,
 						namedNativeQuery.timeout(), namedNativeQuery.fetchSize(), querySpaces, location );
-
-		if ( TRUE == namedNativeQuery.callable() ) {
-			final NamedProcedureCallDefinition definition =
-					createStoredProcedure( builder, context, () -> illegalCallSyntax( namedNativeQuery ) );
-			context.getMetadataCollector().addNamedProcedureCallDefinition( definition );
-			DeprecationLogger.DEPRECATION_LOGGER.warn(
-					"Marking named native queries as callable is no longer supported; use '@jakarta.persistence.NamedStoredProcedureQuery' instead. Ignoring."
+		final NamedNativeQueryDefinition<?> queryDefinition = builder.build();
+		if ( LOG.isDebugEnabled() ) {
+			LOG.debugf(
+					"Binding named native query: %s => %s",
+					queryDefinition.getRegistrationName(),
+					queryDefinition.getSqlQueryString()
 			);
 		}
-		else {
-			final NamedNativeQueryDefinition<?> queryDefinition = builder.build();
-
-			if ( LOG.isDebugEnabled() ) {
-				LOG.debugf(
-						"Binding named native query: %s => %s",
-						queryDefinition.getRegistrationName(),
-						queryDefinition.getSqlQueryString()
-				);
-			}
-
-			context.getMetadataCollector().addNamedNativeQuery( queryDefinition );
-		}
+		context.getMetadataCollector().addNamedNativeQuery( queryDefinition );
 	}
 
 	private static <T> NamedNativeQueryDefinition.Builder<T> createQueryDefinition(
@@ -553,9 +538,4 @@ private static int skipWhitespace(String sqlString, int i) {
 		}
 		return i;
 	}
-
-	private static AnnotationException illegalCallSyntax(org.hibernate.annotations.NamedNativeQuery queryAnn) {
-		return new AnnotationException( "Callable 'NamedNativeQuery' named '" + queryAnn.name()
-				+ "' does not use the JDBC call syntax" );
-	}
 }

hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java

@@ -42,7 +42,6 @@ public class NamedNativeQueryAnnotation implements NamedNativeQuery {
 	CacheRetrieveMode cacheRetrieveMode;
 	boolean readOnly;
 	String[] querySpaces;
-	boolean callable;
 
 	/**
 	 * Used in creating dynamic annotation instances (e.g. from XML)
@@ -61,7 +60,6 @@ public NamedNativeQueryAnnotation(SourceModelBuildingContext modelContext) {
 		cacheRetrieveMode = CacheRetrieveMode.USE;
 		readOnly = false;
 		querySpaces = new String[0];
-		callable = false;
 	}
 
 	/**
@@ -87,7 +85,6 @@ public NamedNativeQueryAnnotation(NamedNativeQuery annotation, SourceModelBuildi
 		}
 		this.readOnly = annotation.readOnly();
 		this.querySpaces = annotation.querySpaces();
-		this.callable = annotation.callable();
 	}
 
 	/**
@@ -109,7 +106,6 @@ public NamedNativeQueryAnnotation(Map<String, Object> attributeValues, SourceMod
 		this.cacheRetrieveMode = (CacheRetrieveMode) attributeValues.get( "cacheRetrieveMode" );
 		this.readOnly = (boolean) attributeValues.get( "readOnly" );
 		this.querySpaces = (String[]) attributeValues.get( "querySpaces" );
-		this.callable = (boolean) attributeValues.get( "callable" );
 	}
 
 	@Override
@@ -259,15 +255,6 @@ public void querySpaces(String[] value) {
 		this.querySpaces = value;
 	}
 
-	@Override
-	public boolean callable() {
-		return callable;
-	}
-
-	public void callable(boolean value) {
-		this.callable = value;
-	}
-
 	public void apply(JaxbNamedNativeQueryImpl jaxbNamedQuery, XmlDocumentContext xmlDocumentContext) {
 		name( jaxbNamedQuery.getName() );
 		query( jaxbNamedQuery.getQuery() );

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

@@ -133,22 +133,6 @@ public void setEnabledCascadingFetchProfile(CascadingFetchProfile enabledCascadi
 		this.enabledCascadingFetchProfile = enabledCascadingFetchProfile;
 	}
 
-	/**
-	 * @deprecated Use {@link #getEnabledCascadingFetchProfile} instead
-	 */
-	@Deprecated( since = "6.0" )
-	public String getInternalFetchProfile() {
-		return getEnabledCascadingFetchProfile().getLegacyName();
-	}
-
-	/**
-	 * @deprecated Use {@link #setEnabledCascadingFetchProfile} instead
-	 */
-	@Deprecated( since = "6.0" )
-	public void setInternalFetchProfile(String internalFetchProfile) {
-		setEnabledCascadingFetchProfile( CascadingFetchProfile.fromLegacyName( internalFetchProfile ) );
-	}
-
 
 	// filter support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

hibernate-core/src/main/java/org/hibernate/exception/internal/StandardSQLExceptionConverter.java

@@ -10,11 +10,9 @@
 import org.hibernate.exception.spi.SQLExceptionConverter;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A {@link SQLExceptionConverter} that delegates to a chain of
@@ -30,26 +28,6 @@ public StandardSQLExceptionConverter(SQLExceptionConversionDelegate... delegates
 		this.delegates = Arrays.asList(delegates);
 	}
 
-	/**
-	 * @deprecated use {@link #StandardSQLExceptionConverter(SQLExceptionConversionDelegate...)}
-	 */
-	@Deprecated(since = "6.0")
-	public StandardSQLExceptionConverter() {
-		delegates = new ArrayList<>();
-	}
-
-	/**
-	 * Add a delegate.
-	 *
-	 * @deprecated use {@link #StandardSQLExceptionConverter(SQLExceptionConversionDelegate...)}
-	 */
-	@Deprecated(since = "6.0")
-	public void addDelegate(@Nullable SQLExceptionConversionDelegate delegate) {
-		if ( delegate != null ) {
-			this.delegates.add( delegate );
-		}
-	}
-
 	@Override
 	public JDBCException convert(SQLException sqlException, String message, String sql) {
 		for ( SQLExceptionConversionDelegate delegate : delegates ) {

hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java

@@ -87,12 +87,4 @@ public static GraphSemantic fromHintName(String hintName) {
 			);
 		};
 	}
-
-	/**
-	 * @deprecated Use {@link #fromHintName} instead
-	 */
-	@Deprecated(since = "6.0")
-	public static GraphSemantic fromJpaHintName(String hintName) {
-		return fromHintName( hintName );
-	}
 }

hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java

@@ -21,15 +21,15 @@
 
 /**
  * An {@link IdentifierGenerator} which generates {@link UUID} values using a pluggable
- * {@link UUIDGenerationStrategy generation strategy}.  The values this generator can return
- * include {@link UUID}, {@link String} and byte[16]
+ * {@linkplain UUIDGenerationStrategy generation strategy}. The values this generator
+ * can return include {@link UUID}, {@link String} and {@code byte[16]}.
  * <p>
- * Supports 2 config parameters:<ul>
- * <li>{@link #UUID_GEN_STRATEGY} - names the {@link UUIDGenerationStrategy} instance to use</li>
- * <li>{@link #UUID_GEN_STRATEGY_CLASS} - names the {@link UUIDGenerationStrategy} class to use</li>
+ * Accepts two configuration parameters:<ul>
+ * <li>{@value #UUID_GEN_STRATEGY} - names the {@link UUIDGenerationStrategy} instance to use</li>
+ * <li>{@value #UUID_GEN_STRATEGY_CLASS} - names the {@link UUIDGenerationStrategy} class to use</li>
  * </ul>
  * <p>
- * Currently, there are 2 standard implementations of {@link UUIDGenerationStrategy}:<ul>
+ * There are two standard implementations of {@link UUIDGenerationStrategy}:<ul>
  * <li>{@link StandardRandomStrategy} (the default, if none specified)</li>
  * <li>{@link org.hibernate.id.uuid.CustomVersionOneStrategy}</li>
  * </ul>

hibernate-core/src/main/java/org/hibernate/id/uuid/UuidValueGenerator.java

@@ -9,8 +9,10 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
 /**
- * Represents a specific algorithm for producing UUID values.  Used in
- * conjunction with {@linkplain UuidGenerator} and
+ * Represents a specific algorithm for producing UUID values.
+ * <p>
+ * Used in conjunction with {@link UuidGenerator} and
+ * {@link org.hibernate.annotations.UuidGenerator @UuidGenerator}.
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/loader/ast/spi/CascadingFetchProfile.java

@@ -6,47 +6,18 @@
 
 import org.hibernate.engine.spi.CascadingAction;
 import org.hibernate.engine.spi.CascadingActions;
-import org.hibernate.internal.util.StringHelper;
 
 /**
  * @author Steve Ebersole
  */
 public enum CascadingFetchProfile {
-	MERGE( "merge", CascadingActions.MERGE ),
-	REFRESH( "refresh", CascadingActions.REFRESH );
-
-	private final String legacyName;
-	private final CascadingAction cascadingAction;
-
-	CascadingFetchProfile(String legacyName, CascadingAction cascadingAction) {
-		this.legacyName = legacyName;
-		this.cascadingAction = cascadingAction;
-	}
-
-	public String getLegacyName() {
-		return legacyName;
-	}
-
-	public CascadingAction getCascadingAction() {
-		return cascadingAction;
-	}
-
-	public static CascadingFetchProfile fromLegacyName(String legacyName) {
-		if ( StringHelper.isEmpty( legacyName ) ) {
-			return null;
-		}
-
-		if ( MERGE.legacyName.equalsIgnoreCase( legacyName ) ) {
-			return MERGE;
-		}
-
-		if ( REFRESH.legacyName.equalsIgnoreCase( legacyName ) ) {
-			return REFRESH;
-		}
-
-		throw new IllegalArgumentException(
-				"Passed name [" + legacyName + "] not recognized as a legacy internal fetch profile name; " +
-						"supported values include: 'merge' and 'refresh'"
-		);
+	MERGE,
+	REFRESH;
+
+	public CascadingAction<?> getCascadingAction() {
+		return switch ( this ) {
+			case MERGE -> CascadingActions.MERGE;
+			case REFRESH -> CascadingActions.REFRESH;
+		};
 	}
 }