From 18e5d2301c0ff8a7369c40bf73168ef2d67795b8 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 19 May 2017 10:58:05 +0200 Subject: [PATCH] =?UTF-8?q?DATALDAP-37=20-=20Adapt=20to=20API=20changes=20?= =?UTF-8?q?in=20QuerydslPredicateExecutor.findOne(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related ticket: DATACMNS-1059. --- .../repository/support/QueryDslLdapRepository.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/ldap/repository/support/QueryDslLdapRepository.java b/src/main/java/org/springframework/data/ldap/repository/support/QueryDslLdapRepository.java index 9a70069..33cca58 100644 --- a/src/main/java/org/springframework/data/ldap/repository/support/QueryDslLdapRepository.java +++ b/src/main/java/org/springframework/data/ldap/repository/support/QueryDslLdapRepository.java @@ -16,7 +16,9 @@ package org.springframework.data.ldap.repository.support; import java.util.List; +import java.util.Optional; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -53,12 +55,18 @@ public class QueryDslLdapRepository extends SimpleLdapRepository implement this.entityType = entityType; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.querydsl.core.types.Predicate) */ @Override - public T findOne(Predicate predicate) { - return queryFor(predicate).uniqueResult(); + public Optional findOne(Predicate predicate) { + + try { + return Optional.of(queryFor(predicate).uniqueResult()); + } catch (EmptyResultDataAccessException o_O) { + return Optional.empty(); + } } /* (non-Javadoc)