Polishing.

Use TypeName instead of Object actualReturnType for improved contextual representation of the type. Refine query type and return type usage. Add integration tests to verify query consistency.

See #5178
Original pull request: #5179

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/QueryBlocks.java

@@ -23,6 +23,7 @@
 
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.javapoet.TypeNames;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.annotation.Collation;
@@ -39,6 +40,7 @@
 import org.springframework.data.util.Lazy;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
+import org.springframework.javapoet.TypeName;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
@@ -76,26 +78,25 @@ CodeBlock build() {
 			MongoEntityMetadata<?> entityMetadata = queryMethod.getEntityInformation();
 
 			Builder builder = CodeBlock.builder();
-
-			boolean isProjecting = context.getReturnedType().isProjecting();
 			boolean hasDynamicProjection = queryMethod.getParameters().hasDynamicProjection();
 			Class<?> queryType = entityMetadata.getCollectionEntity().getType();
-			Class<?> entityType = entityMetadata.getJavaType();
-			Object actualReturnType = hasDynamicProjection || isProjecting
-					? methodReturn.getActualTypeName()
-					: entityType;
+			boolean isDocumentReturn = methodReturn.getActualReturnClass().equals(Document.class);
+			boolean isProjecting = context.getReturnedType().isProjecting()
+					|| !queryType.equals(entityMetadata.getJavaType());
+			TypeName actualReturnType = isDocumentReturn ? methodReturn.getActualClassName()
+					: TypeNames.typeNameOrWrapper(methodReturn.getActualType());
 
 			builder.add("\n");
 
 			if (hasDynamicProjection) {
-				builder.addStatement("$T<$T> $L = $L.query($T.class).as($L)", FindWithQuery.class, actualReturnType,
+				builder.addStatement("$1T<$2T> $3L = $4L.query($5T.class).as($6L)", FindWithQuery.class, actualReturnType,
 						context.localVariable("finder"), mongoOpsRef, queryType, context.getDynamicProjectionParameterName());
-			} else if (isProjecting || !queryType.equals(entityType)) {
-				builder.addStatement("$T<$T> $L = $L.query($T.class).as($T.class)", FindWithQuery.class, actualReturnType,
-						context.localVariable("finder"), mongoOpsRef, queryType, actualReturnType);
-			} else {
-				builder.addStatement("$T<$T> $L = $L.query($T.class)", FindWithQuery.class, actualReturnType,
+			} else if (isProjecting) {
+				builder.addStatement("$1T<$2T> $3L = $4L.query($5T.class).as($2T.class)", FindWithQuery.class, actualReturnType,
 						context.localVariable("finder"), mongoOpsRef, queryType);
+			} else {
+				builder.addStatement("$1T<$2T> $3L = $4L.query($2T.class)", FindWithQuery.class, queryType,
+						context.localVariable("finder"), mongoOpsRef);
 			}
 
 			String terminatingMethod;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java

@@ -15,12 +15,10 @@
  */
 package org.springframework.data.mongodb.repository;
 
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.springframework.data.geo.Metrics.KILOMETERS;
+import static java.util.Arrays.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assumptions.*;
+import static org.springframework.data.geo.Metrics.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,22 +38,13 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.domain.*;
 import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher;
-import org.springframework.data.domain.Limit;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Range;
-import org.springframework.data.domain.ScrollPosition;
-import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.domain.Window;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
@@ -185,6 +174,14 @@ void findsPersonsByLastname() {
 		assertThat(result).hasSize(1).contains(carter);
 	}
 
+	@Test // GH-5178
+	@SuppressWarnings("rawtypes")
+	void findsExtendedPersonsByLastname() {
+
+		List<ExtendedPerson> result = repository.findExtendedPersonByLastname("Beauford");
+		assertThat(result).hasSize(1).extracting(ExtendedPerson::getClass).contains((Class) ExtendedPerson.class);
+	}
+
 	@Test
 	void findsPersonsByFirstname() {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ExtendedPerson.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2026-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository;
+
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * @author Mark Paluch
+ */
+@Document("person")
+public class ExtendedPerson extends Person {}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java

@@ -67,6 +67,8 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	 */
 	List<Person> findByLastname(String lastname);
 
+	List<ExtendedPerson> findExtendedPersonByLastname(String lastname);
+
 	List<Person> findByLastnameStartsWith(String prefix);
 
 	List<Person> findByLastnameEndsWith(String postfix);