DATACASS-825 - Polishing.

Reoder methods. Remove unused code and imports.

Original pull request: #181.

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/FindByIdQuery.java

@@ -96,7 +96,6 @@ static boolean hasCompositeKeys(Iterable<?> ids) {
 			if (id instanceof MapId) {
 
 				MapId mapId = (MapId) id;
-				Iterator<String> iterator = mapId.keySet().iterator();
 
 				if (mapId.size() > 1) {
 					return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jetbrains.annotations.NotNull;
 import org.springframework.data.cassandra.core.CassandraOperations;
 import org.springframework.data.cassandra.core.CassandraTemplate;
 import org.springframework.data.cassandra.core.InsertOptions;
@@ -36,8 +35,6 @@
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.util.Assert;
 
-import com.datastax.oss.driver.api.querybuilder.insert.Insert;
-
 /**
  * Repository base implementation for Cassandra.
  *
@@ -75,6 +72,10 @@ public SimpleCassandraRepository(CassandraEntityInformation<T, ID> metadata, Cas
 		this.mappingContext = operations.getConverter().getMappingContext();
 	}
 
+	// -------------------------------------------------------------------------
+	// Methods from CrudRepository
+	// -------------------------------------------------------------------------
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(S)
 	 */
@@ -112,34 +113,6 @@ public <S extends T> List<S> saveAll(Iterable<S> entities) {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.repository.TypedIdCassandraRepository#insert(java.lang.Object)
-	 */
-	@Override
-	public <S extends T> S insert(S entity) {
-
-		Assert.notNull(entity, "Entity must not be null");
-
-		return this.operations.insert(entity);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.repository.TypedIdCassandraRepository#insert(java.lang.Iterable)
-	 */
-	@Override
-	public <S extends T> List<S> insert(Iterable<S> entities) {
-
-		Assert.notNull(entities, "The given Iterable of entities must not be null");
-
-		List<S> result = new ArrayList<>();
-
-		for (S entity : entities) {
-			result.add(this.operations.insert(entity));
-		}
-
-		return result;
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object)
 	 */
@@ -166,14 +139,6 @@ public boolean existsById(ID id) {
 		return this.operations.exists(id, this.entityInformation.getJavaType());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#count()
-	 */
-	@Override
-	public long count() {
-		return this.operations.count(this.entityInformation.getJavaType());
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
@@ -198,14 +163,11 @@ public List<T> findAllById(Iterable<ID> ids) {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.repository.CassandraRepository#findAll(org.springframework.data.domain.Pageable)
+	 * @see org.springframework.data.repository.CrudRepository#count()
 	 */
 	@Override
-	public Slice<T> findAll(Pageable pageable) {
-
-		Assert.notNull(pageable, "Pageable must not be null");
-
-		return this.operations.slice(Query.empty().pageRequest(pageable), this.entityInformation.getJavaType());
+	public long count() {
+		return this.operations.count(this.entityInformation.getJavaType());
 	}
 
 	/* (non-Javadoc)
@@ -231,16 +193,8 @@ public void delete(T entity) {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#deleteAllById(java.lang.Iterable)
 	 */
-	@Override
-	public void deleteAll(Iterable<? extends T> entities) {
-
-		Assert.notNull(entities, "The given Iterable of entities must not be null");
-
-		entities.forEach(this.operations::delete);
-	}
-
 	@Override
 	public void deleteAllById(Iterable<? extends ID> ids) {
 
@@ -253,6 +207,17 @@ public void deleteAllById(Iterable<? extends ID> ids) {
 		this.operations.delete(createIdsInQuery(ids), this.entityInformation.getJavaType());
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable)
+	 */
+	@Override
+	public void deleteAll(Iterable<? extends T> entities) {
+
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
+
+		entities.forEach(this.operations::delete);
+	}
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#deleteAll()
 	 */
@@ -261,7 +226,51 @@ public void deleteAll() {
 		this.operations.truncate(this.entityInformation.getJavaType());
 	}
 
+	// -------------------------------------------------------------------------
+	// Methods from CassandraRepository
+	// -------------------------------------------------------------------------
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.cassandra.repository.CassandraRepository#findAll(org.springframework.data.domain.Pageable)
+	 */
+	@Override
+	public Slice<T> findAll(Pageable pageable) {
+
+		Assert.notNull(pageable, "Pageable must not be null");
+
+		return this.operations.slice(Query.empty().pageRequest(pageable), this.entityInformation.getJavaType());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.cassandra.repository.TypedIdCassandraRepository#insert(java.lang.Object)
+	 */
+	@Override
+	public <S extends T> S insert(S entity) {
+
+		Assert.notNull(entity, "Entity must not be null");
+
+		return this.operations.insert(entity);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.data.cassandra.repository.TypedIdCassandraRepository#insert(java.lang.Iterable)
+	 */
+	@Override
+	public <S extends T> List<S> insert(Iterable<S> entities) {
+
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
+
+		List<S> result = new ArrayList<>();
+
+		for (S entity : entities) {
+			result.add(this.operations.insert(entity));
+		}
+
+		return result;
+	}
+
 	private Query createIdsInQuery(Iterable<? extends ID> ids) {
+
 		FindByIdQuery mapIdQuery = FindByIdQuery.forIds(ids);
 		List<Object> idCollection = mapIdQuery.getIdCollection();
 		String idField = mapIdQuery.getIdProperty();