very minor code changes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java

@@ -601,14 +601,10 @@ private static <T> void cascadeCollectionElements(
 		}
 
 		// a newly instantiated collection can't have orphans
-		final PersistentCollection<?> persistentCollection;
-		if ( child instanceof PersistentCollection<?> pc ) {
-			persistentCollection = pc;
-		}
-		else {
-			persistentCollection = eventSource.getPersistenceContext()
-					.getCollectionHolder( child );
-		}
+		final PersistentCollection<?> persistentCollection =
+				child instanceof PersistentCollection<?> collection
+						? collection
+						: eventSource.getPersistenceContext().getCollectionHolder( child );
 
 		final boolean deleteOrphans = style.hasOrphanDelete()
 				&& action.deleteOrphans()

hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java

@@ -188,12 +188,7 @@ public JdbcValuesMapping resolve(
 		final int numberOfResults;
 		final int rowSize = jdbcResultsMetadata.getColumnCount();
 
-		if ( resultBuilders == null ) {
-			numberOfResults = rowSize;
-		}
-		else {
-			numberOfResults = resultBuilders.size();
-		}
+		numberOfResults = resultBuilders == null ? rowSize : resultBuilders.size();
 
 		final List<SqlSelection> sqlSelections = new ArrayList<>( rowSize );
 		final List<DomainResult<?>> domainResults = new ArrayList<>( numberOfResults );

hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.query.spi;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -18,6 +17,8 @@
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
 
+import static java.util.Collections.emptyList;
+
 public abstract class QueryOptionsAdapter implements QueryOptions {
 
 	@Override
@@ -42,7 +43,7 @@ public LockOptions getLockOptions() {
 
 	@Override
 	public List<String> getDatabaseHints() {
-		return Collections.emptyList();
+		return emptyList();
 	}
 
 	@Override