Fix NonNull wrapper types support in PropertySelection

This commit ensures that `PropertySelection` supports NonNull wrapper
types like `BookConnection!` when inspecting property paths for
connection edges and nodes.

Fixes gh-1298

Author: bclozel

spring-graphql/src/main/java/org/springframework/graphql/data/query/PropertySelection.java

@@ -24,6 +24,8 @@
 
 import graphql.schema.DataFetchingFieldSelectionSet;
 import graphql.schema.GraphQLNamedOutputType;
+import graphql.schema.GraphQLNonNull;
+import graphql.schema.GraphQLType;
 import graphql.schema.SelectedField;
 
 import org.springframework.data.mapping.PropertyPath;
@@ -108,9 +110,16 @@ else if (isConnectionEdgeNode(selectedField)) {
 	}
 
 	private static boolean isConnectionEdges(SelectedField selectedField) {
-		return selectedField.getName().equals("edges") &&
-				selectedField.getParentField().getType() instanceof GraphQLNamedOutputType namedType &&
-				namedType.getName().endsWith("Connection");
+		if (selectedField.getName().equals("edges")) {
+			GraphQLType fieldType = selectedField.getParentField().getType();
+			if (fieldType instanceof GraphQLNonNull nonNullType) {
+				fieldType = nonNullType.getWrappedType();
+			}
+			if (fieldType instanceof GraphQLNamedOutputType namedType) {
+				return namedType.getName().endsWith("Connection");
+			}
+		}
+		return false;
 	}
 
 	private static boolean isConnectionEdgeNode(SelectedField selectedField) {

spring-graphql/src/test/java/org/springframework/graphql/data/query/PropertySelectionTests.java

@@ -16,13 +16,19 @@
 
 package org.springframework.graphql.data.query;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingFieldSelectionSet;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.graphql.BookSource;
 import org.springframework.graphql.GraphQlSetup;
@@ -34,19 +40,21 @@
  * Unit test for {@link PropertySelection}.
  *
  * @author Rossen Stoyanchev
+ * @author Brian Clozel
  */
 class PropertySelectionTests {
 
-	@Test
-	void propertySelectionWithConnection() {
+	@ParameterizedTest
+	@MethodSource("schemaResource")
+	void propertySelectionWithConnection(Resource schemaResource) {
 
 		AtomicReference<DataFetchingFieldSelectionSet> ref = new AtomicReference<>();
 		DataFetcher<?> dataFetcher = environment -> {
 			ref.set(environment.getSelectionSet());
 			return null;
 		};
 
-		GraphQlSetup.schemaResource(BookSource.paginationSchema)
+		GraphQlSetup.schemaResource(schemaResource)
 				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
 				.dataFetcher("Query", "books", dataFetcher)
 				.toGraphQlService()
@@ -59,4 +67,20 @@ void propertySelectionWithConnection() {
 		assertThat(list).containsExactly("id", "name");
 	}
 
+	static Stream<Arguments> schemaResource() {
+		return Stream.of(
+				Arguments.of(BookSource.paginationSchema),
+				Arguments.of(new ByteArrayResource("""
+						type Query {
+							books(first:Int, after:String): BookConnection!
+						}
+
+						type Book {
+							id: ID
+							name: String
+						}
+						""".getBytes(StandardCharsets.UTF_8)))
+		);
+	}
+
 }