From 1a2f999e60e4465708d0a049fe25958272fb8ca3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Mar 2020 10:05:43 +0100 Subject: [PATCH] DATACASS-712 - Polishing. Reformat code. --- .../data/cassandra/core/StatementFactory.java | 97 ++++++++----------- .../core/StatementFactoryUnitTests.java | 26 ++--- 2 files changed, 53 insertions(+), 70 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java index 920724d44..e7b1744d9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java @@ -86,8 +86,8 @@ import com.datastax.oss.driver.api.querybuilder.update.UpdateStart; import com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments; /** - * Factory to render {@link com.datastax.oss.driver.api.core.cql.Statement} objects - * from {@link Query} and {@link Update} objects. + * Factory to render {@link com.datastax.oss.driver.api.core.cql.Statement} objects from {@link Query} and + * {@link Update} objects. * * @author Mark Paluch * @author John Blum @@ -218,7 +218,7 @@ public class StatementFactory { cassandraConverter.write(id, where, persistentEntity); return StatementBuilder.of(QueryBuilder.selectFrom(tableName).all().limit(1)) - .bind((statement, factory) -> statement.where(toRelations(where, factory))); + .bind((statement, factory) -> statement.where(toRelations(where, factory))); } /** @@ -373,22 +373,18 @@ public class StatementFactory { Update mappedUpdate = getUpdateMapper().getMappedObject(update, persistentEntity); - StatementBuilder builder = - update(tableName, mappedUpdate, filter); + StatementBuilder builder = update(tableName, mappedUpdate, + filter); - query.getQueryOptions() - .filter(UpdateOptions.class::isInstance) - .map(UpdateOptions.class::cast) + query.getQueryOptions().filter(UpdateOptions.class::isInstance).map(UpdateOptions.class::cast) .map(UpdateOptions::getIfCondition) .ifPresent(criteriaDefinitions -> applyUpdateIfCondition(builder, criteriaDefinitions)); - query.getQueryOptions() - .filter(WriteOptions.class::isInstance) - .map(WriteOptions.class::cast) + query.getQueryOptions().filter(WriteOptions.class::isInstance).map(WriteOptions.class::cast) .ifPresent(writeOptions -> builder.apply(statement -> addWriteOptions(statement, writeOptions))); - query.getQueryOptions().ifPresent(options -> - builder.transform(statementBuilder -> QueryOptionsUtil.addQueryOptions(statementBuilder, options))); + query.getQueryOptions().ifPresent( + options -> builder.transform(statementBuilder -> QueryOptionsUtil.addQueryOptions(statementBuilder, options))); return builder; } @@ -442,13 +438,12 @@ public class StatementFactory { StatementBuilder builder = StatementBuilder .of(QueryBuilder.update(tableName).set().where()) .bind((statement, factory) -> ((UpdateWithAssignments) statement).set(toAssignments(object, factory)) - .where(toRelations(where, factory))) + .where(toRelations(where, factory))) .apply(update -> addWriteOptions(update, options)); - Optional.of(options).filter(UpdateOptions.class::isInstance) - .map(UpdateOptions.class::cast) + Optional.of(options).filter(UpdateOptions.class::isInstance).map(UpdateOptions.class::cast) .map(UpdateOptions::getIfCondition) - .ifPresent(criteriaDefinitions -> applyUpdateIfCondition(builder, criteriaDefinitions)); + .ifPresent(criteriaDefinitions -> applyUpdateIfCondition(builder, criteriaDefinitions)); builder.transform(statement -> QueryOptionsUtil.addQueryOptions(statement, options)); @@ -456,8 +451,8 @@ public class StatementFactory { } /** - * Create an {@literal DELETE} statement by mapping {@code id} to {@literal SELECT … WHERE} - * considering {@link UpdateOptions}. + * Create an {@literal DELETE} statement by mapping {@code id} to {@literal SELECT … WHERE} considering + * {@link UpdateOptions}. * * @param id must not be {@literal null}. * @param persistentEntity must not be {@literal null}. @@ -472,7 +467,7 @@ public class StatementFactory { cassandraConverter.write(id, where, persistentEntity); return StatementBuilder.of(QueryBuilder.deleteFrom(tableName).where()) - .bind((statement, factory) -> statement.where(toRelations(where, factory))); + .bind((statement, factory) -> statement.where(toRelations(where, factory))); } /** @@ -511,19 +506,15 @@ public class StatementFactory { StatementBuilder builder = delete(columnNames, tableName, filter); - query.getQueryOptions() - .filter(DeleteOptions.class::isInstance) - .map(DeleteOptions.class::cast) + query.getQueryOptions().filter(DeleteOptions.class::isInstance).map(DeleteOptions.class::cast) .map(DeleteOptions::getIfCondition) .ifPresent(criteriaDefinitions -> applyDeleteIfCondition(builder, criteriaDefinitions)); - query.getQueryOptions() - .filter(WriteOptions.class::isInstance) - .map(WriteOptions.class::cast) + query.getQueryOptions().filter(WriteOptions.class::isInstance).map(WriteOptions.class::cast) .ifPresent(writeOptions -> builder.apply(statement -> addWriteOptions(statement, writeOptions))); - query.getQueryOptions().ifPresent(options -> - builder.transform(statement -> QueryOptionsUtil.addQueryOptions(statement, options))); + query.getQueryOptions() + .ifPresent(options -> builder.transform(statement -> QueryOptionsUtil.addQueryOptions(statement, options))); return builder; } @@ -551,14 +542,10 @@ public class StatementFactory { StatementBuilder builder = StatementBuilder.of(QueryBuilder.deleteFrom(tableName).where()) .bind((statement, factory) -> statement.where(toRelations(where, factory))); - Optional.of(options) - .filter(WriteOptions.class::isInstance) - .map(WriteOptions.class::cast) + Optional.of(options).filter(WriteOptions.class::isInstance).map(WriteOptions.class::cast) .ifPresent(it -> builder.apply(statement -> addWriteOptions(statement, it))); - Optional.of(options) - .filter(DeleteOptions.class::isInstance) - .map(DeleteOptions.class::cast) + Optional.of(options).filter(DeleteOptions.class::isInstance).map(DeleteOptions.class::cast) .map(DeleteOptions::getIfCondition) .ifPresent(criteriaDefinitions -> applyDeleteIfCondition(builder, criteriaDefinitions)); @@ -607,8 +594,7 @@ public class StatementFactory { private StatementBuilder select = createSelectAndOrder(selectors, tableName, filter, sort); @@ -621,11 +607,10 @@ public class StatementFactory { select.apply(Select::allowFiltering); } - select.onBuild(statementBuilder -> - query.getPagingState().ifPresent(statementBuilder::setPagingState)); + select.onBuild(statementBuilder -> query.getPagingState().ifPresent(statementBuilder::setPagingState)); - query.getQueryOptions().ifPresent(it -> - select.transform(statement -> QueryOptionsUtil.addQueryOptions(statement, it))); + query.getQueryOptions() + .ifPresent(it -> select.transform(statement -> QueryOptionsUtil.addQueryOptions(statement, it))); return select; } @@ -641,7 +626,7 @@ public class StatementFactory { List mappedSelectors = selectors.stream() .map(selector -> selector.getAlias().map(it -> getSelection(selector).as(it)) - .orElseGet(() -> getSelection(selector))) + .orElseGet(() -> getSelection(selector))) .collect(Collectors.toList()); select = QueryBuilder.selectFrom(from).selectors(mappedSelectors); @@ -649,16 +634,15 @@ public class StatementFactory { StatementBuilder