misc minor code changes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/EntityIncrementVersionProcess.java

@@ -35,7 +35,7 @@ public EntityIncrementVersionProcess(Object object) {
 	@Override
 	public void doBeforeTransactionCompletion(SharedSessionContractImplementor session) {
 		final var entry = session.getPersistenceContext().getEntry( object );
-		// Don't increment the version for an entity that is not in the PersistenceContext;
+		// Don't increment the version for an entity that is not in the PersistenceContext
 		if ( entry != null ) {
 			OptimisticLockHelper.forceVersionIncrement( object, entry, session.asEventSource() );
 		}

hibernate-core/src/main/java/org/hibernate/action/internal/EntityVerifyVersionProcess.java

@@ -7,7 +7,8 @@
 import org.hibernate.action.spi.BeforeTransactionCompletionProcess;
 import org.hibernate.dialect.lock.OptimisticEntityLockException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.pretty.MessageHelper;
+
+import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
  * A {@link BeforeTransactionCompletionProcess} impl to verify an entity
@@ -40,7 +41,7 @@ public void doBeforeTransactionCompletion(SharedSessionContractImplementor sessi
 						"Newer version ["
 								+ latestVersion
 								+ "] of entity ["
-								+ MessageHelper.infoString( entry.getEntityName(), entry.getId() )
+								+ infoString( entry.getEntityName(), entry.getId() )
 								+ "] found in database"
 				);
 			}

hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java

@@ -278,12 +278,12 @@ public interface MappingSettings {
 	String PREFER_NATIVE_ENUM_TYPES = "hibernate.type.prefer_native_enum_types";
 
 	/**
-	 * Indicates whether {@link Locale#toLanguageTag()} should be preferred over {@link Locale#toString()}
-	 * when converting a value to a {@linkplain String}.
+	 * Indicates whether {@link Locale#toLanguageTag()} should be preferred over
+	 * {@link Locale#toString()} when converting a {@code Locale} to a {@code String}.
 	 * <p/>
 	 * This configuration property is used to specify a global preference,
 	 * but Hibernate ORM can always read both formats, so no data needs to be migrated.
-	 * The setting simply configures how {@link Locale} data is to be stored.
+	 * The setting only affects how {@link Locale} data is stored.
 	 *
 	 * @settingDefault false
 	 *

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

@@ -4,7 +4,6 @@
  */
 package org.hibernate.internal;
 
-import org.hibernate.CacheMode;
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.cache.spi.access.SoftLock;
@@ -13,9 +12,9 @@
 import org.hibernate.engine.spi.Status;
 import org.hibernate.event.monitor.spi.EventMonitor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.stat.internal.StatsHelper;
 
 import static org.hibernate.cache.spi.entry.CacheEntryHelper.buildStructuredCacheEntry;
+import static org.hibernate.stat.internal.StatsHelper.getRootEntityRole;
 
 public final class OptimisticLockHelper {
 
@@ -53,14 +52,15 @@ public static void forceVersionIncrement(Object object, EntityEntry entry, Share
 					persister,
 					session
 			);
-			session.getTransactionCompletionCallbacks().registerCallback( new CacheCleanupProcess(
-					cacheKey,
-					persister,
-					previousVersion,
-					nextVersion,
-					lock,
-					cacheEntry
-			) );
+			session.getTransactionCompletionCallbacks()
+					.registerCallback( new CacheCleanupProcess(
+							cacheKey,
+							persister,
+							previousVersion,
+							nextVersion,
+							lock,
+							cacheEntry
+					) );
 		}
 	}
 
@@ -80,11 +80,10 @@ else if ( session.getCacheMode().isPutEnabled() ) {
 			final Object cacheEntry =
 					buildStructuredCacheEntry( entity, nextVersion, entry.getLoadedState(), persister, session );
 			final boolean put = updateCache( persister, cacheEntry, previousVersion, nextVersion, cacheKey, session );
-
 			final var statistics = session.getFactory().getStatistics();
 			if ( put && statistics.isStatisticsEnabled() ) {
 				statistics.entityCachePut(
-						StatsHelper.getRootEntityRole( persister ),
+						getRootEntityRole( persister ),
 						persister.getCacheAccessStrategy().getRegion().getName()
 				);
 			}
@@ -126,10 +125,9 @@ private static boolean updateCache(
 	private static boolean isCacheInvalidationRequired(
 			EntityPersister persister,
 			SharedSessionContractImplementor session) {
-		// the cache has to be invalidated when CacheMode is equal to GET or IGNORE
 		return persister.isCacheInvalidationRequired()
-			|| session.getCacheMode() == CacheMode.GET
-			|| session.getCacheMode() == CacheMode.IGNORE;
+			// the cache has to be invalidated when CacheMode is GET or IGNORE
+			|| !session.getCacheMode().isPutEnabled();
 	}
 
 	private static class CacheCleanupProcess implements AfterTransactionCompletionProcess {
@@ -193,7 +191,7 @@ protected void cacheAfterUpdate(EntityDataAccess cache, Object cacheKey, SharedS
 				final var statistics = session.getFactory().getStatistics();
 				if ( put && statistics.isStatisticsEnabled() ) {
 					statistics.entityCachePut(
-							StatsHelper.getRootEntityRole( persister ),
+							getRootEntityRole( persister ),
 							cache.getRegion().getName()
 					);
 				}

hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java

@@ -22,14 +22,14 @@ public interface ReturningBeanInfoDelegate<T> {
 		T processBeanInfo(BeanInfo beanInfo) throws Exception;
 	}
 
-	private final Class beanClass;
-	private final Class stopClass;
+	private final Class<?> beanClass;
+	private final Class<?> stopClass;
 
-	public BeanInfoHelper(Class beanClass) {
+	public BeanInfoHelper(Class<?> beanClass) {
 		this( beanClass, Object.class );
 	}
 
-	public BeanInfoHelper(Class beanClass, Class stopClass) {
+	public BeanInfoHelper(Class<?> beanClass, Class<?> stopClass) {
 		this.beanClass = beanClass;
 		this.stopClass = stopClass;
 	}
@@ -46,7 +46,7 @@ public static void visitBeanInfo(Class<?> beanClass, BeanInfoDelegate delegate)
 		visitBeanInfo( beanClass, Object.class, delegate );
 	}
 
-	public static void visitBeanInfo(Class beanClass, Class stopClass, BeanInfoDelegate delegate) {
+	public static void visitBeanInfo(Class<?> beanClass, Class<?> stopClass, BeanInfoDelegate delegate) {
 		try {
 			BeanInfo info = Introspector.getBeanInfo( beanClass, stopClass );
 			try {
@@ -70,11 +70,11 @@ public static void visitBeanInfo(Class beanClass, Class stopClass, BeanInfoDeleg
 		}
 	}
 
-	public static <T> T visitBeanInfo(Class beanClass, ReturningBeanInfoDelegate<T> delegate) {
+	public static <T> T visitBeanInfo(Class<?> beanClass, ReturningBeanInfoDelegate<T> delegate) {
 		return visitBeanInfo( beanClass, null, delegate );
 	}
 
-	public static <T> T visitBeanInfo(Class beanClass, Class stopClass, ReturningBeanInfoDelegate<T> delegate) {
+	public static <T> T visitBeanInfo(Class<?> beanClass, Class<?> stopClass, ReturningBeanInfoDelegate<T> delegate) {
 		try {
 			BeanInfo info = Introspector.getBeanInfo( beanClass, stopClass );
 			try {

hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java

@@ -13,18 +13,17 @@
  * @author Gavin King
  * @author Steve Ebersole
  */
-@SuppressWarnings("rawtypes")
-public class ComparableComparator<T extends Comparable> implements Comparator<T>, Serializable {
+public class ComparableComparator<T extends Comparable<T>> implements Comparator<T>, Serializable {
 
+	@SuppressWarnings("rawtypes")
 	public static final Comparator INSTANCE = new ComparableComparator();
 
 	@SuppressWarnings("unchecked")
-	public static <T extends Comparable> Comparator<T> instance() {
+	public static <T extends Comparable<T>> Comparator<T> instance() {
 		return INSTANCE;
 	}
 
-	@SuppressWarnings("unchecked")
-	public int compare(Comparable one, Comparable another) {
+	public int compare(T one, T another) {
 		return one.compareTo( another );
 	}
 }

hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java

@@ -249,10 +249,7 @@ public Set<String> getNamedParameterNames() {
 
 	@Override
 	public QueryParameterImplementor<?> findQueryParameter(String name) {
-		if ( queryParametersByName == null ) {
-			return null;
-		}
-		return queryParametersByName.get( name );
+		return queryParametersByName == null ? null : queryParametersByName.get( name );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java

@@ -44,6 +44,7 @@ protected AbstractClassJavaType(Class<T> type) {
 	 * @param type The Java type.
 	 * @param mutabilityPlan The plan for handling mutability aspects of the java type.
 	 */
+	@SuppressWarnings("unchecked")
 	protected AbstractClassJavaType(Class<T> type, MutabilityPlan<T> mutabilityPlan) {
 		this(
 				type,

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java

@@ -50,7 +50,7 @@ protected AbstractJavaType(Type type, MutabilityPlan<T> mutabilityPlan) {
 		this.mutabilityPlan = mutabilityPlan;
 		this.comparator =
 				type != null && Comparable.class.isAssignableFrom( getJavaTypeClass() )
-						? (Comparator<T>) ComparableComparator.INSTANCE
+						? ComparableComparator.INSTANCE
 						: null;
 	}