misc very minor changes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java

@@ -157,13 +157,10 @@ public <T> T resolveStrategy(
 			return strategy.cast( strategyReference );
 		}
 
-		final Class<? extends T> implementationClass;
-		if ( strategyReference instanceof Class ) {
-			implementationClass = (Class<T>) strategyReference;
-		}
-		else {
-			implementationClass = selectStrategyImplementor( strategy, strategyReference.toString() );
-		}
+		final Class<? extends T> implementationClass =
+				strategyReference instanceof Class
+						? (Class<? extends T>) strategyReference
+						: selectStrategyImplementor( strategy, strategyReference.toString() );
 
 		try {
 			return creator.create( implementationClass );

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java

@@ -220,7 +220,7 @@ private void merge(MergeEvent event, MergeContext copiedAlready, Object entity)
 							)
 					);
 					source.getActionQueue().unScheduleUnloadedDeletion( entity );
-					entityIsDetached(event, copiedId, originalId, copiedAlready);
+					entityIsDetached( event, copiedId, originalId, copiedAlready );
 					break;
 				}
 				throw new ObjectDeletedException( "deleted instance passed to merge",
@@ -299,7 +299,6 @@ protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyC
 		// copy created before we actually copy
 		super.cascadeAfterSave( session, persister, entity, copyCache );
 
-
 		copyValues( persister, entity, copy, session, copyCache, ForeignKeyDirection.TO_PARENT );
 
 		// saveTransientEntity has been called using a copy that contains empty collections

hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java

@@ -275,7 +275,7 @@ public Object put(Object mergeEntity, Object managedEntity, boolean isOperatedOn
 	 * @throws IllegalStateException if internal cross-references are out of sync,
 	 */
 	public void putAll(Map<?,?> map) {
-		for ( Entry<?,?> entry : map.entrySet() ) {
+		for ( var entry : map.entrySet() ) {
 			put( entry.getKey(), entry.getValue() );
 		}
 	}

hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java

@@ -3,6 +3,8 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.proxy;
+
+import java.io.Serial;
 import java.io.Serializable;
 
 import org.hibernate.Internal;
@@ -42,6 +44,7 @@ public interface HibernateProxy extends Serializable, PrimeAmongSecondarySuperty
 	 *
 	 * @return The serializable proxy replacement.
 	 */
+	@Serial
 	Object writeReplace();
 
 	/**

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

@@ -72,7 +72,7 @@ public static Object[] replace(
 			final SharedSessionContractImplementor session,
 			final Object owner,
 			final Map<Object, Object> copyCache) {
-		Object[] copied = new Object[original.length];
+		final Object[] copied = new Object[original.length];
 		for ( int i = 0; i < types.length; i++ ) {
 			if ( original[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY
 					|| original[i] == PropertyAccessStrategyBackRefImpl.UNKNOWN ) {
@@ -138,7 +138,7 @@ public static Object[] replace(
 			final Object owner,
 			final Map<Object, Object> copyCache,
 			final ForeignKeyDirection foreignKeyDirection) {
-		Object[] copied = new Object[original.length];
+		final Object[] copied = new Object[original.length];
 		for ( int i = 0; i < types.length; i++ ) {
 			if ( original[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY
 					|| original[i] == PropertyAccessStrategyBackRefImpl.UNKNOWN ) {