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

DATACASS-416 - Polishing.

Browse Source 
Add method override javadocs. Reformat code. Fix references to reactive Sorting repositories.
This commit is contained in:
Mark Paluch
2017-03-14 17:15:40 +01:00
parent 1da1c89fc0
commit d0c15c0265
5 changed files with 90 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,8 +69,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
this.mappingContext = operations.getConverter().getMappingContext();
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
*/
@Override
@@ -78,21 +77,18 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
return SimpleCassandraRepository.class;
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
*/
@Override
protected Object getTargetRepository(RepositoryInformation information) {
CassandraEntityInformation<?, Serializable> entityInformation =
getEntityInformation(information.getDomainType());
CassandraEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
return getTargetRepositoryViaReflection(information, entityInformation, operations);
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
*/
@Override
@@ -102,26 +98,24 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
CassandraPersistentEntity<?> entity = mappingContext.getPersistentEntity(domainClass);
if (entity == null) {
throw new MappingException(String.format("Could not lookup mapping metadata for domain class %s",
domainClass.getName()));
throw new MappingException(
String.format("Could not lookup mapping metadata for domain class %s", domainClass.getName()));
}
return new MappingCassandraEntityInformation<T, ID>((CassandraPersistentEntity<T>) entity,
operations.getConverter());
}
/*
* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(Key)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key)
*/
@Override
protected QueryLookupStrategy getQueryLookupStrategy(Key key) {
return getQueryLookupStrategy(key, null);
}
/*
* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(Key, EvaluationContextProvider)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
*/
@Override
protected QueryLookupStrategy getQueryLookupStrategy(Key key, EvaluationContextProvider evaluationContextProvider) {
@@ -142,8 +136,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
this.mappingContext = mappingContext;
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
*/
@Override
@@ -158,8 +151,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
return new StringBasedCassandraQuery(namedQuery, queryMethod, operations, EXPRESSION_PARSER,
evaluationContextProvider);
} else if (queryMethod.hasAnnotatedQuery()) {
return new StringBasedCassandraQuery(queryMethod, operations, EXPRESSION_PARSER,
evaluationContextProvider);
return new StringBasedCassandraQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
} else {
return new PartTreeCassandraQuery(queryMethod, operations);
}

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

@@ -57,23 +57,21 @@ public class CassandraRepositoryFactoryBean<T extends Repository<S, ID>, S, ID e
* Configures the {@link CassandraTemplate} used for Cassandra data access operations.
*
* @param cassandraTemplate {@link CassandraTemplate} used to perform CRUD, Query and general data access operations
* on Apache Cassandra.
* on Apache Cassandra.
*/
public void setCassandraTemplate(CassandraTemplate cassandraTemplate) {
this.cassandraTemplate = cassandraTemplate;
setMappingContext(cassandraTemplate.getConverter().getMappingContext());
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.data.repository.support.RepositoryFactoryBeanSupport
* #afterPropertiesSet()
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() {
super.afterPropertiesSet();
Assert.notNull(cassandraTemplate, "CassandraTemplate must not be null!");
}
}

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

