From d0c15c0265afa1ad837ebc21ce97f336f56db34f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 14 Mar 2017 17:15:40 +0100 Subject: [PATCH] DATACASS-416 - Polishing. Add method override javadocs. Reformat code. Fix references to reactive Sorting repositories. --- .../support/CassandraRepositoryFactory.java | 32 ++++------- .../CassandraRepositoryFactoryBean.java | 12 ++-- .../ReactiveCassandraRepositoryFactory.java | 16 ++---- ...eactiveCassandraRepositoryFactoryBean.java | 27 ++++----- .../SimpleReactiveCassandraRepository.java | 57 +++++++++++++++++++ 5 files changed, 90 insertions(+), 54 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java index fc392258f..3e2783234 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java @@ -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 entityInformation = - getEntityInformation(information.getDomainType()); + CassandraEntityInformation 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((CassandraPersistentEntity) 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); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java index 63dc146a9..dd27c08fc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java @@ -57,23 +57,21 @@ public class CassandraRepositoryFactoryBean, 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!"); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java index b61c7ec8b..36997baec 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java @@ -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 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java index dfd37cb3c..6285c45d2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java @@ -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, S, ID extends Serializable> extends RepositoryFactoryBeanSupport { @@ -53,15 +52,14 @@ public class ReactiveCassandraRepositoryFactoryBean, /** * 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, 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, 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() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java index f5eb2110c..a23ef7849 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java @@ -58,6 +58,9 @@ public class SimpleReactiveCassandraRepository this.operations = operations; } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(S) + */ @Override public Mono save(S entity) { @@ -71,6 +74,9 @@ public class SimpleReactiveCassandraRepository } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Iterable) + */ @Override public Flux save(Iterable entities) { @@ -79,6 +85,9 @@ public class SimpleReactiveCassandraRepository return save(Flux.fromIterable(entities)); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(org.reactivestreams.Publisher) + */ @Override public Flux save(Publisher entityStream) { @@ -94,6 +103,9 @@ public class SimpleReactiveCassandraRepository }); } + /* (non-Javadoc) + * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Object) + */ @Override public Mono insert(S entity) { @@ -102,6 +114,9 @@ public class SimpleReactiveCassandraRepository return operations.insert(entity); } + /* (non-Javadoc) + * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Iterable) + */ @Override public Flux insert(Iterable entities) { @@ -110,6 +125,9 @@ public class SimpleReactiveCassandraRepository return operations.insert(Flux.fromIterable(entities)); } + /* (non-Javadoc) + * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(org.reactivestreams.Publisher) + */ @Override public Flux insert(Publisher entityStream) { @@ -118,6 +136,9 @@ public class SimpleReactiveCassandraRepository return operations.insert(entityStream); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(java.io.Serializable) + */ @Override public Mono findOne(ID id) { @@ -126,6 +147,9 @@ public class SimpleReactiveCassandraRepository return operations.selectOneById(id, entityInformation.getJavaType()); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(reactor.core.publisher.Mono) + */ @Override public Mono findOne(Mono mono) { @@ -134,6 +158,9 @@ public class SimpleReactiveCassandraRepository 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 exists(ID id) { @@ -142,6 +169,9 @@ public class SimpleReactiveCassandraRepository return operations.exists(id, entityInformation.getJavaType()); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(reactor.core.publisher.Mono) + */ @Override public Mono exists(Mono mono) { @@ -150,6 +180,9 @@ public class SimpleReactiveCassandraRepository return mono.then(id -> operations.exists(id, entityInformation.getJavaType())); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll() + */ @Override public Flux findAll() { @@ -157,6 +190,9 @@ public class SimpleReactiveCassandraRepository return operations.select(select, entityInformation.getJavaType()); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(java.lang.Iterable) + */ @Override public Flux findAll(Iterable iterable) { @@ -165,6 +201,9 @@ public class SimpleReactiveCassandraRepository return findAll(Flux.fromIterable(iterable)); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(org.reactivestreams.Publisher) + */ @Override public Flux findAll(Publisher idStream) { @@ -173,11 +212,17 @@ public class SimpleReactiveCassandraRepository return Flux.from(idStream).flatMap(id -> operations.selectOneById(id, entityInformation.getJavaType())); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count() + */ @Override public Mono count() { return operations.count(entityInformation.getJavaType()); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.io.Serializable) + */ @Override public Mono delete(ID id) { @@ -186,6 +231,9 @@ public class SimpleReactiveCassandraRepository return operations.deleteById(id, entityInformation.getJavaType()).then(); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object) + */ @Override public Mono delete(T entity) { @@ -194,6 +242,9 @@ public class SimpleReactiveCassandraRepository return operations.delete(entity).then(); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Iterable) + */ @Override public Mono delete(Iterable entities) { @@ -202,6 +253,9 @@ public class SimpleReactiveCassandraRepository return operations.delete(Flux.fromIterable(entities)).then(); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(org.reactivestreams.Publisher) + */ @Override public Mono delete(Publisher entityStream) { @@ -210,6 +264,9 @@ public class SimpleReactiveCassandraRepository return operations.delete(entityStream).then(); } + /* (non-Javadoc) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll() + */ @Override public Mono deleteAll() { return operations.truncate(entityInformation.getJavaType());