Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-428 - Provide insert methods on TypedIdCassandraRepository.

Browse Source 
We now provide an insert(S) method on TypedIdCassandraRepository for fine-grained control over insert/update behavior.

Related ticket: DATACASS-415.
This commit is contained in:
Mark Paluch
2017-04-12 11:49:58 +02:00
parent 0d38345609
commit 9fb63a350c
3 changed files with 183 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java
View File

@@ -1,12 +1,12 @@
/*
* Copyright 2013-2014 the original author or authors
*
* Copyright 2013-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.
@@ -48,8 +48,8 @@ import org.springframework.data.repository.NoRepositoryBean;
* <li>Define your repository interface to be a subinterface of <em>this</em> interface, including your entity type and
* your primary key class type.</li>
* </ul>
* <li>
* <em>Strategy: embed identity fields or properties directly in your entity and use {@link CassandraRepository}</em></li>
* <li><em>Strategy: embed identity fields or properties directly in your entity and use
* {@link CassandraRepository}</em></li>
* <ul>
* <li>Define your entity, including a field or property for each column, including those for partition and (optional)
* cluster columns.</li>
@@ -61,9 +61,21 @@ import org.springframework.data.repository.NoRepositoryBean;
* construct an id.</li>
* </ul>
* </ul>
*
*
* @author Alex Shvid
* @author Matthew T. Adams
*/
@NoRepositoryBean
public interface TypedIdCassandraRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {}
public interface TypedIdCassandraRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {
/**
* Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the
* returned instance for further operations as the save operation might have changed the entity instance completely.
* Prefer using {@link #save(Object)} instead to avoid the usage of store-specific API.
*
* @param entity must not be {@literal null}.
* @return the saved entity
* @since 1.5.2
*/
<S extends T> S insert(S entity);
}

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

@@ -1,12 +1,12 @@
/*
* Copyright 2013-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.
@@ -29,7 +29,7 @@ import com.datastax.driver.core.querybuilder.Select;
/**
* Repository base implementation for Cassandra.
*
*
* @author Alex Shvid
* @author Matthew T. Adams
* @author Mark Paluch
@@ -42,7 +42,7 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
/**
* Creates a new {@link SimpleCassandraRepository} for the given {@link CassandraEntityInformation} and
* {@link CassandraTemplate}.
*
*
* @param metadata must not be {@literal null}.
* @param operations must not be {@literal null}.
*/
@@ -57,7 +57,14 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
@Override
public <S extends T> S save(S entity) {
return operations.insert(entity);
Assert.notNull(entity, "Entity must not be null");
if (entityInformation.isNew(entity)) {
return operations.insert(entity);
}
return operations.update(entity);
}
@Override
@@ -65,6 +72,17 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
return operations.insert(CollectionUtils.toList(entities));
}
/* (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 operations.insert(entity);
}
@Override
public T findOne(ID id) {
return operations.selectOneById(entityInformation.getJavaType(), id);

139
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryUnitTests.java Normal file
View File

@@ -0,0 +1,139 @@
/*
* 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 static org.mockito.Mockito.*;
import lombok.Data;
import java.io.Serializable;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.data.annotation.Id;
import org.springframework.data.cassandra.convert.MappingCassandraConverter;
import org.springframework.data.cassandra.core.CassandraOperations;
import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext;
import org.springframework.data.cassandra.mapping.CassandraPersistentEntity;
import org.springframework.data.cassandra.mapping.UserTypeResolver;
import org.springframework.data.cassandra.test.integration.repository.querymethods.declared.Person;
/**
* Unit tests for {@link SimpleCassandraRepository}.
*
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("unchecked")
public class SimpleCassandraRepositoryUnitTests {
BasicCassandraMappingContext mappingContext = new BasicCassandraMappingContext();
MappingCassandraConverter converter = new MappingCassandraConverter(mappingContext);
SimpleCassandraRepository<Object, ? extends Serializable> repository;
@Mock CassandraOperations cassandraOperations;
@Mock UserTypeResolver userTypeResolver;
@Before
public void before() {
mappingContext.setUserTypeResolver(userTypeResolver);
}
@Test // DATACASS-428
public void saveShouldInsertNewPrimaryKeyOnlyEntity() {
CassandraPersistentEntity<?> entity = converter.getMappingContext().getPersistentEntity(SimplePerson.class);
repository = new SimpleCassandraRepository<Object, String>(new MappingCassandraEntityInformation(entity, converter),
cassandraOperations);
SimplePerson person = new SimplePerson();
when(cassandraOperations.insert(person)).thenReturn(person);
Object result = repository.save(person);
assertThat(result).isEqualTo(person);
verify(cassandraOperations).insert(person);
}
@Test // DATACASS-428
public void saveShouldUpdateNewEntity() {
CassandraPersistentEntity<?> entity = converter.getMappingContext().getPersistentEntity(Person.class);
repository = new SimpleCassandraRepository<Object, String>(new MappingCassandraEntityInformation(entity, converter),
cassandraOperations);
Person person = new Person();
when(cassandraOperations.update(person)).thenReturn(person);
Object result = repository.save(person);
assertThat(result).isEqualTo(person);
verify(cassandraOperations).update(person);
}
@Test // DATACASS-428
public void saveShouldUpdateExistingEntity() {
CassandraPersistentEntity<?> entity = converter.getMappingContext().getPersistentEntity(Person.class);
repository = new SimpleCassandraRepository<Object, String>(new MappingCassandraEntityInformation(entity, converter),
cassandraOperations);
Person person = new Person();
person.setFirstname("foo");
person.setLastname("bar");
when(cassandraOperations.update(person)).thenReturn(person);
Object result = repository.save(person);
assertThat(result).isEqualTo(person);
verify(cassandraOperations).update(person);
}
@Test // DATACASS-428
public void insertShouldInsertEntity() {
CassandraPersistentEntity<?> entity = converter.getMappingContext().getPersistentEntity(Person.class);
repository = new SimpleCassandraRepository<Object, String>(new MappingCassandraEntityInformation(entity, converter),
cassandraOperations);
Person person = new Person();
when(cassandraOperations.insert(person)).thenReturn(person);
Object result = repository.insert(person);
assertThat(result).isEqualTo(person);
verify(cassandraOperations).insert(person);
}
@Data
static class SimplePerson {
@Id String id;
}
}