DATAGRAPH-1428 - Polishing.

Reorder methods. Fix import ordering.

Original pull request: #554.

Author: mp911de

src/main/java/org/springframework/data/neo4j/repository/support/SimpleNeo4jRepository.java

@@ -162,9 +162,9 @@ public void delete(T entity) {
 
 	@Override
 	@Transactional
-	public void deleteAll() {
+	public void deleteAllById(Iterable<? extends ID> ids) {
 
-		this.neo4jOperations.deleteAll(this.entityInformation.getJavaType());
+		this.neo4jOperations.deleteAllById(ids, this.entityInformation.getJavaType());
 	}
 
 	@Override
@@ -179,8 +179,8 @@ public void deleteAll(Iterable<? extends T> entities) {
 
 	@Override
 	@Transactional
-	public void deleteAllById(Iterable<? extends ID> ids) {
+	public void deleteAll() {
 
-		this.neo4jOperations.deleteAllById(ids, this.entityInformation.getJavaType());
+		this.neo4jOperations.deleteAll(this.entityInformation.getJavaType());
 	}
 }

src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveNeo4jRepository.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.neo4j.repository.support;
 
-import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -26,10 +25,12 @@
 import org.apiguardian.api.API;
 import org.neo4j.cypherdsl.core.Statement;
 import org.reactivestreams.Publisher;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.data.neo4j.core.ReactiveNeo4jOperations;
-import org.springframework.data.neo4j.core.mapping.Neo4jPersistentEntity;
 import org.springframework.data.neo4j.core.mapping.CypherGenerator;
+import org.springframework.data.neo4j.core.mapping.Neo4jPersistentEntity;
+import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
 import org.springframework.data.neo4j.repository.query.CypherAdapterUtils;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
 import org.springframework.stereotype.Repository;
@@ -187,13 +188,14 @@ public Mono<Void> delete(T entity) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll()
+	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAllById(java.lang.Iterabl)
 	 */
 	@Override
-	@Transactional
-	public Mono<Void> deleteAll() {
+	public Mono<Void> deleteAllById(Iterable<? extends ID> ids) {
 
-		return this.neo4jOperations.deleteAll(this.entityInformation.getJavaType());
+		Assert.notNull(ids, "The given Iterable of ids must not be null!");
+
+		return this.neo4jOperations.deleteAllById(ids, this.entityInformation.getJavaType());
 	}
 
 	/*
@@ -211,14 +213,6 @@ public Mono<Void> deleteAll(Iterable<? extends T> entities) {
 		return this.neo4jOperations.deleteAllById(ids, this.entityInformation.getJavaType());
 	}
 
-	@Override
-	public Mono<Void> deleteAllById(Iterable<? extends ID> ids) {
-
-		Assert.notNull(ids, "The given Iterable of ids must not be null!");
-
-		return this.neo4jOperations.deleteAllById(ids, this.entityInformation.getJavaType());
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher)
@@ -230,4 +224,15 @@ public Mono<Void> deleteAll(Publisher<? extends T> entitiesPublisher) {
 		Assert.notNull(entitiesPublisher, "The given Publisher of entities must not be null!");
 		return Flux.from(entitiesPublisher).flatMap(this::delete).then();
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll()
+	 */
+	@Override
+	@Transactional
+	public Mono<Void> deleteAll() {
+
+		return this.neo4jOperations.deleteAll(this.entityInformation.getJavaType());
+	}
 }