Merge pull request quarkusio#52783 from geoand/quarkusio#34350-take2

Handle projections with generic types

Author: geoand

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java

@@ -301,7 +301,7 @@ protected Type verifyQueryResultType(Type t, IndexView index) {
             return verifyQueryResultType(t.asArrayType().constituent(), index);
         } else if (t.kind() == Type.Kind.PARAMETERIZED_TYPE) {
             final List<Type> types = t.asParameterizedType().arguments();
-            if (types.size() == 1) {
+            if (types.size() == 1 && isKnownContainerType(t.name())) {
                 return verifyQueryResultType(types.get(0), index);
             } else {
                 for (Type type : types) {
@@ -319,6 +319,17 @@ protected Type verifyQueryResultType(Type t, IndexView index) {
         return t;
     }
 
+    private static boolean isKnownContainerType(DotName name) {
+        return DotNames.LIST.equals(name)
+                || DotNames.COLLECTION.equals(name)
+                || DotNames.SET.equals(name)
+                || DotNames.OPTIONAL.equals(name)
+                || DotNames.STREAM.equals(name)
+                || DotNames.ITERATOR.equals(name)
+                || DotNames.SPRING_DATA_PAGE.equals(name)
+                || DotNames.SPRING_DATA_SLICE.equals(name);
+    }
+
     protected DotName createSimpleInterfaceImpl(DotName ifaceName, DotName entityName) {
         String fullName = ifaceName.toString();
 

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java

@@ -300,7 +300,7 @@ private Type extractResultType(ClassInfo repositoryClassInfo, MethodInfo method)
 
             int matchingIndex = -1;
             for (int i = 0; i < interfaceTypeVariables.size(); i++) {
-                if (interfaceTypeVariables.get(i).equals(resultTypeVariable)) {
+                if (interfaceTypeVariables.get(i).identifier().equals(resultTypeVariable.identifier())) {
                     matchingIndex = i;
                     break;
                 }

integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/generics/FatherBase.java

@@ -14,4 +14,24 @@ public class FatherBase<T extends ChildBase> {
     float test;
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
     private List<T> children;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public float getTest() {
+        return test;
+    }
+
+    public List<T> getChildren() {
+        return children;
+    }
 }

integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/generics/MultiTypeParamBaseRepository.java

@@ -0,0 +1,26 @@
+package io.quarkus.it.spring.data.jpa.generics;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+@NoRepositoryBean
+public interface MultiTypeParamBaseRepository<T extends FatherBase<C>, C extends ChildBase> extends JpaRepository<T, Long> {
+    List<T> findAllTestById(Long id);
+
+    Optional<SmallParent> findSomethingByIdAndName(Long id, String name);
+
+    GenericParent<C> findChildrenById(Long id);
+
+    interface GenericParent<T extends ChildBase> {
+        List<T> getChildren();
+    }
+
+    interface SmallParent {
+        int getAge();
+
+        float getTest();
+    }
+}

integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/generics/MultiTypeParamFatherRepository.java

@@ -0,0 +1,4 @@
+package io.quarkus.it.spring.data.jpa.generics;
+
+public interface MultiTypeParamFatherRepository extends MultiTypeParamBaseRepository<Father, Child> {
+}

integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/generics/MultiTypeParamResource.java

@@ -0,0 +1,45 @@
+package io.quarkus.it.spring.data.jpa.generics;
+
+import java.util.List;
+import java.util.Optional;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+@Path("/rest/multi-type-param-fathers")
+@ApplicationScoped
+public class MultiTypeParamResource {
+    private final MultiTypeParamFatherRepository repository;
+
+    public MultiTypeParamResource(MultiTypeParamFatherRepository repository) {
+        this.repository = repository;
+    }
+
+    @GET
+    @Path("/findAllTestById/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public int findAllTestById(@PathParam("id") Long id) {
+        List<Father> fathers = repository.findAllTestById(id);
+        return fathers.size();
+    }
+
+    @GET
+    @Path("/findSomethingByIdAndName/{id}/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String findSomethingByIdAndName(@PathParam("id") Long id, @PathParam("name") String name) {
+        Optional<MultiTypeParamBaseRepository.SmallParent> result = repository.findSomethingByIdAndName(id, name);
+        return result.map(p -> p.getAge() + ":" + p.getTest()).orElse("empty");
+    }
+
+    @GET
+    @Path("/findChildrenById/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public int findChildrenById(@PathParam("id") Long id) {
+        MultiTypeParamBaseRepository.GenericParent<Child> result = repository.findChildrenById(id);
+        return result.getChildren().size();
+    }
+}

integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/generics/MultiTypeParamResourceTest.java

@@ -0,0 +1,36 @@
+package io.quarkus.it.spring.data.jpa.generics;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class MultiTypeParamResourceTest {
+
+    @Test
+    public void shouldFindAllTestById() {
+        given()
+                .when().get("/rest/multi-type-param-fathers/findAllTestById/1")
+                .then()
+                .statusCode(200).body(containsString("1"));
+    }
+
+    @Test
+    public void shouldFindSomethingByIdAndName() {
+        given()
+                .when().get("/rest/multi-type-param-fathers/findSomethingByIdAndName/1/John Doe")
+                .then()
+                .statusCode(200).body(containsString("40:75.5"));
+    }
+
+    @Test
+    public void shouldFindChildrenById() {
+        given()
+                .when().get("/rest/multi-type-param-fathers/findChildrenById/1")
+                .then()
+                .statusCode(200).body(containsString("3"));
+    }
+}