misc minor changes

Author: gavinking

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

@@ -5,7 +5,6 @@
 package org.hibernate.engine.spi;
 
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -27,7 +26,9 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static java.util.Collections.emptyMap;
 import static java.util.Collections.emptySet;
+import static java.util.Collections.unmodifiableSet;
 import static org.hibernate.engine.FetchStyle.SUBSELECT;
 
 /**
@@ -73,8 +74,8 @@ public LoadQueryInfluencers(SessionFactoryImplementor sessionFactory, SessionCre
 		batchSize = options.getDefaultBatchFetchSize();
 		subselectFetchEnabled = options.isSubselectFetchEnabled();
 		effectiveEntityGraph = new EffectiveEntityGraph();
-		for (FilterDefinition filterDefinition : sessionFactory.getAutoEnabledFilters()) {
-			FilterImpl filter = new FilterImpl( filterDefinition );
+		for ( FilterDefinition filterDefinition : sessionFactory.getAutoEnabledFilters() ) {
+			final FilterImpl filter = new FilterImpl( filterDefinition );
 			if ( enabledFilters == null ) {
 				enabledFilters = new TreeMap<>();
 			}
@@ -158,7 +159,7 @@ public boolean hasEnabledFilters() {
 	public Map<String,Filter> getEnabledFilters() {
 		final TreeMap<String, Filter> enabledFilters = this.enabledFilters;
 		if ( enabledFilters == null ) {
-			return Collections.emptyMap();
+			return emptyMap();
 		}
 		else {
 			// First, validate all the enabled filters...
@@ -175,27 +176,17 @@ public Map<String,Filter> getEnabledFilters() {
 	 * @return an unmodifiable Set of enabled filter names.
 	 */
 	public Set<String> getEnabledFilterNames() {
-		if ( enabledFilters == null ) {
-			return emptySet();
-		}
-		else {
-			return Collections.unmodifiableSet( enabledFilters.keySet() );
-		}
+		return enabledFilters == null ? emptySet() : unmodifiableSet( enabledFilters.keySet() );
 	}
 
 	public @Nullable Filter getEnabledFilter(String filterName) {
-		if ( enabledFilters == null ) {
-			return null;
-		}
-		else {
-			return enabledFilters.get( filterName );
-		}
+		return enabledFilters == null ? null : enabledFilters.get( filterName );
 	}
 
 	public Filter enableFilter(String filterName) {
-		FilterImpl filter = new FilterImpl( sessionFactory.getFilterDefinition( filterName ) );
+		final FilterImpl filter = new FilterImpl( sessionFactory.getFilterDefinition( filterName ) );
 		if ( enabledFilters == null ) {
-			this.enabledFilters = new TreeMap<>();
+			enabledFilters = new TreeMap<>();
 		}
 		enabledFilters.put( filterName, filter );
 		return filter;
@@ -269,7 +260,8 @@ public void disableFetchProfile(String name) throws UnknownProfileException {
 	}
 
 	@Internal
-	public @Nullable HashSet<String> adjustFetchProfiles(@Nullable Set<String> disabledFetchProfiles, @Nullable Set<String> enabledFetchProfiles) {
+	public @Nullable HashSet<String> adjustFetchProfiles(
+			@Nullable Set<String> disabledFetchProfiles, @Nullable Set<String> enabledFetchProfiles) {
 		final HashSet<String> currentEnabledFetchProfileNames = this.enabledFetchProfileNames;
 		final HashSet<String> oldFetchProfiles;
 		if ( currentEnabledFetchProfileNames == null || currentEnabledFetchProfileNames.isEmpty() ) {

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

@@ -3016,7 +3016,8 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 		// filter, which will fail when called before FilterImpl#afterDeserialize( factory );
 		// Instead lookup the filter by name and then call FilterImpl#afterDeserialize( factory ).
 		for ( String filterName : loadQueryInfluencers.getEnabledFilterNames() ) {
-			( (FilterImpl) loadQueryInfluencers.getEnabledFilter( filterName ) ).afterDeserialize( getFactory() );
+			( (FilterImpl) loadQueryInfluencers.getEnabledFilter( filterName ) )
+					.afterDeserialize( getFactory() );
 		}
 
 		eventListenerGroups = getFactory().getEventListenerGroups();

hibernate-vector/src/main/java/org/hibernate/vector/VectorArgumentValidator.java

@@ -13,9 +13,7 @@
 import org.hibernate.query.sqm.produce.function.FunctionArgumentException;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
 import org.hibernate.type.BasicPluralType;
-import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * A {@link ArgumentsValidator} that validates the arguments are all vector types i.e. {@link org.hibernate.type.SqlTypes#VECTOR}.
@@ -46,18 +44,10 @@ public void validate(
 	}
 
 	private static boolean isVectorType(SqmExpressible<?> vectorType) {
-		if ( !( vectorType instanceof BasicPluralType<?, ?> ) ) {
-			return false;
-		}
-
-		switch ( ( (BasicType<?>) vectorType ).getJdbcType().getDefaultSqlTypeCode() ) {
-			case SqlTypes.VECTOR:
-			case SqlTypes.VECTOR_INT8:
-			case SqlTypes.VECTOR_FLOAT32:
-			case SqlTypes.VECTOR_FLOAT64:
-				return true;
-			default:
-				return false;
-		}
+		return vectorType instanceof BasicPluralType<?, ?> basicPluralType
+			&& switch ( basicPluralType.getJdbcType().getDefaultSqlTypeCode() ) {
+			case SqlTypes.VECTOR, SqlTypes.VECTOR_INT8, SqlTypes.VECTOR_FLOAT32, SqlTypes.VECTOR_FLOAT64 -> true;
+			default -> false;
+		};
 	}
 }