Skip to content

DATACMNS-1059 - Alter QuerydslPredicateExecutor.findOne to return Optional<T>. #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

DATACMNS-1059 - Alter QuerydslPredicateExecutor.findOne to return Optional<T>. #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3f1e4a
DATACMNS-1059 - Prepare issue branch.
christophstrobl May 5, 2017
adea705
DATACMNS-1059 - Alter QuerydslPredicateExecutor.findOne to return Opt…
christophstrobl May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.DATACMNS-1059-SNAPSHOT</version>

<name>Spring Data Core</name>

Expand Down
29 changes: 16 additions & 13 deletions src/main/java/org/springframework/data/querydsl/QuerydslPredicateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2015 the original author or authors.
* Copyright 2011-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,6 +15,8 @@
*/
package org.springframework.data.querydsl;

import java.util.Optional;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
Expand All @@ -24,26 +26,27 @@

/**
* Interface to allow execution of QueryDsl {@link Predicate} instances.
*
*
* @author Oliver Gierke
* @author Thomas Darimont
* @author Christoph Strobl
*/
public interface QuerydslPredicateExecutor<T> {

/**
* Returns a single entity matching the given {@link Predicate} or {@literal null} if none was found.
*
* Returns a single entity matching the given {@link Predicate} or {@link Optional#empty()} if none was found.
*
* @param predicate can be {@literal null}.
* @return a single entity matching the given {@link Predicate} or {@literal null} if none was found.
* @return a single entity matching the given {@link Predicate} or {@link Optional#empty()} if none was found.
* @throws org.springframework.dao.IncorrectResultSizeDataAccessException if the predicate yields more than one
* result.
*/
T findOne(Predicate predicate);
Optional<T> findOne(Predicate predicate);

/**
* Returns all entities matching the given {@link Predicate}. In case no match could be found an empty
* {@link Iterable} is returned.
*
*
* @param predicate can be {@literal null}.
* @return all entities matching the given {@link Predicate}.
*/
Expand All @@ -52,7 +55,7 @@ public interface QuerydslPredicateExecutor<T> {
/**
* Returns all entities matching the given {@link Predicate} applying the given {@link Sort}. In case no match could
* be found an empty {@link Iterable} is returned.
*
*
* @param predicate can be {@literal null}.
* @param sort the {@link Sort} specification to sort the results by, must not be {@literal null}.
* @return all entities matching the given {@link Predicate}.
Expand All @@ -63,16 +66,16 @@ public interface QuerydslPredicateExecutor<T> {
/**
* Returns all entities matching the given {@link Predicate} applying the given {@link OrderSpecifier}s. In case no
* match could be found an empty {@link Iterable} is returned.
*
*
* @param predicate can be {@literal null}.
* @param orders the {@link OrderSpecifier}s to sort the results by
* @param orders the {@link OrderSpecifier}s to sort the results by.
* @return all entities matching the given {@link Predicate} applying the given {@link OrderSpecifier}s.
*/
Iterable<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);

/**
* Returns all entities ordered by the given {@link OrderSpecifier}s.
*
*
* @param orders the {@link OrderSpecifier}s to sort the results by.
* @return all entities ordered by the given {@link OrderSpecifier}s.
*/
Expand All @@ -81,7 +84,7 @@ public interface QuerydslPredicateExecutor<T> {
/**
* Returns a {@link Page} of entities matching the given {@link Predicate}. In case no match could be found, an empty
* {@link Page} is returned.
*
*
* @param predicate can be {@literal null}.
* @param pageable must not be {@literal null}.
* @return a {@link Page} of entities matching the given {@link Predicate}.
Expand All @@ -90,7 +93,7 @@ public interface QuerydslPredicateExecutor<T> {

/**
* Returns the number of instances matching the given {@link Predicate}.
*
*
* @param predicate the {@link Predicate} to count instances for, can be {@literal null}.
* @return the number of instances matching the {@link Predicate}.
*/
Expand Down