@@ -49,6 +49,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
private static final SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
private final ReactiveCassandraOperations operations;
private final CassandraMappingContext mappingContext;
/**
@@ -64,8 +65,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
this.mappingContext = cassandraOperations.getConverter().getMappingContext();
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
*/
@Override
@@ -73,8 +73,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
return SimpleReactiveCassandraRepository.class;
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
*/
@Override
@@ -85,8 +84,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
return getTargetRepositoryViaReflection(information, entityInformation, operations);
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
*/
@Override
@@ -94,8 +92,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
return new CassandraQueryLookupStrategy(operations, evaluationContextProvider, mappingContext);
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
*/
@SuppressWarnings("unchecked")
@@ -130,8 +127,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor
this.mappingContext = mappingContext;
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
*/
@Override

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

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-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.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.cassandra.repository.support;
import java.io.Serializable;
@@ -31,8 +30,8 @@ import org.springframework.util.Assert;
*
* @author Mark Paluch
* @since 2.0
* @see org.springframework.data.repository.reactive.ReactivePagingAndSortingRepository
* @see org.springframework.data.repository.reactive.RxJavaPagingAndSortingRepository
* @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>
extends RepositoryFactoryBeanSupport<T, S, ID> {
@@ -53,15 +52,14 @@ public class ReactiveCassandraRepositoryFactoryBean<T extends Repository<S, ID>,
/**
* Configures the {@link ReactiveCassandraOperations} used for Cassandra data access operations.
*
* @param operations {@link ReactiveCassandraOperations} used to perform CRUD, Query and general data access operations
* on Apache Cassandra.
* @param operations {@link ReactiveCassandraOperations} used to perform CRUD, Query and general data access
* operations on Apache Cassandra.
*/
public void setReactiveCassandraOperations(ReactiveCassandraOperations operations) {
this.operations = operations;
}
/*
* (non-Javadoc)
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
*/
@Override
@@ -72,12 +70,8 @@ public class ReactiveCassandraRepositoryFactoryBean<T extends Repository<S, ID>,
this.mappingContextConfigured = true;
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.data.repository.support.RepositoryFactoryBeanSupport
* #createRepositoryFactory()
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory()
*/
@Override
protected final RepositoryFactorySupport createRepositoryFactory() {
@@ -94,9 +88,8 @@ public class ReactiveCassandraRepositoryFactoryBean<T extends Repository<S, ID>,
return new ReactiveCassandraRepositoryFactory(operations);
}
/*
* (non-Javadoc)
* @see org.springframework.data.repository.support.RepositoryFactoryBeanSupport#afterPropertiesSet()
/* (non-Javadoc)
* @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() {

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

@@ -58,6 +58,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
this.operations = operations;
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(S)
*/
@Override
public <S extends T> Mono<S> save(S entity) {
@@ -71,6 +74,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Iterable)
*/
@Override
public <S extends T> Flux<S> save(Iterable<S> entities) {
@@ -79,6 +85,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return save(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) {
@@ -94,6 +103,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
});
}
/* (non-Javadoc)
* @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Object)
*/
@Override
public <S extends T> Mono<S> insert(S entity) {
@@ -102,6 +114,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.insert(entity);
}
/* (non-Javadoc)
* @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Iterable)
*/
@Override
public <S extends T> Flux<S> insert(Iterable<S> entities) {
@@ -110,6 +125,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.insert(Flux.fromIterable(entities));
}
/* (non-Javadoc)
* @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(org.reactivestreams.Publisher)
*/
@Override
public <S extends T> Flux<S> insert(Publisher<S> entityStream) {
@@ -118,6 +136,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.insert(entityStream);
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(java.io.Serializable)
*/
@Override
public Mono<T> findOne(ID id) {
@@ -126,6 +147,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.selectOneById(id, entityInformation.getJavaType());
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(reactor.core.publisher.Mono)
*/
@Override
public Mono<T> findOne(Mono<ID> mono) {
@@ -134,6 +158,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return mono.then(id -> operations.selectOneById(id, entityInformation.getJavaType()));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(java.io.Serializable)
*/
@Override
public Mono<Boolean> exists(ID id) {
@@ -142,6 +169,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.exists(id, entityInformation.getJavaType());
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(reactor.core.publisher.Mono)
*/
@Override
public Mono<Boolean> exists(Mono<ID> mono) {
@@ -150,6 +180,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return mono.then(id -> operations.exists(id, entityInformation.getJavaType()));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll()
*/
@Override
public Flux<T> findAll() {
@@ -157,6 +190,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.select(select, entityInformation.getJavaType());
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(java.lang.Iterable)
*/
@Override
public Flux<T> findAll(Iterable<ID> iterable) {
@@ -165,6 +201,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return findAll(Flux.fromIterable(iterable));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(org.reactivestreams.Publisher)
*/
@Override
public Flux<T> findAll(Publisher<ID> idStream) {
@@ -173,11 +212,17 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return Flux.from(idStream).flatMap(id -> operations.selectOneById(id, entityInformation.getJavaType()));
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count()
*/
@Override
public Mono<Long> count() {
return operations.count(entityInformation.getJavaType());
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.io.Serializable)
*/
@Override
public Mono<Void> delete(ID id) {
@@ -186,6 +231,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.deleteById(id, entityInformation.getJavaType()).then();
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object)
*/
@Override
public Mono<Void> delete(T entity) {
@@ -194,6 +242,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.delete(entity).then();
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Iterable)
*/
@Override
public Mono<Void> delete(Iterable<? extends T> entities) {
@@ -202,6 +253,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.delete(Flux.fromIterable(entities)).then();
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(org.reactivestreams.Publisher)
*/
@Override
public Mono<Void> delete(Publisher<? extends T> entityStream) {
@@ -210,6 +264,9 @@ public class SimpleReactiveCassandraRepository<T, ID extends Serializable>
return operations.delete(entityStream).then();
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll()
*/
@Override
public Mono<Void> deleteAll() {
return operations.truncate(entityInformation.getJavaType());