Fix repo return

Author: christophstrobl

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaCodeBlocks.java

@@ -722,7 +722,7 @@ public CodeBlock build() {
 
 				if (isProjecting) {
 
-					TypeName returnType = TypeNames.typeNameOrWrapper(methodReturn.getActualType());
+					TypeName returnType = methodReturn.getActualTypeName();
 					CodeBlock convertTo;
 					if (StringUtils.hasText(context.getDynamicProjectionParameterName())) {
 						convertTo = CodeBlock.of("$L", context.getDynamicProjectionParameterName());

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/BaseRepository.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025-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.jpa.repository.aot;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * @author Christoph Strobl
+ */
+@NoRepositoryBean
+public interface BaseRepository<T, ID> extends CrudRepository<T, ID> {
+
+    @Query("select u from #{#entityName} u where u.emailAddress = ?1")
+	T findByEmailAddressViaTemplatedDeclaredInBaseRepo(String emailAddress);
+}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRepositoryContributorIntegrationTests.java

@@ -347,6 +347,16 @@ void shouldResolveTemplatedQuery() {
 		assertThat(user.getFirstname()).isEqualTo("Han");
 	}
 
+    @Test // GH-4028
+    void shouldResolveTemplatedQueryFromBaseRepo() {
+
+        User user = fragment.findByEmailAddressViaTemplatedDeclaredInBaseRepo("[email protected]");
+
+        assertThat(user).isNotNull();
+        assertThat(user.getFirstname()).isEqualTo("Han");
+    }
+
+
 	@Test // GH-3830
 	void shouldEvaluateExpressionByName() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRepositoryMetadataIntegrationTests.java

@@ -15,14 +15,13 @@
  */
 package org.springframework.data.jpa.repository.aot;
 
-import static net.javacrumbs.jsonunit.assertj.JsonAssertions.*;
-import static org.assertj.core.api.Assertions.*;
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
@@ -35,6 +34,7 @@
  * Integration tests for the {@link UserRepository} JSON metadata via {@link JpaRepositoryContributor}.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 @SpringJUnitConfig(classes = JpaRepositoryMetadataIntegrationTests.JpaRepositoryContributorConfiguration.class)
 @Transactional
@@ -74,10 +74,9 @@ void shouldDocumentDerivedQuery() throws IOException {
 		assertThat(resource.exists()).isTrue();
 
 		String json = resource.getContentAsString(StandardCharsets.UTF_8);
-
-		assertThatJson(json).inPath("$.methods[0]").isObject().containsEntry("name", "countUsersByLastname");
-		assertThatJson(json).inPath("$.methods[0].query").isObject().containsEntry("query",
-				"SELECT COUNT(u) FROM org.springframework.data.jpa.domain.sample.User u WHERE u.lastname = :lastname");
+		assertThatJson(json).inPath("$.methods[?(@.name == 'countUsersByLastname')].query").isArray().element(0).isObject()
+				.containsEntry("query",
+						"SELECT COUNT(u) FROM org.springframework.data.jpa.domain.sample.User u WHERE u.lastname = :lastname");
 	}
 
 	@Test // GH-3830

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/UserRepository.java

@@ -41,7 +41,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-interface UserRepository extends CrudRepository<User, Integer> {
+interface UserRepository extends BaseRepository<User, Integer> {
 
 	List<User> findUserNoArgumentsBy();