diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java index 37094416e..6c5dcef9c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java @@ -778,7 +778,6 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations, Applica return session.getCluster().getConfiguration().getQueryOptions().getFetchSize(); } - @SuppressWarnings("ConstantConditions") private int getEffectiveFetchSize(Statement statement) { if (statement.getFetchSize() > 0) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java index 6292a656e..aff8a6358 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java @@ -801,6 +801,24 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations, A return getMappingContext().getRequiredPersistentEntity(ClassUtils.getUserClass(entityType)); } + @SuppressWarnings("ConstantConditions") + private Mono getEffectiveFetchSize(Statement statement) { + + if (statement.getFetchSize() > 0) { + return Mono.just(statement.getFetchSize()); + } + + if (getReactiveCqlOperations() instanceof CassandraAccessor) { + CassandraAccessor accessor = (CassandraAccessor) getReactiveCqlOperations(); + if (accessor.getFetchSize() != -1) { + return Mono.just(accessor.getFetchSize()); + } + } + + return getReactiveCqlOperations().execute((ReactiveSessionCallback) session -> Mono + .just(session.getCluster().getConfiguration().getQueryOptions().getFetchSize())).single(); + } + @SuppressWarnings("unchecked") private Function getMapper(Class entityType, Class targetType, CqlIdentifier tableName) { @@ -840,24 +858,6 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations, A return converter; } - @SuppressWarnings("ConstantConditions") - private Mono getEffectiveFetchSize(Statement statement) { - - if (statement.getFetchSize() > 0) { - return Mono.just(statement.getFetchSize()); - } - - if (getReactiveCqlOperations() instanceof CassandraAccessor) { - CassandraAccessor accessor = (CassandraAccessor) getReactiveCqlOperations(); - if (accessor.getFetchSize() != -1) { - return Mono.just(accessor.getFetchSize()); - } - } - - return getReactiveCqlOperations().execute((ReactiveSessionCallback) session -> Mono - .just(session.getCluster().getConfiguration().getQueryOptions().getFetchSize())).single(); - } - @Value static class StatementCallback implements ReactiveSessionCallback, CqlProvider { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java index ad772ad2e..56be8956b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java @@ -132,9 +132,8 @@ public class QueryMapper { Object value = predicate.getValue(); - Object mappedValue = value != null - ? getConverter().convertToColumnType(value, getTypeInformation(field, value)) - : null; + Object mappedValue = value != null ? getConverter().convertToColumnType(value, getTypeInformation(field, value)) + : null; Predicate mappedPredicate = new Predicate(predicate.getOperator(), mappedValue); @@ -166,9 +165,8 @@ public class QueryMapper { Field field = createPropertyField(entity, column); - columns.getSelector(column).ifPresent(selector -> - getCqlIdentifier(column, field).ifPresent(cqlIdentifier -> - selectors.add(getMappedSelector(selector, cqlIdentifier)))); + columns.getSelector(column).ifPresent(selector -> getCqlIdentifier(column, field) + .ifPresent(cqlIdentifier -> selectors.add(getMappedSelector(selector, cqlIdentifier)))); } if (columns.isEmpty()) { @@ -255,10 +253,8 @@ public class QueryMapper { field.getProperty().ifPresent(seen::add); - columns.getSelector(column) - .filter(selector -> selector instanceof ColumnSelector) - .ifPresent(columnSelector -> - getCqlIdentifier(column, field).map(CqlIdentifier::toCql).ifPresent(columnNames::add)); + columns.getSelector(column).filter(selector -> selector instanceof ColumnSelector).ifPresent( + columnSelector -> getCqlIdentifier(column, field).map(CqlIdentifier::toCql).ifPresent(columnNames::add)); } if (columns.isEmpty()) { @@ -333,7 +329,7 @@ public class QueryMapper { Field createPropertyField(@Nullable CassandraPersistentEntity entity, ColumnName key) { - return Optional.ofNullable(entity).map(e -> new MetadataBackedField(key, e, getMappingContext())) + return Optional.ofNullable(entity). map(e -> new MetadataBackedField(key, e, getMappingContext())) .orElseGet(() -> new Field(key)); } @@ -464,8 +460,8 @@ public class QueryMapper { PropertyPath propertyPath = PropertyPath.from(pathExpression.replaceAll("\\.\\d", ""), this.entity.getTypeInformation()); - PersistentPropertyPath persistentPropertyPath = - this.mappingContext.getPersistentPropertyPath(propertyPath); + PersistentPropertyPath persistentPropertyPath = this.mappingContext + .getPersistentPropertyPath(propertyPath); return Optional.of(persistentPropertyPath); } catch (PropertyReferenceException e) { @@ -473,18 +469,16 @@ public class QueryMapper { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#with(java.lang.String) + /* (non-Javadoc) + * @see org.springframework.data.cassandra.core.convert.QueryMapper.Field#with(org.springframework.data.cassandra.core.query.ColumnName) */ @Override public MetadataBackedField with(ColumnName name) { return new MetadataBackedField(name, entity, mappingContext, property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getProperty() + /* (non-Javadoc) + * @see org.springframework.data.cassandra.core.convert.QueryMapper.Field#getProperty() */ @Override public Optional getProperty() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java index c956370da..aa2b43721 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java @@ -43,7 +43,7 @@ abstract class SerializationUtils { /** * Serializes the given object into pseudo-CQL meaning it's trying to create a CQL representation as far as possible * but falling back to the given object's {@link Object#toString()} method if it's not serializable. Useful for - * printing raw {@link Criteria}s containing complex values before actually converting them into Mongo native types. + * printing raw {@link Criteria}s containing complex values before actually converting them into CQL native types. * * @param criteria may be {@literal null}. * @return may be {@literal null}. @@ -64,7 +64,7 @@ abstract class SerializationUtils { /** * Serializes the given object into pseudo-CQL meaning it's trying to create a CQL representation as far as possible * but falling back to the given object's {@link Object#toString()} method if it's not serializable. Useful for - * printing raw {@link Criteria}s containing complex values before actually converting them into Mongo native types. + * printing raw {@link Criteria}s containing complex values before actually converting them into CQL native types. * * @param value value to serialize to CQL, may be {@literal null}. * @return the value as a serialized CQL {@link String}, may be {@literal null}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java index 2933e37b5..1285cbd18 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java @@ -66,8 +66,7 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc : CassandraSimpleTypeHolder.getDataTypeFor(getParameterType(index))); } - /* - * (non-Javadoc) + /* (non-Javadoc) * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int) */ @Nullable @@ -75,8 +74,7 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc return getParameters().getParameter(index).getCassandraType(); } - /* - * (non-Javadoc) + /* (non-Javadoc) * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getParameterType(int) */ @Override @@ -84,8 +82,7 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc return getParameters().getParameter(index).getType(); } - /* - * (non-Javadoc) + /* (non-Javadoc) * @see org.springframework.data.repository.query.ParametersParameterAccessor#getParameters() */ @Override @@ -93,18 +90,16 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc return (CassandraParameters) super.getParameters(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.CassandraParameterAccessor#getValues() + /* (non-Javadoc) + * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getValues() */ @Override public Object[] getValues() { return this.values.toArray(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.CassandraParameterAccessor#getQueryOptions() + /* (non-Javadoc) + * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getQueryOptions() */ @Nullable @Override diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java index 33d97597d..b6ec53580 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryUnitTests.java @@ -43,11 +43,8 @@ import org.springframework.data.repository.Repository; public class CassandraRepositoryFactoryUnitTests { @Mock CassandraConverter converter; - @Mock CassandraMappingContext mappingContext; - @Mock BasicCassandraPersistentEntity entity; - @Mock CassandraTemplate template; @Before diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryUnitTests.java index 659e9c8e0..e3566b4ab 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryUnitTests.java @@ -43,11 +43,8 @@ import org.springframework.data.repository.Repository; public class ReactiveCassandraRepositoryFactoryUnitTests { @Mock CassandraConverter converter; - @Mock CassandraMappingContext mappingContext; - @Mock BasicCassandraPersistentEntity entity; - @Mock ReactiveCassandraTemplate template; @Before