HHH-18875 Avoid need for refletive registrations triggered by StandardStack's custom implementation

Author: Sanne

hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.internal.util.collections;
 
-import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.NoSuchElementException;
 import java.util.function.BiFunction;
@@ -21,24 +20,34 @@
  * @author Marco Belladelli
  */
 public final class StandardStack<T> implements Stack<T> {
-	private T[] elements;
+	private Object[] elements;
 	private int top = 0;
 
-	private Class<T> type;
+	public StandardStack() {
+	}
+
+	public StandardStack(T initialValue) {
+		push( initialValue );
+	}
 
+	/**
+	 * @deprecated use the default constructor instead
+	 */
+	@Deprecated(forRemoval = true)
 	public StandardStack(Class<T> type) {
-		this.type = type;
 	}
 
+	/**
+	 * @deprecated use {@link #StandardStack(Object)} instead.
+	 */
+	@Deprecated(forRemoval = true)
 	public StandardStack(Class<T> type, T initial) {
-		this( type );
 		push( initial );
 	}
 
 	@SuppressWarnings("unchecked")
 	private void init() {
-		elements = (T[]) Array.newInstance( type, 8 );
-		type = null;
+		elements = (T[]) new Object[8];
 	}
 
 	@Override
@@ -57,7 +66,7 @@ public T pop() {
 		if ( isEmpty() ) {
 			throw new NoSuchElementException();
 		}
-		T e = elements[--top];
+		T e = (T) elements[--top];
 		elements[top] = null;
 		return e;
 	}
@@ -67,23 +76,23 @@ public T getCurrent() {
 		if ( isEmpty() ) {
 			return null;
 		}
-		return elements[top - 1];
+		return (T) elements[top - 1];
 	}
 
 	@Override
 	public T peek(int offsetFromTop) {
 		if ( isEmpty() ) {
 			return null;
 		}
-		return elements[top - offsetFromTop - 1];
+		return (T) elements[top - offsetFromTop - 1];
 	}
 
 	@Override
 	public T getRoot() {
 		if ( isEmpty() ) {
 			return null;
 		}
-		return elements[0];
+		return (T) elements[0];
 	}
 
 	@Override
@@ -107,14 +116,14 @@ public void clear() {
 	@Override
 	public void visitRootFirst(Consumer<T> action) {
 		for ( int i = 0; i < top; i++ ) {
-			action.accept( elements[i] );
+			action.accept( (T) elements[i] );
 		}
 	}
 
 	@Override
 	public <X> X findCurrentFirst(Function<T, X> function) {
 		for ( int i = top - 1; i >= 0; i-- ) {
-			final X result = function.apply( elements[i] );
+			final X result = function.apply( (T) elements[i] );
 			if ( result != null ) {
 				return result;
 			}
@@ -125,7 +134,7 @@ public <X> X findCurrentFirst(Function<T, X> function) {
 	@Override
 	public <X, Y> X findCurrentFirstWithParameter(Y parameter, BiFunction<T, Y, X> biFunction) {
 		for ( int i = top - 1; i >= 0; i-- ) {
-			final X result = biFunction.apply( elements[i], parameter );
+			final X result = biFunction.apply( (T) elements[i], parameter );
 			if ( result != null ) {
 				return result;
 			}
@@ -138,4 +147,5 @@ private void grow() {
 		final int jump = ( oldCapacity < 64 ) ? ( oldCapacity + 2 ) : ( oldCapacity >> 1 );
 		elements = Arrays.copyOf( elements, oldCapacity + jump );
 	}
+
 }