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

DATACASS-441 - Adapt to API changes in repository interfaces.

Browse Source 
Related ticket: DATACMNS-944.
This commit is contained in:
Mark Paluch
2017-05-03 15:58:01 +02:00
committed by Oliver Gierke
parent fee427e46c
commit 552c5464c4
29 changed files with 201 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
View File

@@ -492,7 +492,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
Collection<Clause> clauses = new ArrayList<>();
for (Entry<String, Serializable> entry : id.entrySet()) {
for (Entry<String, Object> entry : id.entrySet()) {
Optional<CassandraPersistentProperty> lookup = entity.getPersistentProperty(entry.getKey());

9
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java
View File

@@ -1,7 +1,5 @@
package org.springframework.data.cassandra.repository;
import java.io.Serializable;
import org.springframework.data.cassandra.mapping.PrimaryKeyColumn;
import org.springframework.data.cassandra.repository.support.BasicMapId;
import org.springframework.data.repository.NoRepositoryBean;
@@ -21,17 +19,18 @@ import org.springframework.data.repository.NoRepositoryBean;
* <li>Define your repository interface to be a subinterface of this interface, which uses a provided id type,
* {@link MapId} (implemented by {@link BasicMapId}).</li>
* <li>Whenever you need a {@link MapId}, you can use the static factory method {@link BasicMapId#id()} (which is
* convenient if you import statically) and the builder method {@link MapId#with(String, Serializable)} to easily
* construct an id.</li>
* convenient if you import statically) and the builder method {@link MapId#with(String, Object)} to easily construct an
* id.</li>
* <li>Optionally, entity class authors can have their entities implement {@link MapIdentifiable}, to make it easier and
* quicker for entity clients to get the entity's identity.</li>
* </ul>
*
*
* @param <T> The type of the persistent entity.
* @see TypedIdCassandraRepository
* @see MapId
* @See {@link MapIdentifiable}
* @author Matthew T. Adams
* @author Mark Paluch
*/
@NoRepositoryBean
public interface CassandraRepository<T> extends TypedIdCassandraRepository<T, MapId> {}

5
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/MapId.java
View File

@@ -23,8 +23,9 @@ import java.util.Map;
* properties.
*
* @author Matthew T. Adams
* @author Mark Paluch
*/
public interface MapId extends Serializable, Map<String, Serializable> {
public interface MapId extends Serializable, Map<String, Object> {
/**
* Builder method that adds the value for the named property, then returns {@code this}.
@@ -33,5 +34,5 @@ public interface MapId extends Serializable, Map<String, Serializable> {
* @param value The property value.
* @return {@code this}
*/
MapId with(String name, Serializable value);
MapId with(String name, Object value);
}

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepository.java
View File

@@ -18,8 +18,6 @@ package org.springframework.data.cassandra.repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.io.Serializable;
import org.reactivestreams.Publisher;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
@@ -31,7 +29,7 @@ import org.springframework.data.repository.reactive.ReactiveCrudRepository;
* @since 2.0
*/
@NoRepositoryBean
public interface ReactiveCassandraRepository<T, ID extends Serializable> extends ReactiveCrudRepository<T, ID> {
public interface ReactiveCassandraRepository<T, ID> extends ReactiveCrudRepository<T, ID> {
/**
* Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the

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

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository;
import java.io.Serializable;
import java.util.List;
import org.springframework.data.cassandra.mapping.PrimaryKey;
@@ -58,8 +57,8 @@ import org.springframework.data.repository.NoRepositoryBean;
* <li>Define your repository interface to be a subinterface of {@link CassandraRepository}, which uses a provided id
* type, {@link MapId} (implemented by {@link BasicMapId}).</li>
* <li>Whenever you need a {@link MapId}, you can use the static factory method {@link BasicMapId#id()} (which is
* convenient if you import statically) and the builder method {@link MapId#with(String, Serializable)} to easily
* construct an id.</li>
* convenient if you import statically) and the builder method {@link MapId#with(String, Object)} to easily construct an
* id.</li>
* </ul>
* </ul>
*
@@ -68,14 +67,14 @@ import org.springframework.data.repository.NoRepositoryBean;
* @author Mark Paluch
*/
@NoRepositoryBean
public interface TypedIdCassandraRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {
public interface TypedIdCassandraRepository<T, ID> extends CrudRepository<T, ID> {
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
* @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable)
*/
@Override
<S extends T> List<S> save(Iterable<S> entites);
<S extends T> List<S> saveAll(Iterable<S> entites);
/*
* (non-Javadoc)
@@ -86,10 +85,10 @@ public interface TypedIdCassandraRepository<T, ID extends Serializable> extends
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
* @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable)
*/
@Override
List<T> findAll(Iterable<ID> ids);
List<T> findAllById(Iterable<ID> ids);
/**
* Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the
@@ -104,8 +103,8 @@ public interface TypedIdCassandraRepository<T, ID extends Serializable> extends
/**
* Inserts the given entities. Assumes the given entities to have not been persisted yet and thus will optimize the
* insert over a call to {@link #save(Iterable)}. Prefer using {@link #save(Iterable)} to avoid the usage of store
* specific API.
* insert over a call to {@link #saveAll(Iterable)}. Prefer using {@link #saveAll(Iterable)} to avoid the usage of
* store specific API.
*
* @param entities must not be {@literal null}.
* @return the saved entities

5
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityInformation.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.cassandra.repository.query;
import java.io.Serializable;
import org.springframework.data.repository.core.EntityInformation;
/**
@@ -25,8 +23,7 @@ import org.springframework.data.repository.core.EntityInformation;
* @author Alex Shvid
* @author Mark Paluch
*/
public interface CassandraEntityInformation<T, ID extends Serializable>
extends EntityInformation<T, ID>, CassandraEntityMetadata<T> {
public interface CassandraEntityInformation<T, ID> extends EntityInformation<T, ID>, CassandraEntityMetadata<T> {
/**
* Return {@literal true} if the persistent entity consists entirely of primary key properties (a single Id property,

9
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java
View File

@@ -18,6 +18,7 @@ package org.springframework.data.cassandra.repository.query;
import org.springframework.data.cassandra.core.CassandraOperations;
import org.springframework.data.cassandra.core.CassandraTemplate;
import org.springframework.data.cassandra.mapping.CassandraMappingContext;
import org.springframework.data.repository.query.QueryCreationException;
import org.springframework.data.repository.query.QueryMethod;
import org.springframework.data.repository.query.RepositoryQuery;
import org.springframework.data.repository.query.parser.PartTree;
@@ -44,8 +45,12 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery {
super(queryMethod, operations);
this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType());
this.mappingContext = operations.getConverter().getMappingContext();
try {
this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType());
this.mappingContext = operations.getConverter().getMappingContext();
} catch (Exception e) {
throw QueryCreationException.create(queryMethod, e);
}
}
/**

9
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java
View File

@@ -17,6 +17,7 @@ package org.springframework.data.cassandra.repository.query;
import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
import org.springframework.data.cassandra.mapping.CassandraMappingContext;
import org.springframework.data.repository.query.QueryCreationException;
import org.springframework.data.repository.query.RepositoryQuery;
import org.springframework.data.repository.query.parser.PartTree;
@@ -44,8 +45,12 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue
super(queryMethod, operations);
this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType());
this.mappingContext = operations.getConverter().getMappingContext();
try {
this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType());
this.mappingContext = operations.getConverter().getMappingContext();
} catch (Exception e) {
throw QueryCreationException.create(queryMethod, e);
}
}
/**

25
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +38,7 @@ import org.springframework.util.Assert;
@SuppressWarnings("serial")
public class BasicMapId implements MapId {
private final Map<String, Serializable> map = new HashMap<String, Serializable>();
private final Map<String, Object> map = new HashMap<>();
/**
* Create a new and empty {@link BasicMapId}.
@@ -51,7 +50,7 @@ public class BasicMapId implements MapId {
*
* @param map must not be {@literal null}.
*/
public BasicMapId(Map<String, Serializable> map) {
public BasicMapId(Map<String, Object> map) {
Assert.notNull(map, "Map must not be null");
this.map.putAll(map);
@@ -71,7 +70,7 @@ public class BasicMapId implements MapId {
*
* @return {@link BasicMapId}
*/
public static MapId id(String name, Serializable value) {
public static MapId id(String name, Object value) {
return new BasicMapId().with(name, value);
}
@@ -85,10 +84,10 @@ public class BasicMapId implements MapId {
}
/* (non-Javadoc)
* @see org.springframework.data.cassandra.repository.MapId#with(java.lang.String, java.io.Serializable)
* @see org.springframework.data.cassandra.repository.MapId#with(java.lang.String, java.io.Object)
*/
@Override
public BasicMapId with(String name, Serializable value) {
public BasicMapId with(String name, Object value) {
put(name, value);
return this;
}
@@ -121,7 +120,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#entrySet()
*/
@Override
public Set<java.util.Map.Entry<String, Serializable>> entrySet() {
public Set<java.util.Map.Entry<String, Object>> entrySet() {
return map.entrySet();
}
@@ -146,7 +145,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#get(java.lang.Object)
*/
@Override
public Serializable get(Object name) {
public Object get(Object name) {
return map.get(name);
}
@@ -178,7 +177,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
@Override
public Serializable put(String name, Serializable value) {
public Object put(String name, Object value) {
return map.put(name, value);
}
@@ -186,7 +185,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#putAll(java.util.Map)
*/
@Override
public void putAll(Map<? extends String, ? extends Serializable> source) {
public void putAll(Map<? extends String, ? extends Object> source) {
map.putAll(source);
}
@@ -194,7 +193,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#remove(java.lang.Object)
*/
@Override
public Serializable remove(Object name) {
public Object remove(Object name) {
return map.remove(name);
}
@@ -210,7 +209,7 @@ public class BasicMapId implements MapId {
* @see java.util.Map#values()
*/
@Override
public Collection<Serializable> values() {
public Collection<Object> values() {
return map.values();
}
@@ -223,7 +222,7 @@ public class BasicMapId implements MapId {
StringBuilder s = new StringBuilder("{ ");
boolean first = true;
for (Map.Entry<String, Serializable> entry : map.entrySet()) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
if (first) {
first = false;

5
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Optional;
@@ -83,7 +82,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
@Override
protected Object getTargetRepository(RepositoryInformation information) {
CassandraEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
CassandraEntityInformation<?, Object> entityInformation = getEntityInformation(information.getDomainType());
return getTargetRepositoryViaReflection(information, entityInformation, operations);
}
@@ -93,7 +92,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
*/
@Override
@SuppressWarnings("unchecked")
public <T, ID extends Serializable> CassandraEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
public <T, ID> CassandraEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
CassandraPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);

7
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2016 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.
@@ -15,8 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import org.springframework.data.cassandra.core.CassandraTemplate;
import org.springframework.data.cassandra.repository.TypedIdCassandraRepository;
import org.springframework.data.repository.Repository;
@@ -30,11 +28,10 @@ import org.springframework.util.Assert;
* @author Alex Shvid
* @author John Blum
* @author Oliver Gierke
* @see java.io.Serializable
* @see org.springframework.data.repository.Repository
* @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport
*/
public class CassandraRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
public class CassandraRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
extends RepositoryFactoryBeanSupport<T, S, ID> {
private CassandraTemplate cassandraTemplate;

3
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MapIdProxyDelegate.java
View File

@@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
* @see MapIdFactory#id(Class)
* @see MapIdFactory#id(Class, ClassLoader)
* @author Matthew T. Adams
* @author Mark Paluch
*/
class MapIdProxyDelegate implements InvocationHandler {
@@ -74,7 +75,7 @@ class MapIdProxyDelegate implements InvocationHandler {
return MAP_ID_SIGNATURES.containsKey(new Signature(method, true));
}
public Serializable invokeGetter(Method method) {
public Object invokeGetter(Method method) {
String name = method.getName();
if (name.startsWith("get")) {
if (name.length() == 3) {

3
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
@@ -38,7 +37,7 @@ import org.springframework.util.Assert;
* @author Matthew T. Adams
* @author Mark Paluch
*/
public class MappingCassandraEntityInformation<T, ID extends Serializable> extends AbstractEntityInformation<T, ID>
public class MappingCassandraEntityInformation<T, ID> extends AbstractEntityInformation<T, ID>
implements CassandraEntityInformation<T, ID> {
private final CassandraPersistentEntity<T> entityMetadata;

5
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Optional;
@@ -79,7 +78,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
@Override
protected Object getTargetRepository(RepositoryInformation information) {
CassandraEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
CassandraEntityInformation<?, Object> entityInformation = getEntityInformation(information.getDomainType());
return getTargetRepositoryViaReflection(information, entityInformation, operations);
}
@@ -97,7 +96,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
*/
@SuppressWarnings("unchecked")
public <T, ID extends Serializable> CassandraEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
public <T, ID> CassandraEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
CassandraPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.repository.Repository;
@@ -33,7 +31,7 @@ import org.springframework.util.Assert;
* @see org.springframework.data.repository.reactive.ReactiveSortingRepository
* @see org.springframework.data.repository.reactive.RxJava1SortingRepository
*/
public class ReactiveCassandraRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
public class ReactiveCassandraRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
extends RepositoryFactoryBeanSupport<T, S, ID> {
private boolean mappingContextConfigured = false;

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

@@ -15,7 +15,6 @@
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -36,7 +35,7 @@ import com.datastax.driver.core.querybuilder.Select;
* @author Matthew T. Adams
* @author Mark Paluch
*/
public class SimpleCassandraRepository<T, ID extends Serializable> implements TypedIdCassandraRepository<T, ID> {
public class SimpleCassandraRepository<T, ID> implements TypedIdCassandraRepository<T, ID> {
private CassandraEntityInformation<T, ID> entityInformation;
@@ -80,7 +79,7 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
* @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
*/
@Override
public <S extends T> List<S> save(Iterable<S> entities) {
public <S extends T> List<S> saveAll(Iterable<S> entities) {
Assert.notNull(entities, "The given Iterable of entities must not be null");
List<S> result = new ArrayList<>();
@@ -136,10 +135,10 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
}
/* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object)
*/
@Override
public Optional<T> findOne(ID id) {
public Optional<T> findById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -147,10 +146,10 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
}
/* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#existsById(java.lang.Object)
*/
@Override
public boolean exists(ID id) {
public boolean existsById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -180,7 +179,7 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
* @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
*/
@Override
public List<T> findAll(Iterable<ID> ids) {
public List<T> findAllById(Iterable<ID> ids) {
Assert.notNull(ids, "The given Iterable of id's must not be null");
@@ -188,10 +187,10 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
}
/* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object)
*/
@Override
public void delete(ID id) {
public void deleteById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -206,15 +205,15 @@ public class SimpleCassandraRepository<T, ID extends Serializable> implements Ty
Assert.notNull(entity, "The given entity must not be null");
delete(entityInformation.getId(entity)
deleteById(entityInformation.getId(entity)
.orElseThrow(() -> new IllegalArgumentException(String.format("Cannot obtain Id from [%s]", entity))));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
* @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable)
*/
@Override
public void delete(Iterable<? extends T> entities) {
public void deleteAll(Iterable<? extends T> entities) {
Assert.notNull(entities, "The given Iterable of entities must not be null");

49
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java
View File

@@ -18,8 +18,6 @@ package org.springframework.data.cassandra.repository.support;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.io.Serializable;
import org.reactivestreams.Publisher;
import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
import org.springframework.data.cassandra.repository.ReactiveCassandraRepository;
@@ -35,8 +33,7 @@ import com.datastax.driver.core.querybuilder.Select;
* @author Mark Paluch
* @since 2.0
*/
public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
implements ReactiveCassandraRepository<T, ID> {
public class SimpleReactiveCassandraRepository<T, ID> implements ReactiveCassandraRepository<T, ID> {
protected CassandraEntityInformation<T, ID> entityInformation;
@@ -82,18 +79,18 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Iterable)
*/
@Override
public <S extends T> Flux<S> save(Iterable<S> entities) {
public <S extends T> Flux<S> saveAll(Iterable<S> entities) {
Assert.notNull(entities, "The given Iterable of entities must not be null");
return save(Flux.fromIterable(entities));
return saveAll(Flux.fromIterable(entities));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(org.reactivestreams.Publisher)
*/
@Override
public <S extends T> Flux<S> save(Publisher<S> entityStream) {
public <S extends T> Flux<S> saveAll(Publisher<S> entityStream) {
Assert.notNull(entityStream, "The given Publisher of entities must not be null");
@@ -141,10 +138,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(java.io.Serializable)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object)
*/
@Override
public Mono<T> findOne(ID id) {
public Mono<T> findById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -152,10 +149,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(reactor.core.publisher.Mono)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(reactor.core.publisher.Mono)
*/
@Override
public Mono<T> findOne(Mono<ID> mono) {
public Mono<T> findById(Mono<ID> mono) {
Assert.notNull(mono, "The given id must not be null");
@@ -163,10 +160,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(java.io.Serializable)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object)
*/
@Override
public Mono<Boolean> exists(ID id) {
public Mono<Boolean> existsById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -174,10 +171,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(reactor.core.publisher.Mono)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(reactor.core.publisher.Mono)
*/
@Override
public Mono<Boolean> exists(Mono<ID> mono) {
public Mono<Boolean> existsById(Mono<ID> mono) {
Assert.notNull(mono, "The given id must not be null");
@@ -195,21 +192,21 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(java.lang.Iterable)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable)
*/
@Override
public Flux<T> findAll(Iterable<ID> iterable) {
public Flux<T> findAllById(Iterable<ID> iterable) {
Assert.notNull(iterable, "The given Iterable of id's must not be null");
return findAll(Flux.fromIterable(iterable));
return findAllById(Flux.fromIterable(iterable));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(org.reactivestreams.Publisher)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher)
*/
@Override
public Flux<T> findAll(Publisher<ID> idStream) {
public Flux<T> findAllById(Publisher<ID> idStream) {
Assert.notNull(idStream, "The given Publisher of id's must not be null");
@@ -225,10 +222,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.io.Serializable)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object)
*/
@Override
public Mono<Void> delete(ID id) {
public Mono<Void> deleteById(ID id) {
Assert.notNull(id, "The given id must not be null");
@@ -247,10 +244,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Iterable)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable)
*/
@Override
public Mono<Void> delete(Iterable<? extends T> entities) {
public Mono<Void> deleteAll(Iterable<? extends T> entities) {
Assert.notNull(entities, "The given Iterable of entities must not be null");
@@ -258,10 +255,10 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(org.reactivestreams.Publisher)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher)
*/
@Override
public Mono<Void> delete(Publisher<? extends T> entityStream) {
public Mono<Void> deleteAll(Publisher<? extends T> entityStream) {
Assert.notNull(entityStream, "The given Publisher of entities must not be null");

14
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java
View File

@@ -99,13 +99,13 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
carter = new Person("49", "Carter", "Beauford");
boyd = new Person("45", "Boyd", "Tinsley");
StepVerifier.create(reactiveRepository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4)
StepVerifier.create(reactiveRepository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4)
.verifyComplete();
}
@Test // DATACASS-335
public void reactiveStreamsMethodsShouldWork() {
StepVerifier.create(reactivePersonRepostitory.exists(dave.getId())).expectNext(true).verifyComplete();
StepVerifier.create(reactivePersonRepostitory.existsById(dave.getId())).expectNext(true).verifyComplete();
}
@Test // DATACASS-335
@@ -127,7 +127,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
@Test // DATACASS-335
public void simpleRxJava1MethodsShouldWork() {
rxJava1PersonRepostitory.exists(dave.getId()) //
rxJava1PersonRepostitory.existsById(dave.getId()) //
.test() //
.awaitTerminalEvent() //
.assertResult(true) //
@@ -138,7 +138,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
@Test // DATACASS-335
public void existsWithSingleRxJava1IdMethodsShouldWork() {
rxJava1PersonRepostitory.exists(Single.just(dave.getId())) //
rxJava1PersonRepostitory.existsById(Single.just(dave.getId())) //
.test() //
.awaitTerminalEvent() //
.assertResult(true) //
@@ -186,7 +186,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
@Test // DATACASS-398
public void simpleRxJava2MethodsShouldWork() {
rxJava2PersonRepostitory.exists(dave.getId()) //
rxJava2PersonRepostitory.existsById(dave.getId()) //
.test()//
.assertValue(true) //
.assertNoErrors() //
@@ -197,7 +197,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
@Test // DATACASS-398
public void existsWithSingleRxJava2IdMethodsShouldWork() {
rxJava2PersonRepostitory.exists(io.reactivex.Single.just(dave.getId())).test() //
rxJava2PersonRepostitory.existsById(io.reactivex.Single.just(dave.getId())).test() //
.assertValue(true) //
.assertNoErrors() //
.assertComplete() //
@@ -266,7 +266,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace
}
@Test // DATACASS-335
public void shouldFindOneByPublisherOfLastName() {
public void shouldFindByIdByPublisherOfLastName() {
StepVerifier.create(reactiveRepository.findByLastname(Single.just(this.carter.getLastname()))) //
.expectNext(carter) //

9
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java
View File

@@ -116,7 +116,8 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac
carter = new Person("49", "Carter", "Beauford");
boyd = new Person("45", "Boyd", "Tinsley");
StepVerifier.create(repository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4).verifyComplete();
StepVerifier.create(repository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4)
.verifyComplete();
}
@Test // DATACASS-335
@@ -125,12 +126,12 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac
}
@Test // DATACASS-335
public void shouldFindOneByLastName() {
public void shouldFindByIdByLastName() {
StepVerifier.create(repository.findOneByLastname(carter.getLastname())).expectNext(carter).verifyComplete();
}
@Test // DATACASS-335
public void shouldFindOneByPublisherOfLastName() {
public void shouldFindByIdByPublisherOfLastName() {
StepVerifier.create(repository.findByLastname(Mono.just(carter.getLastname()))).expectNext(carter).verifyComplete();
}
@@ -145,7 +146,7 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac
GroupKey key1 = new GroupKey("Simpsons", "hash", "Bart");
GroupKey key2 = new GroupKey("Simpsons", "hash", "Homer");
StepVerifier.create(groupRepostitory.save(Flux.just(new Group(key1), new Group(key2)))).expectNextCount(2)
StepVerifier.create(groupRepostitory.saveAll(Flux.just(new Group(key1), new Group(key2)))).expectNextCount(2)
.verifyComplete();
StepVerifier

7
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java
View File

@@ -13,12 +13,10 @@
* 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.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -28,11 +26,14 @@ import org.junit.Test;
* Unit tests for {@link BasicMapId}.
*
* @author Matthew T. Adams
* @author Mark Paluch
*/
public class BasicMapIdUnitTests {
@Test
public void testMapConstructor() {
Map<String, Serializable> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
map.put("field1", "value1");
map.put("field2", 2);

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

@@ -95,13 +95,13 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
carter = new Person("49", "Carter", "Beauford");
boyd = new Person("45", "Boyd", "Tinsley");
repository.save(Arrays.asList(oliver, dave, carter, boyd));
repository.saveAll(Arrays.asList(oliver, dave, carter, boyd));
}
@Test // DATACASS-396
public void existsByIdShouldReturnTrueForExistingObject() {
Boolean exists = repository.exists(dave.getId());
Boolean exists = repository.existsById(dave.getId());
assertThat(exists).isTrue();
}
@@ -109,7 +109,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
@Test // DATACASS-396
public void existsByIdShouldReturnFalseForAbsentObject() {
boolean exists = repository.exists("unknown");
boolean exists = repository.existsById("unknown");
assertThat(exists).isFalse();
}
@@ -117,23 +117,23 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
@Test // DATACASS-396
public void existsByMonoOfIdShouldReturnTrueForExistingObject() {
boolean exists = repository.exists(dave.getId());
boolean exists = repository.existsById(dave.getId());
assertThat(exists).isTrue();
}
@Test // DATACASS-396
public void findOneShouldReturnObject() {
public void findByIdShouldReturnObject() {
Optional<Person> person = repository.findOne(dave.getId());
Optional<Person> person = repository.findById(dave.getId());
assertThat(person).contains(dave);
}
@Test // DATACASS-396
public void findOneShouldCompleteWithoutValueForAbsentObject() {
public void findByIdShouldCompleteWithoutValueForAbsentObject() {
Optional<Person> person = repository.findOne("unknown");
Optional<Person> person = repository.findById("unknown");
assertThat(person).isEmpty();
}
@@ -149,7 +149,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
@Test // DATACASS-396, DATACASS-416
public void findAllByIterableOfIdShouldReturnResults() {
List<Person> persons = repository.findAll(Arrays.asList(dave.getId(), boyd.getId()));
List<Person> persons = repository.findAllById(Arrays.asList(dave.getId(), boyd.getId()));
assertThat(persons).hasSize(2);
}
@@ -194,7 +194,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
assertThat(saved).isEqualTo(saved);
Optional<Person> loaded = repository.findOne(dave.getId());
Optional<Person> loaded = repository.findById(dave.getId());
assertThat(loaded).isPresent();
@@ -213,7 +213,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
assertThat(saved).isEqualTo(person);
Optional<Person> loaded = repository.findOne(person.getId());
Optional<Person> loaded = repository.findById(person.getId());
assertThat(loaded).contains(person);
}
@@ -223,7 +223,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
repository.deleteAll();
List<Person> saved = repository.save(Arrays.asList(dave, oliver, boyd));
List<Person> saved = repository.saveAll(Arrays.asList(dave, oliver, boyd));
assertThat(saved).hasSize(3);
@@ -238,14 +238,14 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
dave.setFirstname("Hello, Dave");
dave.setLastname("Bowman");
List<Person> saved = repository.save(Arrays.asList(person, dave));
List<Person> saved = repository.saveAll(Arrays.asList(person, dave));
assertThat(saved).hasSize(2);
Optional<Person> persistentDave = repository.findOne(dave.getId());
Optional<Person> persistentDave = repository.findById(dave.getId());
assertThat(persistentDave).contains(dave);
Optional<Person> persistentHomer = repository.findOne(person.getId());
Optional<Person> persistentHomer = repository.findById(person.getId());
assertThat(persistentHomer).contains(person);
}
@@ -262,9 +262,9 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
@Test // DATACASS-396
public void deleteByIdShouldRemoveEntity() {
repository.delete(dave.getId());
repository.deleteById(dave.getId());
Optional<Person> loaded = repository.findOne(dave.getId());
Optional<Person> loaded = repository.findById(dave.getId());
assertThat(loaded).isEmpty();
}
@@ -274,7 +274,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
repository.delete(dave);
Optional<Person> loaded = repository.findOne(dave.getId());
Optional<Person> loaded = repository.findById(dave.getId());
assertThat(loaded).isEmpty();
}
@@ -282,9 +282,9 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC
@Test // DATACASS-396
public void deleteIterableOfEntitiesShouldRemoveEntities() {
repository.delete(Arrays.asList(dave, boyd));
repository.deleteAll(Arrays.asList(dave, boyd));
Optional<Person> loaded = repository.findOne(boyd.getId());
Optional<Person> loaded = repository.findById(boyd.getId());
assertThat(loaded).isEmpty();
}

61
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java
View File

@@ -99,7 +99,8 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
}
private void insertTestData() {
StepVerifier.create(repository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4).verifyComplete();
StepVerifier.create(repository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4)
.verifyComplete();
}
private void deleteAll() {
@@ -111,12 +112,12 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
insertTestData();
StepVerifier.create(repository.exists(dave.getId())).expectNext(true).verifyComplete();
StepVerifier.create(repository.existsById(dave.getId())).expectNext(true).verifyComplete();
}
@Test // DATACASS-335
public void existsByIdShouldReturnFalseForAbsentObject() {
StepVerifier.create(repository.exists("unknown")).expectNext(false).verifyComplete();
StepVerifier.create(repository.existsById("unknown")).expectNext(false).verifyComplete();
}
@Test // DATACASS-335
@@ -124,38 +125,38 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
insertTestData();
StepVerifier.create(repository.exists(Mono.just(dave.getId()))).expectNext(true).verifyComplete();
StepVerifier.create(repository.existsById(Mono.just(dave.getId()))).expectNext(true).verifyComplete();
}
@Test // DATACASS-335
public void existsByEmptyMonoOfIdShouldReturnEmptyMono() {
StepVerifier.create(repository.exists(Mono.empty())).verifyComplete();
StepVerifier.create(repository.existsById(Mono.empty())).verifyComplete();
}
@Test // DATACASS-335
public void findOneShouldReturnObject() {
public void findByIdShouldReturnObject() {
insertTestData();
StepVerifier.create(repository.findOne(dave.getId())).expectNext(dave).verifyComplete();
StepVerifier.create(repository.findById(dave.getId())).expectNext(dave).verifyComplete();
}
@Test // DATACASS-335
public void findOneShouldCompleteWithoutValueForAbsentObject() {
StepVerifier.create(repository.findOne("unknown")).verifyComplete();
public void findByIdShouldCompleteWithoutValueForAbsentObject() {
StepVerifier.create(repository.findById("unknown")).verifyComplete();
}
@Test // DATACASS-335
public void findOneByMonoOfIdShouldReturnTrueForExistingObject() {
public void findByIdByMonoOfIdShouldReturnTrueForExistingObject() {
insertTestData();
StepVerifier.create(repository.findOne(Mono.just(dave.getId()))).expectNext(dave).verifyComplete();
StepVerifier.create(repository.findById(Mono.just(dave.getId()))).expectNext(dave).verifyComplete();
}
@Test // DATACASS-335
public void findOneByEmptyMonoOfIdShouldReturnEmptyMono() {
StepVerifier.create(repository.findOne(Mono.empty())).verifyComplete();
public void findByIdByEmptyMonoOfIdShouldReturnEmptyMono() {
StepVerifier.create(repository.findById(Mono.empty())).verifyComplete();
}
@Test // DATACASS-335
@@ -171,7 +172,7 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
insertTestData();
StepVerifier.create(repository.findAll(Arrays.asList(dave.getId(), boyd.getId()))) //
StepVerifier.create(repository.findAllById(Arrays.asList(dave.getId(), boyd.getId()))) //
.expectNextCount(2) //
.verifyComplete();
}
@@ -181,14 +182,14 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
insertTestData();
StepVerifier.create(repository.findAll(Flux.just(dave.getId(), boyd.getId()))) //
StepVerifier.create(repository.findAllById(Flux.just(dave.getId(), boyd.getId()))) //
.expectNextCount(2) //
.verifyComplete();
}
@Test // DATACASS-335
public void findAllByEmptyPublisherOfIdShouldReturnResults() {
StepVerifier.create(repository.findAll(Flux.empty())).verifyComplete();
StepVerifier.create(repository.findAllById(Flux.empty())).verifyComplete();
}
@Test // DATACASS-335
@@ -243,7 +244,7 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
StepVerifier.create(repository.save(dave)).expectNextCount(1).verifyComplete();
StepVerifier.create(repository.findOne(dave.getId())).consumeNextWith(actual -> {
StepVerifier.create(repository.findById(dave.getId())).consumeNextWith(actual -> {
assertThat(actual.getFirstname()).isEqualTo(dave.getFirstname());
assertThat(actual.getLastname()).isEqualTo(dave.getLastname());
@@ -257,13 +258,13 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
StepVerifier.create(repository.save(person)).expectNextCount(1).verifyComplete();
StepVerifier.create(repository.findOne(person.getId())).expectNext(person).verifyComplete();
StepVerifier.create(repository.findById(person.getId())).expectNext(person).verifyComplete();
}
@Test // DATACASS-335
public void saveIterableOfNewEntitiesShouldInsertEntity() {
StepVerifier.create(repository.save(Arrays.asList(dave, oliver, boyd))).expectNextCount(3).verifyComplete();
StepVerifier.create(repository.saveAll(Arrays.asList(dave, oliver, boyd))).expectNextCount(3).verifyComplete();
StepVerifier.create(repository.findAll()).expectNextCount(3L).verifyComplete();
}
@@ -276,17 +277,17 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
dave.setFirstname("Hello, Dave");
dave.setLastname("Bowman");
StepVerifier.create(repository.save(Arrays.asList(person, dave))).expectNextCount(2).verifyComplete();
StepVerifier.create(repository.saveAll(Arrays.asList(person, dave))).expectNextCount(2).verifyComplete();
StepVerifier.create(repository.findOne(dave.getId())).expectNext(dave).verifyComplete();
StepVerifier.create(repository.findById(dave.getId())).expectNext(dave).verifyComplete();
StepVerifier.create(repository.findOne(person.getId())).expectNext(person).verifyComplete();
StepVerifier.create(repository.findById(person.getId())).expectNext(person).verifyComplete();
}
@Test // DATACASS-335
public void savePublisherOfEntitiesShouldInsertEntity() {
StepVerifier.create(repository.save(Flux.just(dave, oliver, boyd))).expectNextCount(3).verifyComplete();
StepVerifier.create(repository.saveAll(Flux.just(dave, oliver, boyd))).expectNextCount(3).verifyComplete();
StepVerifier.create(repository.findAll()).expectNextCount(3L).verifyComplete();
}
@@ -304,9 +305,9 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
@Test // DATACASS-335
public void deleteByIdShouldRemoveEntity() {
StepVerifier.create(repository.delete(dave.getId())).verifyComplete();
StepVerifier.create(repository.deleteById(dave.getId())).verifyComplete();
StepVerifier.create(repository.findOne(dave.getId())).expectNextCount(0).verifyComplete();
StepVerifier.create(repository.findById(dave.getId())).expectNextCount(0).verifyComplete();
}
@Test // DATACASS-335
@@ -314,23 +315,23 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
StepVerifier.create(repository.delete(dave)).verifyComplete();
StepVerifier.create(repository.findOne(dave.getId())).expectNextCount(0).verifyComplete();
StepVerifier.create(repository.findById(dave.getId())).expectNextCount(0).verifyComplete();
}
@Test // DATACASS-335
public void deleteIterableOfEntitiesShouldRemoveEntities() {
StepVerifier.create(repository.delete(Arrays.asList(dave, boyd))).verifyComplete();
StepVerifier.create(repository.deleteAll(Arrays.asList(dave, boyd))).verifyComplete();
StepVerifier.create(repository.findOne(boyd.getId())).expectNextCount(0).verifyComplete();
StepVerifier.create(repository.findById(boyd.getId())).expectNextCount(0).verifyComplete();
}
@Test // DATACASS-335
public void deletePublisherOfEntitiesShouldRemoveEntities() {
StepVerifier.create(repository.delete(Flux.just(dave, boyd))).verifyComplete();
StepVerifier.create(repository.deleteAll(Flux.just(dave, boyd))).verifyComplete();
StepVerifier.create(repository.findOne(boyd.getId())).expectNextCount(0).verifyComplete();
StepVerifier.create(repository.findById(boyd.getId())).expectNextCount(0).verifyComplete();
}
interface PersonRepostitory extends ReactiveCassandraRepository<Person, String> {}

17
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java
View File

@@ -23,6 +23,7 @@ import org.springframework.data.cassandra.core.CassandraTemplate;
/**
* @author Matthew T. Adams
* @author Mark Paluch
*/
public class ForceQuotedCompositePrimaryKeyRepositoryTests {
@@ -52,7 +53,7 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests {
assertThat(entity).isSameAs(s);
// select
Implicit f = implicitRepository.findOne(key).get();
Implicit f = implicitRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query("stringvalue", "\"Implicit\"", "\"keyZero\"", f.getPrimaryKey().getKeyZero(),
"\"keyOne\"", f.getPrimaryKey().getKeyOne());
@@ -62,13 +63,13 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests {
f.setStringValue(f.getStringValue() + "X");
Implicit u = implicitRepository.save(f);
assertThat(f).isSameAs(u);
f = implicitRepository.findOne(u.getPrimaryKey()).get();
f = implicitRepository.findById(u.getPrimaryKey()).get();
assertThat(u).isNotSameAs(f);
assertThat(f.getStringValue()).isEqualTo(u.getStringValue());
// delete
implicitRepository.delete(key);
assertThat(implicitRepository.findOne(key)).isNotPresent();
implicitRepository.deleteById(key);
assertThat(implicitRepository.findById(key)).isNotPresent();
}
public void testExplicit(String tableName, String stringValueColumnName, String keyZeroColumnName,
@@ -81,7 +82,7 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests {
assertThat(entity).isSameAs(s);
// select
Explicit f = explicitRepository.findOne(key).get();
Explicit f = explicitRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query(stringValueColumnName, tableName, keyZeroColumnName, f.getPrimaryKey().getKeyZero(),
keyOneColumnName, f.getPrimaryKey().getKeyOne());
@@ -91,12 +92,12 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests {
f.setStringValue(f.getStringValue() + "X");
Explicit u = explicitRepository.save(f);
assertThat(f).isSameAs(u);
f = explicitRepository.findOne(u.getPrimaryKey()).get();
f = explicitRepository.findById(u.getPrimaryKey()).get();
assertThat(u).isNotSameAs(f);
assertThat(f.getStringValue()).isEqualTo(u.getStringValue());
// delete
explicitRepository.delete(key);
assertThat(explicitRepository.findOne(key)).isNotPresent();
explicitRepository.deleteById(key);
assertThat(explicitRepository.findById(key)).isNotPresent();
}
}

25
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java
View File

@@ -23,6 +23,7 @@ import org.springframework.data.cassandra.core.CassandraOperations;
* Tests to be executed using Java/XML configuration.
*
* @author Matthew T. Adams
* @author Mark Paluch
*/
public class ForceQuotedRepositoryTests {
@@ -48,15 +49,15 @@ public class ForceQuotedRepositoryTests {
Implicit s = implicitRepository.save(entity);
assertThat(entity).isSameAs(s);
Implicit f = implicitRepository.findOne(key).get();
Implicit f = implicitRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query("stringvalue", "\"Implicit\"", "primarykey", f.getPrimaryKey());
assertThat(stringValue).isEqualTo(f.getStringValue());
implicitRepository.delete(key);
implicitRepository.deleteById(key);
assertThat(implicitRepository.findOne(key)).isNotPresent();
assertThat(implicitRepository.findById(key)).isNotPresent();
}
public void testExplicit(String tableName) {
@@ -66,15 +67,15 @@ public class ForceQuotedRepositoryTests {
Explicit s = explicitRepository.save(entity);
assertThat(entity).isSameAs(s);
Explicit f = explicitRepository.findOne(key).get();
Explicit f = explicitRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query("stringvalue", String.format("\"%s\"", tableName), "primarykey", f.getPrimaryKey());
assertThat(stringValue).isEqualTo(f.getStringValue());
explicitRepository.delete(key);
explicitRepository.deleteById(key);
assertThat(explicitRepository.findOne(key)).isNotPresent();
assertThat(explicitRepository.findById(key)).isNotPresent();
}
public void testImplicitProperties() {
@@ -84,15 +85,15 @@ public class ForceQuotedRepositoryTests {
ImplicitProperties s = implicitPropertiesRepository.save(entity);
assertThat(entity).isSameAs(s);
ImplicitProperties f = implicitPropertiesRepository.findOne(key).get();
ImplicitProperties f = implicitPropertiesRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query("\"stringValue\"", "implicitproperties", "\"primaryKey\"", f.getPrimaryKey());
assertThat(stringValue).isEqualTo(f.getStringValue());
implicitPropertiesRepository.delete(key);
implicitPropertiesRepository.deleteById(key);
assertThat(implicitPropertiesRepository.findOne(key)).isNotPresent();
assertThat(implicitPropertiesRepository.findById(key)).isNotPresent();
}
public void testExplicitProperties(String stringValueColumnName, String primaryKeyColumnName) {
@@ -102,15 +103,15 @@ public class ForceQuotedRepositoryTests {
ExplicitProperties s = explicitPropertiesRepository.save(entity);
assertThat(entity).isSameAs(s);
ExplicitProperties f = explicitPropertiesRepository.findOne(key).get();
ExplicitProperties f = explicitPropertiesRepository.findById(key).get();
assertThat(entity).isNotSameAs(f);
String stringValue = query(String.format("\"%s\"", stringValueColumnName), "explicitproperties",
String.format("\"%s\"", primaryKeyColumnName), f.getPrimaryKey());
assertThat(stringValue).isEqualTo(f.getStringValue());
implicitPropertiesRepository.delete(key);
implicitPropertiesRepository.deleteById(key);
assertThat(implicitPropertiesRepository.findOne(key)).isNotPresent();
assertThat(implicitPropertiesRepository.findById(key)).isNotPresent();
}
}

15
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java
View File

@@ -34,7 +34,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* Integration tests for repositories using {@link MapId}.
*
* @author Matthew T. Adams.
* @author Matthew T. Adams
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@@ -72,7 +73,7 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC
// select
MapId id = id("key", saved.getKey());
SinglePrimaryKeyColumn selected = singlePrimaryKecColumnRepository.findOne(id).get();
SinglePrimaryKeyColumn selected = singlePrimaryKecColumnRepository.findById(id).get();
assertThat(saved).isNotSameAs(selected);
assertThat(selected.getKey()).isEqualTo(saved.getKey());
assertThat(selected.getValue()).isEqualTo(saved.getValue());
@@ -82,13 +83,13 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC
SinglePrimaryKeyColumn updated = singlePrimaryKecColumnRepository.save(selected);
assertThat(selected).isSameAs(updated);
selected = singlePrimaryKecColumnRepository.findOne(id).get();
selected = singlePrimaryKecColumnRepository.findById(id).get();
assertThat(updated).isNotSameAs(selected);
assertThat(selected.getValue()).isEqualTo(updated.getValue());
// delete
singlePrimaryKecColumnRepository.delete(selected);
assertThat(singlePrimaryKecColumnRepository.findOne(id)).isEmpty();
assertThat(singlePrimaryKecColumnRepository.findById(id)).isEmpty();
}
@Test
@@ -102,7 +103,7 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC
// select
MapId id = id("key0", saved.getKey0()).with("key1", saved.getKey1());
MultiPrimaryKeyColumns selected = multiPrimaryKeyColumnsRepository.findOne(id).get();
MultiPrimaryKeyColumns selected = multiPrimaryKeyColumnsRepository.findById(id).get();
assertThat(saved).isNotSameAs(selected);
assertThat(selected.getKey0()).isEqualTo(saved.getKey0());
assertThat(selected.getKey1()).isEqualTo(saved.getKey1());
@@ -113,13 +114,13 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC
MultiPrimaryKeyColumns updated = multiPrimaryKeyColumnsRepository.save(selected);
assertThat(selected).isSameAs(updated);
selected = multiPrimaryKeyColumnsRepository.findOne(id).get();
selected = multiPrimaryKeyColumnsRepository.findById(id).get();
assertThat(updated).isNotSameAs(selected);
assertThat(selected.getValue()).isEqualTo(updated.getValue());
// delete
template.delete(selected);
assertThat(multiPrimaryKeyColumnsRepository.findOne(id)).isEmpty();
assertThat(multiPrimaryKeyColumnsRepository.findById(id)).isEmpty();
}
}

10
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java
View File

@@ -81,9 +81,9 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest
repository.save(bean);
assertThat(repository.exists(bean.getUsername())).isTrue();
assertThat(repository.existsById(bean.getUsername())).isTrue();
Optional<User> retrieved = repository.findOne(bean.getUsername());
Optional<User> retrieved = repository.findById(bean.getUsername());
assertThat(retrieved).hasValueSatisfying(actual -> {
assertThat(actual.getUsername()).isEqualTo(bean.getUsername());
@@ -92,12 +92,12 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest
});
assertThat(repository.count()).isEqualTo(1);
assertThat(repository.exists(bean.getUsername())).isTrue();
assertThat(repository.existsById(bean.getUsername())).isTrue();
repository.delete(bean);
assertThat(repository.count()).isEqualTo(0);
assertThat(repository.findOne(bean.getUsername())).isNotPresent();
assertThat(repository.findById(bean.getUsername())).isNotPresent();
}
@Test // DATACASS-249
@@ -113,7 +113,7 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest
qualifiedUserRepository.save(bean);
assertThat(qualifiedUserRepository.exists(bean.getUsername())).isTrue();
assertThat(qualifiedUserRepository.existsById(bean.getUsername())).isTrue();
}
@Test // DATACASS-149

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiUserRepository.java
View File

@@ -27,5 +27,5 @@ import org.springframework.data.repository.CrudRepository;
*/
public interface CdiUserRepository extends CrudRepository<User, String> {
Optional<User> findOne(String id);
Optional<User> findById(String id);
}

14
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java
View File

@@ -113,7 +113,7 @@ public class UserRepositoryIntegrationTests {
public void findsUserById() throws Exception {
Optional<User> user = repository.findOne(tom.getUsername());
Optional<User> user = repository.findById(tom.getUsername());
assertThat(user).isNotNull().contains(tom);
}
@@ -128,7 +128,7 @@ public class UserRepositoryIntegrationTests {
public void findsAllWithGivenIds() {
Iterable<User> result = repository.findAll(Arrays.asList(bob.getUsername(), tom.getUsername()));
Iterable<User> result = repository.findAllById(Arrays.asList(bob.getUsername(), tom.getUsername()));
assertThat(result).contains(bob, tom);
assertThat(result).doesNotContain(alice, scott);
@@ -146,7 +146,7 @@ public class UserRepositoryIntegrationTests {
public void deletesUserByIdCorrectly() {
repository.delete(tom.getUsername());
repository.deleteById(tom.getUsername());
List<User> result = Lists.newArrayList(repository.findAll());
@@ -158,11 +158,11 @@ public class UserRepositoryIntegrationTests {
String id = "tom";
assertThat(repository.exists(id)).isTrue();
assertThat(repository.existsById(id)).isTrue();
repository.delete(id);
repository.deleteById(id);
assertThat(repository.exists(id)).isFalse();
assertThat(repository.existsById(id)).isFalse();
}
// DATACASS-182
@@ -173,7 +173,7 @@ public class UserRepositoryIntegrationTests {
repository.save(tom);
Optional<User> loadedTom = repository.findOne(tom.getUsername());
Optional<User> loadedTom = repository.findById(tom.getUsername());
assertThat(loadedTom).hasValueSatisfying(actual -> {

4
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java
View File

@@ -17,8 +17,6 @@ package org.springframework.data.cassandra.test.integration.repository.simple;
import static org.assertj.core.api.Assertions.*;
import java.io.Serializable;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.aop.framework.Advised;
@@ -57,7 +55,7 @@ public class UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests
assertThat(((Advised) repository).getTargetSource().getTarget()).isInstanceOf(CustomCassandraRepository.class);
}
public static class CustomCassandraRepository<T, ID extends Serializable> extends SimpleCassandraRepository<T, ID> {
public static class CustomCassandraRepository<T, ID> extends SimpleCassandraRepository<T, ID> {
public CustomCassandraRepository(CassandraEntityInformation<T, ID> metadata, CassandraOperations operations) {
super(metadata, operations);