Merge pull request #42241 from geoand/#42239

Fix Optional result type handling in Spring Data JPA

Author: geoand

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

@@ -124,7 +124,7 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
             if (customResultType == null) {
                 ResultHandle casted = tryBlock.checkCast(singleResult, entityClassInfo.name().toString());
                 ResultHandle optional = tryBlock.invokeStaticMethod(
-                        MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
+                        MethodDescriptor.ofMethod(Optional.class, "ofNullable", Optional.class, Object.class),
                         casted);
                 tryBlock.returnValue(optional);
             } else {
@@ -134,7 +134,7 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
                                 originalResultType),
                         singleResult);
                 ResultHandle optional = tryBlock.invokeStaticMethod(
-                        MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
+                        MethodDescriptor.ofMethod(Optional.class, "ofNullable", Optional.class, Object.class),
                         customResult);
                 tryBlock.returnValue(optional);
             }

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookListCrudRepository.java

@@ -1,6 +1,10 @@
 package io.quarkus.spring.data.deployment;
 
+import java.util.Optional;
+
 import org.springframework.data.repository.ListCrudRepository;
 
 public interface BookListCrudRepository extends ListCrudRepository<Book, Integer> {
+
+    Optional<Book> findFirstByNameOrderByBid(String name);
 }

extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BookListCrudRepositoryTest.java

@@ -69,6 +69,12 @@ public void shouldSaveBooks() {
                 "Harry Potter and the Prisoner of Azkaban", "Harry Potter and the Globet of Fire");
     }
 
+    @Test
+    @Transactional
+    public void optionalWithNonExisting() {
+        assertThat(repo.findFirstByNameOrderByBid("foobar")).isEmpty();
+    }
+
     private Book populateBook(Integer id, String title) {
         Book book = new Book();
         book.setBid(id);