DATAJPA-218 - Polishing.

Adapted to API changes in Spring Data Commons.

Related tickets: DATACMNS-810.
Original pull request: #164.

Author: odrotbohm

src/main/asciidoc/query-by-example.adoc

@@ -7,9 +7,7 @@ In Spring Data JPA you can use Query by Example with Repositories.
 ====
 [source, java]
 ----
-public interface PersonRepository extends JpaRepository<Person, String> {
-
-}
+public interface PersonRepository extends JpaRepository<Person, String> { … }
 
 public class PersonService {
 
@@ -22,10 +20,7 @@ public class PersonService {
 ----
 ====
 
-An `Example` containing an untyped `ExampleSpec` uses the Repository type. Typed `ExampleSpec` use their type for creating JPA queries.
-
-NOTE: Only SingularAttribute properties can be used for property matching.
-
+NOTE: Only `SingularAttribute` properties can currently be used for property matching.
 
 Property specifier accepts property names (e.g. "firstname" and "lastname"). You can navigate by chaining properties together with dots ("address.city"). You can tune it with matching options and case sensitivity.
 

src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java

@@ -34,8 +34,8 @@
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleSpec;
-import org.springframework.data.repository.core.support.ExampleSpecAccessor;
+import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.repository.core.support.ExampleMatcherAccessor;
 import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.util.Assert;
@@ -78,7 +78,7 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 		Assert.notNull(example, "Example must not be null!");
 
 		List<Predicate> predicates = getPredicates("", cb, root, root.getModel(), example.getProbe(),
-				example.getProbeType(), new ExampleSpecAccessor(example.getExampleSpec()),
+				example.getProbeType(), new ExampleMatcherAccessor(example.getMatcher()),
 				new PathNode("root", null, example.getProbe()));
 
 		if (predicates.isEmpty()) {
@@ -94,7 +94,7 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> from, ManagedType<?> type, Object value,
-			Class<?> probeType, ExampleSpecAccessor exampleAccessor, PathNode currentNode) {
+			Class<?> probeType, ExampleMatcherAccessor exampleAccessor, PathNode currentNode) {
 
 		List<Predicate> predicates = new ArrayList<Predicate>();
 		DirectFieldAccessFallbackBeanWrapper beanWrapper = new DirectFieldAccessFallbackBeanWrapper(value);
@@ -112,7 +112,7 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
 
 			if (attributeValue == null) {
 
-				if (exampleAccessor.getNullHandler().equals(ExampleSpec.NullHandler.INCLUDE)) {
+				if (exampleAccessor.getNullHandler().equals(ExampleMatcher.NullHandler.INCLUDE)) {
 					predicates.add(cb.isNull(from.get(attribute)));
 				}
 				continue;

src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

@@ -44,7 +44,6 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.TypedExampleSpec;
 import org.springframework.data.jpa.convert.QueryByExamplePredicateBuilder;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -148,8 +147,8 @@ public void delete(ID id) {
 		T entity = findOne(id);
 
 		if (entity == null) {
-			throw new EmptyResultDataAccessException(String.format("No %s entity with id %s exists!",
-					entityInformation.getJavaType(), id), 1);
+			throw new EmptyResultDataAccessException(
+					String.format("No %s entity with id %s exists!", entityInformation.getJavaType(), id), 1);
 		}
 
 		delete(entity);
@@ -422,7 +421,7 @@ public List<T> findAll(Specification<T> spec, Sort sort) {
 	@Override
 	public <S extends T> S findOne(Example<S> example) {
 		try {
-			return getQuery(new ExampleSpecification<S>(example), getResultType(example), (Sort) null).getSingleResult();
+			return getQuery(new ExampleSpecification<S>(example), example.getProbeType(), (Sort) null).getSingleResult();
 		} catch (NoResultException e) {
 			return null;
 		}
@@ -431,18 +430,18 @@ public <S extends T> S findOne(Example<S> example) {
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#count(org.springframework.data.domain.Example)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
+	@SuppressWarnings("unchecked")
 	public <S extends T> long count(Example<S> example) {
-		return executeCountQuery(getCountQuery(new ExampleSpecification<S>(example), getResultType(example)));
+		return executeCountQuery(getCountQuery(new ExampleSpecification<S>(example), example.getProbeType()));
 	}
 
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#exists(org.springframework.data.domain.Example)
 	 */
 	@Override
 	public <S extends T> boolean exists(Example<S> example) {
-		return !getQuery(new ExampleSpecification<S>(example), getResultType(example), (Sort) null).getResultList()
+		return !getQuery(new ExampleSpecification<S>(example), example.getProbeType(), (Sort) null).getResultList()
 				.isEmpty();
 	}
 
@@ -452,7 +451,7 @@ public <S extends T> boolean exists(Example<S> example) {
 	 */
 	@Override
 	public <S extends T> List<S> findAll(Example<S> example) {
-		return getQuery(new ExampleSpecification<S>(example), getResultType(example), (Sort) null).getResultList();
+		return getQuery(new ExampleSpecification<S>(example), example.getProbeType(), (Sort) null).getResultList();
 	}
 
 	/*
@@ -461,7 +460,7 @@ public <S extends T> List<S> findAll(Example<S> example) {
 	 */
 	@Override
 	public <S extends T> List<S> findAll(Example<S> example, Sort sort) {
-		return getQuery(new ExampleSpecification<S>(example), getResultType(example), sort).getResultList();
+		return getQuery(new ExampleSpecification<S>(example), example.getProbeType(), sort).getResultList();
 	}
 
 	/*
@@ -472,9 +471,10 @@ public <S extends T> List<S> findAll(Example<S> example, Sort sort) {
 	public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
 
 		ExampleSpecification<S> spec = new ExampleSpecification<S>(example);
-		TypedQuery<S> query = getQuery(new ExampleSpecification<S>(example), getResultType(example), pageable);
-		return pageable == null ? new PageImpl<S>(query.getResultList())
-				: readPage(query, getResultType(example), pageable, spec);
+		Class<S> probeType = example.getProbeType();
+		TypedQuery<S> query = getQuery(new ExampleSpecification<S>(example), probeType, pageable);
+
+		return pageable == null ? new PageImpl<S>(query.getResultList()) : readPage(query, probeType, pageable, spec);
 	}
 
 	/*
@@ -743,15 +743,6 @@ private void applyQueryHints(Query query) {
 		}
 	}
 
-
-	private <S extends T> Class<S> getResultType(Example<S> example) {
-
-		if(example.getExampleSpec() instanceof TypedExampleSpec<?>){
-			return example.getResultType();
-		}
-		return (Class<S>) getDomainClass();
-	}
-
 	/**
 	 * Executes a count query and transparently sums up all values returned.
 	 *