DATACASS-396 - Use single statements for to save/delete each item of a collection via CassandraRepository.

We now issue individual statements to save and delete each element of a collection of objects when used with CassandraRepository.save(Iterable) and CassandraRepository.delete(Iterable). Previously, the collection argument was considered an entity.

Save/delete do not use batch operations to prevent accidental wrong use of Cassandra batches.

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

@@ -16,9 +16,9 @@
 package org.springframework.data.cassandra.repository.support;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.cassandra.core.util.CollectionUtils;
 import org.springframework.data.cassandra.core.CassandraOperations;
 import org.springframework.data.cassandra.core.CassandraTemplate;
 import org.springframework.data.cassandra.repository.TypedIdCassandraRepository;
@@ -70,7 +70,26 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
 	 */
 	@Override
 	public <S extends T> List<S> save(Iterable<S> entities) {
-		return operations.insert(CollectionUtils.toList(entities));
+
+		Assert.notNull(entities, "The given Iterable of entities not be null!");
+
+		List<S> result = new ArrayList<>();
+
+		for (S entity : entities) {
+
+			S saved;
+			if (entityInformation.isNew(entity)) {
+				saved = operations.insert(entity);
+			} else {
+				saved = operations.update(entity);
+			}
+
+			if (saved != null) {
+				result.add(saved);
+			}
+		}
+
+		return result;
 	}
 
 	/* (non-Javadoc)
@@ -118,7 +137,12 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
 	 */
 	@Override
 	public void delete(Iterable<? extends T> entities) {
-		operations.delete(CollectionUtils.toList(entities));
+
+		Assert.notNull(entities, "The given Iterable of entities not be null!");
+
+		for (T entity : entities) {
+			operations.delete(entity);
+		}
 	}
 
 	/* (non-Javadoc)

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java

@@ -0,0 +1,265 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.cassandra.repository.support;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.cassandra.core.CassandraOperations;
+import org.springframework.data.cassandra.domain.Person;
+import org.springframework.data.cassandra.repository.TypedIdCassandraRepository;
+import org.springframework.data.cassandra.test.integration.support.IntegrationTestConfig;
+import org.springframework.data.repository.query.DefaultEvaluationContextProvider;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Integration tests for {@link SimpleCassandraRepository}.
+ *
+ * @author Mark Paluch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest
+		implements BeanClassLoaderAware, BeanFactoryAware {
+
+	@Configuration
+	public static class Config extends IntegrationTestConfig {
+
+		@Override
+		public String[] getEntityBasePackages() {
+			return new String[] { Person.class.getPackage().getName() };
+		}
+	}
+
+	@Autowired private CassandraOperations operations;
+
+	CassandraRepositoryFactory factory;
+	ClassLoader classLoader;
+	BeanFactory beanFactory;
+	PersonRepostitory repository;
+
+	Person dave, oliver, carter, boyd;
+
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader == null ? org.springframework.util.ClassUtils.getDefaultClassLoader() : classLoader;
+	}
+
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		this.beanFactory = beanFactory;
+	}
+
+	@Before
+	public void setUp() {
+
+		factory = new CassandraRepositoryFactory(operations);
+		factory.setRepositoryBaseClass(SimpleCassandraRepository.class);
+		factory.setBeanClassLoader(classLoader);
+		factory.setBeanFactory(beanFactory);
+		factory.setEvaluationContextProvider(DefaultEvaluationContextProvider.INSTANCE);
+
+		repository = factory.getRepository(PersonRepostitory.class);
+
+		repository.deleteAll();
+
+		dave = new Person("42", "Dave", "Matthews");
+		oliver = new Person("4", "Oliver August", "Matthews");
+		carter = new Person("49", "Carter", "Beauford");
+		boyd = new Person("45", "Boyd", "Tinsley");
+
+		repository.save(Arrays.asList(oliver, dave, carter, boyd));
+	}
+
+	@Test // DATACASS-396
+	public void existsByIdShouldReturnTrueForExistingObject() {
+
+		Boolean exists = repository.exists(dave.getId());
+
+		assertThat(exists).isTrue();
+	}
+
+	@Test // DATACASS-396
+	public void existsByIdShouldReturnFalseForAbsentObject() {
+
+		boolean exists = repository.exists("unknown");
+
+		assertThat(exists).isFalse();
+	}
+
+	@Test // DATACASS-396
+	public void existsByMonoOfIdShouldReturnTrueForExistingObject() {
+
+		boolean exists = repository.exists(dave.getId());
+
+		assertThat(exists).isTrue();
+	}
+
+	@Test // DATACASS-396
+	public void findOneShouldReturnObject() {
+
+		Person person = repository.findOne(dave.getId());
+
+		assertThat(person).isEqualTo(dave);
+	}
+
+	@Test // DATACASS-396
+	public void findOneShouldCompleteWithoutValueForAbsentObject() {
+
+		Person person = repository.findOne("unknown");
+
+		assertThat(person).isNull();
+	}
+
+	@Test // DATACASS-396
+	public void findAllShouldReturnAllResults() {
+
+		Iterable<Person> persons = repository.findAll();
+
+		assertThat(persons).hasSize(4);
+	}
+
+	@Test // DATACASS-396
+	public void findAllByIterableOfIdShouldReturnResults() {
+
+		Iterable<Person> persons = repository.findAll(Arrays.asList(dave.getId(), boyd.getId()));
+
+		assertThat(persons).hasSize(2);
+	}
+
+	@Test // DATACASS-396
+	public void countShouldReturnNumberOfRecords() {
+
+		long count = repository.count();
+
+		assertThat(count).isEqualTo(4);
+	}
+
+	@Test // DATACASS-396
+	public void saveEntityShouldUpdateExistingEntity() {
+
+		dave.setFirstname("Hello, Dave");
+		dave.setLastname("Bowman");
+
+		Person saved = repository.save(dave);
+
+		assertThat(saved).isEqualTo(saved);
+
+		Person loaded = repository.findOne(dave.getId());
+
+		assertThat(loaded.getFirstname()).isEqualTo(dave.getFirstname());
+		assertThat(loaded.getLastname()).isEqualTo(dave.getLastname());
+	}
+
+	@Test // DATACASS-396
+	public void saveEntityShouldInsertNewEntity() {
+
+		Person person = new Person("36", "Homer", "Simpson");
+
+		Person saved = repository.save(person);
+
+		assertThat(saved).isEqualTo(person);
+
+		Person loaded = repository.findOne(person.getId());
+
+		assertThat(loaded).isEqualTo(person);
+	}
+
+	@Test // DATACASS-396
+	public void saveIterableOfNewEntitiesShouldInsertEntity() {
+
+		repository.deleteAll();
+
+		Iterable<Person> saved = repository.save(Arrays.asList(dave, oliver, boyd));
+
+		assertThat(saved).hasSize(3);
+
+		assertThat(repository.count()).isEqualTo(3);
+	}
+
+	@Test // DATACASS-396
+	public void saveIterableOfMixedEntitiesShouldInsertEntity() {
+
+		Person person = new Person("36", "Homer", "Simpson");
+
+		dave.setFirstname("Hello, Dave");
+		dave.setLastname("Bowman");
+
+		Iterable<Person> saved = repository.save(Arrays.asList(person, dave));
+
+		assertThat(saved).hasSize(2);
+
+		Person persistentDave = repository.findOne(dave.getId());
+		assertThat(persistentDave).isEqualTo(dave);
+
+		Person persistentHomer = repository.findOne(person.getId());
+		assertThat(persistentHomer).isEqualTo(person);
+	}
+
+	@Test // DATACASS-396
+	public void deleteAllShouldRemoveEntities() {
+
+		repository.deleteAll();
+
+		Iterable<Person> result = repository.findAll();
+
+		assertThat(result).isEmpty();
+	}
+
+	@Test // DATACASS-396
+	public void deleteByIdShouldRemoveEntity() {
+
+		repository.delete(dave.getId());
+
+		Person loaded = repository.findOne(dave.getId());
+
+		assertThat(loaded).isNull();
+	}
+
+	@Test // DATACASS-396
+	public void deleteShouldRemoveEntity() {
+
+		repository.delete(dave);
+
+		Person loaded = repository.findOne(dave.getId());
+
+		assertThat(loaded).isNull();
+	}
+
+	@Test // DATACASS-396
+	public void deleteIterableOfEntitiesShouldRemoveEntities() {
+
+		repository.delete(Arrays.asList(dave, boyd));
+
+		Person loaded = repository.findOne(boyd.getId());
+
+		assertThat(loaded).isNull();
+	}
+
+	interface PersonRepostitory extends TypedIdCassandraRepository<Person, String> {}
+}