From 9f3bac87201146c0b9e7575da385a9751bc8a782 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Mon, 9 Dec 2024 14:34:01 +0100
Subject: [PATCH] Switch to `Query.getSingleResultOrNull()`.

We now use getSingleResultOrNull() to avoid NoResultException handling.

Closes #3701
---
 .../repository/query/JpaQueryExecution.java   | 11 ++---------
 .../support/SimpleJpaRepository.java          | 19 +++++--------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
index 82482cd99c..b6dd20cd47 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
@@ -16,7 +16,6 @@
 package org.springframework.data.jpa.repository.query;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.NoResultException;
 import jakarta.persistence.Query;
 import jakarta.persistence.StoredProcedureQuery;
 
@@ -87,13 +86,7 @@ public Object execute(AbstractJpaQuery query, JpaParametersParameterAccessor acc
 		Assert.notNull(query, "AbstractJpaQuery must not be null");
 		Assert.notNull(accessor, "JpaParametersParameterAccessor must not be null");
 
-		Object result;
-
-		try {
-			result = doExecute(query, accessor);
-		} catch (NoResultException e) {
-			return null;
-		}
+		Object result = doExecute(query, accessor);
 
 		if (result == null) {
 			return null;
@@ -221,7 +214,7 @@ static class SingleEntityExecution extends JpaQueryExecution {
 		@Override
 		protected Object doExecute(AbstractJpaQuery query, JpaParametersParameterAccessor accessor) {
 
-			return query.createQuery(accessor).getSingleResult();
+			return query.createQuery(accessor).getSingleResultOrNull();
 		}
 	}
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index 1036ce24dd..457f4a1104 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -19,7 +19,6 @@
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.LockModeType;
-import jakarta.persistence.NoResultException;
 import jakarta.persistence.Parameter;
 import jakarta.persistence.Query;
 import jakarta.persistence.TypedQuery;
@@ -433,12 +432,7 @@ public Page<T> findAll(Pageable pageable) {
 
 	@Override
 	public Optional<T> findOne(Specification<T> spec) {
-
-		try {
-			return Optional.of(getQuery(spec, Sort.unsorted()).setMaxResults(2).getSingleResult());
-		} catch (NoResultException e) {
-			return Optional.empty();
-		}
+		return Optional.ofNullable(getQuery(spec, Sort.unsorted()).setMaxResults(2).getSingleResultOrNull());
 	}
 
 	@Override
@@ -540,13 +534,10 @@ private <S extends T, R> R doFindBy(Specification<T> spec, Class<T> domainClass,
 	@Override
 	public <S extends T> Optional<S> findOne(Example<S> example) {
 
-		try {
-			return Optional
-					.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), Sort.unsorted())
-							.setMaxResults(2).getSingleResult());
-		} catch (NoResultException e) {
-			return Optional.empty();
-		}
+		TypedQuery<S> query = getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(),
+				Sort.unsorted()).setMaxResults(2);
+
+		return Optional.ofNullable(query.getSingleResultOrNull());
 	}
 
 	@Override