miscellaneous code cleanups

Author: gavinking

hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java

@@ -154,7 +154,7 @@ default NaturalIdLoadAccess<T> withLoadGraph(RootGraph<T> graph) {
 	 * @deprecated use {@link #using(Map)} with {@link Map#of}, which is
 	 *             slightly more typesafe
 	 */
-	@Deprecated(since = "6.3")
+	@Deprecated(since = "6.3", forRemoval = true)
 	NaturalIdLoadAccess<T> using(Object... mappings);
 
 	/**

hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java

@@ -4,13 +4,13 @@
  */
 package org.hibernate;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
-
-import static org.hibernate.internal.util.collections.CollectionHelper.asMap;
+import org.hibernate.internal.util.collections.CollectionHelper;
 
 /**
  * Loads multiple instances of a given entity type at once, by
@@ -184,8 +184,17 @@ default NaturalIdMultiLoadAccess<T> with(RootGraph<T> graph) {
 	 *
 	 * @deprecated use {@link Map#of} instead
 	 */
-	@Deprecated(since = "6.3")
+	@Deprecated(since = "6.3", forRemoval = true)
 	static Map<String,?> compoundValue(Object... elements) {
-		return asMap( elements );
+		assert elements != null;
+		assert elements.length % 2 == 0;
+
+		final HashMap<String, Object> map = new HashMap<>();
+		CollectionHelper.collectMapEntries( map::put, elements );
+		for ( int i = 0; i < elements.length; i += 2 ) {
+			map.put( (String) elements[ i ], (Object) elements[ i+1 ] );
+		}
+
+		return map;
 	}
 }

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

@@ -43,7 +43,6 @@
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.mapping.GeneratorCreator;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PersistentClass;
@@ -74,6 +73,7 @@
 import static org.hibernate.id.IdentifierGenerator.GENERATOR_NAME;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.internal.util.StringHelper.qualify;
+import static org.hibernate.internal.util.collections.CollectionHelper.combineUntyped;
 import static org.hibernate.resource.beans.internal.Helper.allowExtensionsInCdi;
 
 /**
@@ -883,7 +883,7 @@ static void createIdGeneratorsFromGeneratorAnnotations(
 					Locale.ROOT,
 					"Identifier attribute '%s' has too many generator annotations: %s",
 					getPath( propertyHolder, inferredData ),
-					CollectionHelper.combineUntyped( idGeneratorAnnotations, generatorAnnotations )
+					combineUntyped( idGeneratorAnnotations, generatorAnnotations )
 			) );
 		}
 		if ( !idGeneratorAnnotations.isEmpty() ) {