Merge pull request #42423 from marko-bekhta/fix/panache-single-result…

…-exception Make singleResultOptional throw jakarta exceptions
quarkusio · Aug 9, 2024 · a2de5a0 · a2de5a0
2 parents 4ad4bba + 55b1565
commit a2de5a0
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/...src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java b/...src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java
@@ -337,7 +337,10 @@ public <T extends Entity> T singleResult() {
     public <T extends Entity> Optional<T> singleResultOptional() {
         SelectionQuery hibernateQuery = createQuery();
         try (NonThrowingCloseable c = applyFilters()) {
-            return hibernateQuery.uniqueResultOptional();
+            // Yes, there's a much nicer hibernateQuery.uniqueResultOptional() BUT
+            //  it throws org.hibernate.NonUniqueResultException instead of a jakarta.persistence.NonUniqueResultException
+            //  and at this point changing it would be a breaking change >_<
+            return Optional.ofNullable((T) hibernateQuery.getSingleResultOrNull());
         }
     }
 

diff --git a/...sts/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/TestEndpoint.java b/...sts/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/TestEndpoint.java
@@ -1860,4 +1860,41 @@ public String testBug31117() {
         Assertions.assertEquals(1, Person.delete("\r\n  \n\ndelete\nfrom\n Person2\nwhere\nname = ?1", "foo"));
         return "OK";
     }
+
+    @GET
+    @Path("42416")
+    public String testBug42416() {
+        createSomeEntities42416();
+        runSomeTests42416();
+        return "OK";
+    }
+
+    @Transactional
+    public void createSomeEntities42416() {
+        Fruit.deleteAll();
+        Fruit f = new Fruit("apple", "red");
+        f.persist();
+
+        Fruit f2 = new Fruit("apple", "yellow");
+        f2.persist();
+    }
+
+    @Transactional
+    public void runSomeTests42416() {
+        try {
+            Fruit.find("where name = ?1", "apple").singleResult();
+        } catch (jakarta.persistence.NonUniqueResultException e) {
+            // all good let's continue
+        }
+        try {
+            Fruit.find("where name = ?1", "not-a-fruit").singleResult();
+        } catch (jakarta.persistence.NoResultException e) {
+            // all good let's continue
+        }
+        try {
+            Fruit.find("where name = ?1", "apple").singleResultOptional();
+        } catch (jakarta.persistence.NonUniqueResultException e) {
+            // all good let's continue
+        }
+    }
 }
diff --git a/...e-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityTest.java b/...e-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityTest.java
@@ -258,4 +258,9 @@ public void testBug36496() {
     public void testBug31117() {
         RestAssured.when().get("/test/31117").then().body(is("OK"));
     }
+
+    @Test
+    public void testBug42416() {
+        RestAssured.when().get("/test/42416").then().body(is("OK"));
+    }
 }