HHH-18976 Use dedicated methods in ArrayHelper for copy of well-known types

Author: yrodiere

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleCollectionTracker.java

@@ -32,7 +32,7 @@ public void add(String name, int size) {
 				return;
 			}
 		}
-		names = Arrays.copyOf( names, names.length + 1 );
+		names = ArrayHelper.copyOf( names, names.length + 1 );
 		names[names.length - 1] = name;
 		sizes = Arrays.copyOf( sizes, sizes.length + 1 );
 		sizes[sizes.length - 1] = size;

hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java

@@ -11,7 +11,6 @@
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.AbstractCollection;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -1546,13 +1545,12 @@ private static class CustomArrayList extends AbstractCollection<Object> implemen
 		Object[] array = ArrayHelper.EMPTY_OBJECT_ARRAY;
 		int size;
 
-		@AllowReflection
 		public void ensureCapacity(int minCapacity) {
 			int oldCapacity = array.length;
 			if ( minCapacity > oldCapacity ) {
 				int newCapacity = oldCapacity + ( oldCapacity >> 1 );
 				newCapacity = Math.max( Math.max( newCapacity, minCapacity ), 10 );
-				array = Arrays.copyOf( array, newCapacity );
+				array = ArrayHelper.copyOf( array, newCapacity );
 			}
 		}
 
@@ -1609,9 +1607,8 @@ public Object next() {
 		}
 
 		@Override
-		@AllowReflection
 		public Object[] toArray() {
-			return Arrays.copyOf( array, size );
+			return ArrayHelper.copyOf( array, size );
 		}
 
 		@Override

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

@@ -532,4 +532,34 @@ public static <T> T[] newInstance(Class<T> elementType, int length) {
 		return (T[]) Array.newInstance( elementType, length );
 	}
 
+	/**
+	 * Alternative to {@link Arrays#copyOf(Object[], int)} that is specific to String[],
+	 * but does not require reflection.
+	 *
+	 * @param original the array to be copied
+	 * @param newLength the length of the copy to be returned
+	 * @return a copy of the original array, truncated or padded with nulls
+	 *     to obtain the specified length
+	 */
+	public static String[] copyOf(String[] original, int newLength) {
+		String[] copy = new String[newLength];
+		System.arraycopy( original, 0, copy, 0, Math.min( original.length, newLength ) );
+		return copy;
+	}
+
+	/**
+	 * Alternative to {@link Arrays#copyOf(Object[], int)} that is specific to Object[] (no support for generics),
+	 * but does not require reflection.
+	 *
+	 * @param original the array to be copied
+	 * @param newLength the length of the copy to be returned
+	 * @return a copy of the original array, truncated or padded with nulls
+	 * to obtain the specified length
+	 */
+	public static Object[] copyOf(Object[] original, int newLength) {
+		Object[] copy = new Object[newLength];
+		System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+		return copy;
+	}
+
 }

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

@@ -4,9 +4,7 @@
  */
 package org.hibernate.internal.util.collections;
 
-import org.hibernate.internal.build.AllowReflection;
 
-import java.util.Arrays;
 import java.util.NoSuchElementException;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -144,11 +142,10 @@ public <X, Y> X findCurrentFirstWithParameter(Y parameter, BiFunction<T, Y, X> b
 		return null;
 	}
 
-	@AllowReflection
 	private void grow() {
 		final int oldCapacity = elements.length;
 		final int jump = ( oldCapacity < 64 ) ? ( oldCapacity + 2 ) : ( oldCapacity >> 1 );
-		elements = Arrays.copyOf( elements, oldCapacity + jump );
+		elements = ArrayHelper.copyOf( elements, oldCapacity + jump );
 	}
 
 }

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java

@@ -4,10 +4,9 @@
  */
 package org.hibernate.persister.entity.mutation;
 
-import java.util.Arrays;
 import java.util.BitSet;
 
-import org.hibernate.internal.build.AllowReflection;
+import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.sql.model.TableMapping;
 
 /**
@@ -69,14 +68,13 @@ private boolean addForChecks(final TableMapping tableMapping) {
 	}
 
 	//Meant for assertions only
-	@AllowReflection
 	private void ensureCapacity(final int position) {
 		final int increments = 3; //Needs to be at least 1.
 		if ( checks == null ) {
 			checks = new Object[position + increments];
 		}
 		else if ( checks.length <= position ) {
-			checks = Arrays.copyOf( checks, position + increments );
+			checks = ArrayHelper.copyOf( checks, position + increments );
 		}
 	}
 

rules/forbidden-apis.txt

@@ -15,7 +15,7 @@ org.hibernate.internal.util.collections.ArrayHelper#newInstance(java.lang.Class,
 org.hibernate.internal.util.collections.ArrayHelper#filledArray(java.lang.Object, java.lang.Class, int)
 org.hibernate.internal.util.collections.ArrayHelper#join(java.lang.Object[], java.lang.Object[])
 
-@defaultMessage This forbidden method requires reflection and may not work in natively compiled applications. If you really must use this forbidden method, annotate the calling method with @AllowReflection.
+@defaultMessage Use a type-specific 'ArrayHelper.copyOf' instead if possible. This forbidden method requires reflection and may not work in natively compiled applications. If you really must use this forbidden method, annotate the calling method with @AllowReflection.
 
 java.util.Arrays#copyOf(java.lang.Object[], int)
 java.util.Arrays#copyOf(java.lang.Object[], int, java.lang.Class)