DATAJPA-1818 - Polishing.

Reorder methods. Fix Javadoc.

Original pull request: #435.

Author: mp911de

src/main/java/org/springframework/data/jpa/repository/JpaRepository.java

@@ -77,10 +77,9 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
 	<S extends T> S saveAndFlush(S entity);
 
 	/**
-	 * Deletes the given entities in a batch which means it will create a single {@link Query}.
-	 *
-	 * This kind of operation leaves JPAs first level cache and the database out of sync.
-	 * Consider flushing the `EntityManager` before calling this method.
+	 * Deletes the given entities in a batch which means it will create a single query. This kind of operation leaves JPAs
+	 * first level cache and the database out of sync. Consider flushing the {@link EntityManager} before calling this
+	 * method.
 	 *
 	 * @param entities
 	 * @deprecated Use {@link #deleteAllInBatch(Iterable)} instead.
@@ -89,26 +88,21 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
 	default void deleteInBatch(Iterable<T> entities){deleteAllInBatch(entities);}
 
 	/**
-	 * Deletes the given entities in a batch which means it will create a single {@link Query}.
-	 *
-	 * This kind of operation leaves JPAs first level cache and the database out of sync.
-	 * Consider flushing the `EntityManager` before calling this method.
+	 * Deletes the given entities in a batch which means it will create a single query. This kind of operation leaves JPAs
+	 * first level cache and the database out of sync. Consider flushing the {@link EntityManager} before calling this
+	 * method.
 	 *
 	 * @param entities
-	 *
 	 * @since 3.0
 	 */
 	void deleteAllInBatch(Iterable<T> entities);
 
 
 	/**
-	 * Deletes the entities identified by the given ids using a single {@link Query}.
-	 *
-	 * This kind of operation leaves JPAs first level cache and the database out of sync.
-	 * Consider flushing the `EntityManager` before calling this method.
+	 * Deletes the entities identified by the given ids using a single query. This kind of operation leaves JPAs first
+	 * level cache and the database out of sync. Consider flushing the {@link EntityManager} before calling this method.
 	 *
 	 * @param ids
-	 *
 	 * @since 3.0
 	 */
 	void deleteAllByIdInBatch(Iterable<ID> ids);

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

@@ -54,6 +54,7 @@
 import org.springframework.data.jpa.repository.support.QueryHints.NoHints;
 import org.springframework.data.repository.support.PageableExecutionUtils;
 import org.springframework.data.util.ProxyUtils;
+import org.springframework.data.util.Streamable;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,19 +89,6 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	private @Nullable CrudMethodMetadata metadata;
 	private EscapeCharacter escapeCharacter = EscapeCharacter.DEFAULT;
 
-	private static <T> Collection<T> toCollection(Iterable<T> ts) {
-
-		if (ts instanceof Collection) {
-			return (Collection<T>) ts;
-		}
-
-		List<T> tCollection = new ArrayList<T>();
-		for (T t : ts) {
-			tCollection.add(t);
-		}
-		return tCollection;
-	}
-
 	/**
 	 * Creates a new {@link SimpleJpaRepository} to manage objects of the given {@link JpaEntityInformation}.
 	 *
@@ -205,63 +193,71 @@ public void delete(T entity) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#deleteAllById(java.lang.Iterable)
 	 */
-	@Transactional
 	@Override
-	public void deleteAll(Iterable<? extends T> entities) {
+	public void deleteAllById(Iterable<? extends ID> ids) {
 
-		Assert.notNull(entities, "Entities must not be null!");
+		Assert.notNull(ids, "Ids must not be null!");
 
-		for (T entity : entities) {
-			delete(entity);
+		for (ID id : ids) {
+			deleteById(id);
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.CrudRepository#deleteAllByIdInBatch(java.lang.Iterable)
+	 */
 	@Override
-	public void deleteAllById(Iterable<? extends ID> ids) {
+	public void deleteAllByIdInBatch(Iterable<ID> ids) {
 
 		Assert.notNull(ids, "Ids must not be null!");
 
-		for (ID id : ids) {
-			deleteById(id);
+		if (!ids.iterator().hasNext()) {
+			return;
 		}
+
+		String queryString = String.format(DELETE_ALL_QUERY_BY_ID_STRING, entityInformation.getEntityName(),
+				entityInformation.getIdAttribute().getName());
+
+		Query query = em.createQuery(queryString);
+		query.setParameter("ids", ids);
+
+		query.executeUpdate();
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jpa.repository.JpaRepository#deleteInBatch(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
 	 */
 	@Transactional
 	@Override
-	public void deleteAllInBatch(Iterable<T> entities) {
+	public void deleteAll(Iterable<? extends T> entities) {
 
 		Assert.notNull(entities, "Entities must not be null!");
 
-		if (!entities.iterator().hasNext()) {
-			return;
+		for (T entity : entities) {
+			delete(entity);
 		}
-
-		applyAndBind(getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName()), entities, em)
-				.executeUpdate();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.jpa.repository.JpaRepository#deleteInBatch(java.lang.Iterable)
+	 */
+	@Transactional
 	@Override
-	public void deleteAllByIdInBatch(Iterable<ID> ids) {
+	public void deleteAllInBatch(Iterable<T> entities) {
 
-		Assert.notNull(ids, "Ids must not be null!");
+		Assert.notNull(entities, "Entities must not be null!");
 
-		if (!ids.iterator().hasNext()) {
+		if (!entities.iterator().hasNext()) {
 			return;
 		}
 
-		String queryTemplate = DELETE_ALL_QUERY_BY_ID_STRING;
-		String queryString = String.format(queryTemplate, entityInformation.getEntityName(), entityInformation.getIdAttribute().getName());
-
-		Query query = em.createQuery(queryString);
-		query.setParameter("ids", ids);
-
-		query.executeUpdate();
+		applyAndBind(getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName()), entities, em)
+				.executeUpdate();
 	}
 
 	/*
@@ -408,7 +404,7 @@ public List<T> findAllById(Iterable<ID> ids) {
 			return results;
 		}
 
-		Collection<ID> idCollection = toCollection(ids);
+		Collection<ID> idCollection = Streamable.of(ids).toList();
 
 		ByIdsSpecification<T> specification = new ByIdsSpecification<T>(entityInformation);
 		TypedQuery<T> query = getQuery(specification, Sort.unsorted());