three minor cleanups in mapping/binding

Author: gavinking

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

@@ -452,7 +452,7 @@ private Set<String> handleIdClass(
 			ElementsToProcess elementsToProcess,
 			Map<ClassDetails, InheritanceState> inheritanceStates) {
 		final Set<String> idPropertiesIfIdClass = new HashSet<>();
-		boolean isIdClass = mapAsIdClass(
+		final boolean isIdClass = mapAsIdClass(
 				inheritanceStates,
 				inheritanceState,
 				persistentClass,
@@ -493,9 +493,9 @@ private boolean mapAsIdClass(
 			final PropertyData baseInferredData = new PropertyPreloadedData( accessType, "id", classWithIdType );
 			final AccessType propertyAccessor = getPropertyAccessor( compositeClass );
 
-			// In JPA 2, there is a shortcut if the IdClass is the Pk of the associated class pointed to by the id
+			// In JPA 2, there is a shortcut if the IdClass is the PK of the associated class pointed to by the id
 			// it ought to be treated as an embedded and not a real IdClass (at least in Hibernate's internal way)
-			final boolean isFakeIdClass = isIdClassPkOfTheAssociatedEntity(
+			final boolean isFakeIdClass = isIdClassPrimaryKeyOfAssociatedEntity(
 					elementsToProcess,
 					compositeClass,
 					inferredData,
@@ -657,7 +657,7 @@ private static PropertyData getUniqueIdPropertyFromBaseClass(
 		return baseClassElements.get( 0 );
 	}
 
-	private static boolean isIdClassPkOfTheAssociatedEntity(
+	private static boolean isIdClassPrimaryKeyOfAssociatedEntity(
 			ElementsToProcess elementsToProcess,
 			ClassDetails compositeClass,
 			PropertyData inferredData,
@@ -672,7 +672,8 @@ private static boolean isIdClassPkOfTheAssociatedEntity(
 					propertyAccessor,
 					context
 			);
-			final InheritanceState state = inheritanceStates.get( idPropertyOnBaseClass.getClassOrElementType().determineRawClass() );
+			final InheritanceState state =
+					inheritanceStates.get( idPropertyOnBaseClass.getClassOrElementType().determineRawClass() );
 			if ( state == null ) {
 				return false; //while it is likely a user error, let's consider it is something that might happen
 			}

hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java

@@ -19,7 +19,6 @@
 import org.hibernate.annotations.CacheLayout;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
-import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.OptimisticLockStyle;
@@ -159,10 +158,6 @@ public void setProxyInterfaceName(String proxyInterfaceName) {
 		this.proxyInterface = null;
 	}
 
-	private ClassLoaderAccess getClassLoaderAccess() {
-		return metadataBuildingContext.getBootstrapContext().getClassLoaderAccess();
-	}
-
 	public Class<?> getMappedClass() throws MappingException {
 		if ( className == null ) {
 			return null;

hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java

@@ -209,7 +209,7 @@ public void setEmbeddedIdentifier(boolean embeddedIdentifier) {
 	/**
 	 * @deprecated No longer supported
 	 */
-	@Deprecated
+	@Deprecated(since = "7", forRemoval = true)
 	public void setExplicitPolymorphism(boolean explicitPolymorphism) {
 	}