HHH-18981 Adapt test for ORM 6.6 branch

Author: beikov

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAndElementArgumentTypeResolver.java

@@ -6,6 +6,8 @@
  */
 package org.hibernate.dialect.function.array;
 
+import java.util.List;
+
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.DomainType;
@@ -37,12 +39,13 @@ public MappingModelExpressible<?> resolveFunctionArgumentType(
 			SqmFunction<?> function,
 			int argumentIndex,
 			SqmToSqlAstConverter converter) {
+		final List<? extends SqmTypedNode<?>> arguments = function.getArguments();
 		if ( argumentIndex == arrayIndex ) {
 			for ( int elementIndex : elementIndexes ) {
 				if ( elementIndex >= arguments.size() ) {
 					continue;
 				}
-				final SqmTypedNode<?> node = function.getArguments().get( elementIndex );
+				final SqmTypedNode<?> node = arguments.get( elementIndex );
 				if ( node instanceof SqmExpression<?> ) {
 					final MappingModelExpressible<?> expressible = converter.determineValueMapping( (SqmExpression<?>) node );
 					if ( expressible != null ) {
@@ -55,7 +58,7 @@ public MappingModelExpressible<?> resolveFunctionArgumentType(
 			}
 		}
 		else if ( ArrayHelper.contains( elementIndexes, argumentIndex ) ) {
-			final SqmTypedNode<?> node = function.getArguments().get( arrayIndex );
+			final SqmTypedNode<?> node = arguments.get( arrayIndex );
 			if ( node instanceof SqmExpression<?> ) {
 				final MappingModelExpressible<?> expressible = converter.determineValueMapping( (SqmExpression<?>) node );
 				if ( expressible != null ) {

hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringWithArrayAggregateTest.java

@@ -1,6 +1,8 @@
 /*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
 package org.hibernate.orm.test.function.array;
 
@@ -11,8 +13,8 @@
 import org.hibernate.query.criteria.JpaCteCriteria;
 import org.hibernate.query.criteria.JpaRoot;
 import org.hibernate.query.sqm.NodeBuilder;
-import org.hibernate.testing.orm.junit.DialectFeatureChecks.SupportsArrayToString;
-import org.hibernate.testing.orm.junit.DialectFeatureChecks.SupportsArrayAgg;
+
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -32,8 +34,7 @@
 @DomainModel(
 		annotatedClasses = {ArrayToStringWithArrayAggregateTest.Book.class, ArrayToStringWithArrayAggregateTest.Dummy.class})
 @SessionFactory
-@RequiresDialectFeature(feature = SupportsArrayToString.class)
-@RequiresDialectFeature(feature = SupportsArrayAgg.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsStructuralArrays.class)
 @JiraKey("HHH-18981")
 public class ArrayToStringWithArrayAggregateTest {