move JoinedSubclassEntityPersister.reverse() methods to ArrayHelper

Author: gavinking

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

@@ -431,12 +431,50 @@ public static int countNonNull(Object[] array) {
 		return i;
 	}
 
+	/**
+	 * Reverse the elements of the incoming array
+	 *
+	 * @return New array with all elements in reversed order
+	 */
 	public static String[] reverse(String[] source) {
 		final int length = source.length;
 		final String[] destination = new String[length];
 		for ( int i = 0; i < length; i++ ) {
-			final int x = length - i - 1;
-			destination[x] = source[i];
+			destination[length - i - 1] = source[i];
+		}
+		return destination;
+	}
+
+	/**
+	 * Reverse the first n elements of the incoming array
+	 *
+	 * @return New array with the first n elements in reversed order
+	 */
+	public static String[] reverseFirst(String[] objects, int n) {
+		final int length = objects.length;
+		final String[] destination = new String[length];
+		for ( int i = 0; i < n; i++ ) {
+			destination[i] = objects[n - i - 1];
+		}
+		for ( int i = n; i < length; i++ ) {
+			destination[i] = objects[i];
+		}
+		return destination;
+	}
+
+	/**
+	 * Reverse the first n elements of the incoming array
+	 *
+	 * @return New array with the first n elements in reversed order
+	 */
+	public static String[][] reverseFirst(String[][] objects, int n) {
+		final int length = objects.length;
+		final String[][] destination = new String[length][];
+		for ( int i = 0; i < n; i++ ) {
+			destination[i] = objects[n - i - 1];
+		}
+		for ( int i = n; i < length; i++ ) {
+			destination[i] = objects[i];
 		}
 		return destination;
 	}
@@ -485,4 +523,5 @@ public static <T> void forEach(T[] array, Consumer<T> consumer) {
 	public static <T> T[] newInstance(Class<T> elementType, int length) {
 		return (T[]) Array.newInstance( elementType, length );
 	}
+
 }

hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java

@@ -65,6 +65,7 @@
 import org.jboss.logging.Logger;
 
 import static java.util.Collections.emptyMap;
+import static org.hibernate.internal.util.collections.ArrayHelper.reverseFirst;
 import static org.hibernate.internal.util.collections.ArrayHelper.to2DStringArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toIntArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toStringArray;
@@ -341,12 +342,12 @@ public JoinedSubclassEntityPersister(
 		// the first table as it will the driving table.
 		// tableNames -> CLIENT, PERSON
 
-		this.tableNames = reverse( naturalOrderTableNames, coreTableSpan );
-		tableKeyColumns = reverse( naturalOrderTableKeyColumns, coreTableSpan );
-		tableKeyColumnReaders = reverse( naturalOrderTableKeyColumnReaders, coreTableSpan );
-		tableKeyColumnReaderTemplates = reverse( naturalOrderTableKeyColumnReaderTemplates, coreTableSpan );
-		subclassTableNameClosure = reverse( naturalOrderSubclassTableNameClosure, coreTableSpan );
-		subclassTableKeyColumnClosure = reverse( naturalOrderSubclassTableKeyColumnClosure, coreTableSpan );
+		this.tableNames = reverseFirst( naturalOrderTableNames, coreTableSpan );
+		tableKeyColumns = reverseFirst( naturalOrderTableKeyColumns, coreTableSpan );
+		tableKeyColumnReaders = reverseFirst( naturalOrderTableKeyColumnReaders, coreTableSpan );
+		tableKeyColumnReaderTemplates = reverseFirst( naturalOrderTableKeyColumnReaderTemplates, coreTableSpan );
+		subclassTableNameClosure = reverseFirst( naturalOrderSubclassTableNameClosure, coreTableSpan );
+		subclassTableKeyColumnClosure = reverseFirst( naturalOrderSubclassTableKeyColumnClosure, coreTableSpan );
 
 		spaces = ArrayHelper.join( this.tableNames, toStringArray( persistentClass.getSynchronizedTables() ) );
 
@@ -800,46 +801,6 @@ public boolean isPropertyOfTable(int property, int j) {
 		return naturalOrderPropertyTableNumbers[property] == j;
 	}
 
-	/**
-	 * Reverse the first n elements of the incoming array
-	 *
-	 * @return New array with the first n elements in reversed order
-	 */
-	private static String[] reverse(String[] objects, int n) {
-
-		int size = objects.length;
-		String[] temp = new String[size];
-
-		for ( int i = 0; i < n; i++ ) {
-			temp[i] = objects[n - i - 1];
-		}
-
-		for ( int i = n; i < size; i++ ) {
-			temp[i] = objects[i];
-		}
-
-		return temp;
-	}
-
-	/**
-	 * Reverse the first n elements of the incoming array
-	 *
-	 * @return New array with the first n elements in reversed order
-	 */
-	private static String[][] reverse(String[][] objects, int n) {
-		int size = objects.length;
-		String[][] temp = new String[size][];
-		for ( int i = 0; i < n; i++ ) {
-			temp[i] = objects[n - i - 1];
-		}
-
-		for ( int i = n; i < size; i++ ) {
-			temp[i] = objects[i];
-		}
-
-		return temp;
-	}
-
 	@Override
 	public String getTableName() {
 		return tableNames[0];