Skip to content

Commit a94ea17

Browse files
mp911demp911de
committed
Polishing.
Reformat code. Remove unused fields, modifiers and documentation artifacts. See #4088 Original pull request: #4341
1 parent 3b99fa0 commit a94ea17

File tree

4 files changed

+20
-69
lines changed

4 files changed

+20
-69
lines changed

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java

-2
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,13 @@ public Object execute(Query query) {
293293
final class UpdateExecution implements MongoQueryExecution {
294294

295295
private final ExecutableUpdate<?> updateOps;
296-
private final MongoQueryMethod method;
297296
private Supplier<UpdateDefinition> updateDefinitionSupplier;
298297
private final MongoParameterAccessor accessor;
299298

300299
UpdateExecution(ExecutableUpdate<?> updateOps, MongoQueryMethod method, Supplier<UpdateDefinition> updateSupplier,
301300
MongoParameterAccessor accessor) {
302301

303302
this.updateOps = updateOps;
304-
this.method = method;
305303
this.updateDefinitionSupplier = updateSupplier;
306304
this.accessor = accessor;
307305
}

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ interface ReactiveMongoQueryExecution {
6161
*
6262
* @author Mark Paluch
6363
*/
64-
class GeoNearExecution implements ReactiveMongoQueryExecution {
64+
final class GeoNearExecution implements ReactiveMongoQueryExecution {
6565

6666
private final ReactiveMongoOperations operations;
6767
private final MongoParameterAccessor accessor;
@@ -83,7 +83,7 @@ public Publisher<? extends Object> execute(Query query, Class<?> type, String co
8383
}
8484

8585
@SuppressWarnings({ "unchecked", "rawtypes" })
86-
protected Flux<GeoResult<Object>> doExecuteQuery(@Nullable Query query, Class<?> type, String collection) {
86+
private Flux<GeoResult<Object>> doExecuteQuery(@Nullable Query query, Class<?> type, String collection) {
8787

8888
Point nearLocation = accessor.getGeoNearLocation();
8989
NearQuery nearQuery = NearQuery.near(nearLocation);
@@ -154,15 +154,13 @@ public Publisher<? extends Object> execute(Query query, Class<?> type, String co
154154
final class UpdateExecution implements ReactiveMongoQueryExecution {
155155

156156
private final ReactiveUpdate<?> updateOps;
157-
private final MongoQueryMethod method;
158157
private final MongoParameterAccessor accessor;
159158
private Mono<UpdateDefinition> update;
160159

161160
UpdateExecution(ReactiveUpdate<?> updateOps, ReactiveMongoQueryMethod method, MongoParameterAccessor accessor,
162161
Mono<UpdateDefinition> update) {
163162

164163
this.updateOps = updateOps;
165-
this.method = method;
166164
this.accessor = accessor;
167165
this.update = update;
168166
}

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java

+12-29
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.data.mongodb.repository.query;
1717

18-
import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
19-
import org.springframework.data.util.ReflectionUtils;
2018
import reactor.core.publisher.Flux;
2119
import reactor.core.publisher.Mono;
2220

@@ -28,12 +26,15 @@
2826
import org.springframework.data.mongodb.core.aggregation.Aggregation;
2927
import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
3028
import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
29+
import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
3130
import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
3231
import org.springframework.data.mongodb.core.convert.MongoConverter;
3332
import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
3433
import org.springframework.data.mongodb.core.query.Query;
3534
import org.springframework.data.repository.query.ReactiveQueryMethodEvaluationContextProvider;
3635
import org.springframework.data.repository.query.ResultProcessor;
36+
import org.springframework.data.util.ReflectionUtils;
37+
import org.springframework.data.util.TypeInformation;
3738
import org.springframework.expression.ExpressionParser;
3839
import org.springframework.util.ClassUtils;
3940

@@ -70,10 +71,6 @@ public ReactiveStringBasedAggregation(ReactiveMongoQueryMethod method,
7071
this.evaluationContextProvider = evaluationContextProvider;
7172
}
7273

73-
/*
74-
* (non-Javascript)
75-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#doExecute(org.springframework.data.mongodb.repository.query.ReactiveMongoQueryMethod, org.springframework.data.repository.query.ResultProcessor, org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, java.lang.Class)
76-
*/
7774
@Override
7875
protected Publisher<Object> doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
7976
ConvertingParameterAccessor accessor, Class<?> typeToRead) {
@@ -99,7 +96,7 @@ protected Publisher<Object> doExecute(ReactiveMongoQueryMethod method, ResultPro
9996
TypedAggregation<?> aggregation = new TypedAggregation<>(sourceType, pipeline.getOperations(), options);
10097

10198
Flux<?> flux = reactiveMongoOperations.aggregate(aggregation, targetType);
102-
if(ReflectionUtils.isVoid(typeToRead)) {
99+
if (ReflectionUtils.isVoid(typeToRead)) {
103100
return flux.then();
104101
}
105102

@@ -126,61 +123,47 @@ private Mono<List<AggregationOperation>> computePipeline(ConvertingParameterAcce
126123
return parseAggregationPipeline(getQueryMethod().getAnnotatedAggregation(), accessor);
127124
}
128125

129-
private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor, AggregationPipeline pipeline) {
126+
private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor,
127+
AggregationPipeline pipeline) {
130128

131129
AggregationOptions.Builder builder = Aggregation.newAggregationOptions();
132130

133131
AggregationUtils.applyCollation(builder, method.getAnnotatedCollation(), accessor, method.getParameters(),
134132
expressionParser, evaluationContextProvider);
135133
AggregationUtils.applyMeta(builder, method);
136134
AggregationUtils.applyHint(builder, method);
137-
if(ReflectionUtils.isVoid(method.getReturnType().getComponentType().getType()) && pipeline.isOutOrMerge()) {
135+
136+
TypeInformation<?> returnType = method.getReturnType();
137+
if (returnType.getComponentType() != null) {
138+
returnType = returnType.getRequiredComponentType();
139+
}
140+
if (ReflectionUtils.isVoid(returnType.getType()) && pipeline.isOutOrMerge()) {
138141
builder.skipOutput();
139142
}
140143

141144
return builder.build();
142145
}
143146

144-
/*
145-
* (non-Javascript)
146-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
147-
*/
148147
@Override
149148
protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
150149
throw new UnsupportedOperationException("No query support for aggregation");
151150
}
152151

153-
/*
154-
* (non-Javascript)
155-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery()
156-
*/
157152
@Override
158153
protected boolean isCountQuery() {
159154
return false;
160155
}
161156

162-
/*
163-
* (non-Javascript)
164-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery()
165-
*/
166157
@Override
167158
protected boolean isExistsQuery() {
168159
return false;
169160
}
170161

171-
/*
172-
* (non-Javascript)
173-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery()
174-
*/
175162
@Override
176163
protected boolean isDeleteQuery() {
177164
return false;
178165
}
179166

180-
/*
181-
* (non-Javascript)
182-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting()
183-
*/
184167
@Override
185168
protected boolean isLimiting() {
186169
return false;

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java

+6-34
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@
2121
import java.util.stream.Stream;
2222

2323
import org.bson.Document;
24-
2524
import org.springframework.data.domain.Pageable;
2625
import org.springframework.data.domain.SliceImpl;
2726
import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
2827
import org.springframework.data.mongodb.core.MongoOperations;
2928
import org.springframework.data.mongodb.core.aggregation.Aggregation;
30-
import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
3129
import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
3230
import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
33-
import org.springframework.data.mongodb.core.aggregation.AggregationOptions.Builder;
3431
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
3532
import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
3633
import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -42,8 +39,6 @@
4239
import org.springframework.expression.ExpressionParser;
4340
import org.springframework.lang.Nullable;
4441
import org.springframework.util.ClassUtils;
45-
import org.springframework.util.CollectionUtils;
46-
import org.springframework.util.ObjectUtils;
4742

4843
/**
4944
* {@link AbstractMongoQuery} implementation to run string-based aggregations using
@@ -66,8 +61,8 @@ public class StringBasedAggregation extends AbstractMongoQuery {
6661
*
6762
* @param method must not be {@literal null}.
6863
* @param mongoOperations must not be {@literal null}.
69-
* @param expressionParser
70-
* @param evaluationContextProvider
64+
* @param expressionParser must not be {@literal null}.
65+
* @param evaluationContextProvider must not be {@literal null}.
7166
*/
7267
public StringBasedAggregation(MongoQueryMethod method, MongoOperations mongoOperations,
7368
ExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
@@ -85,10 +80,6 @@ public StringBasedAggregation(MongoQueryMethod method, MongoOperations mongoOper
8580
this.evaluationContextProvider = evaluationContextProvider;
8681
}
8782

88-
/*
89-
* (non-Javascript)
90-
* @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#doExecute(org.springframework.data.mongodb.repository.query.MongoQueryMethod, org.springframework.data.repository.query.ResultProcessor, org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, java.lang.Class)
91-
*/
9283
@Override
9384
@Nullable
9485
protected Object doExecute(MongoQueryMethod method, ResultProcessor resultProcessor,
@@ -133,7 +124,7 @@ protected Object doExecute(MongoQueryMethod method, ResultProcessor resultProces
133124
}
134125

135126
AggregationResults<Object> result = (AggregationResults<Object>) mongoOperations.aggregate(aggregation, targetType);
136-
if(ReflectionUtils.isVoid(typeToRead)) {
127+
if (ReflectionUtils.isVoid(typeToRead)) {
137128
return null;
138129
}
139130

@@ -181,7 +172,8 @@ AggregationPipeline computePipeline(MongoQueryMethod method, ConvertingParameter
181172
return new AggregationPipeline(parseAggregationPipeline(method.getAnnotatedAggregation(), accessor));
182173
}
183174

184-
private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor, AggregationPipeline pipeline) {
175+
private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor,
176+
AggregationPipeline pipeline) {
185177

186178
AggregationOptions.Builder builder = Aggregation.newAggregationOptions();
187179

@@ -190,53 +182,33 @@ private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingPar
190182
AggregationUtils.applyMeta(builder, method);
191183
AggregationUtils.applyHint(builder, method);
192184

193-
if(ReflectionUtils.isVoid(method.getReturnType().getType()) && pipeline.isOutOrMerge()) {
185+
if (ReflectionUtils.isVoid(method.getReturnType().getType()) && pipeline.isOutOrMerge()) {
194186
builder.skipOutput();
195187
}
196188

197189
return builder.build();
198190
}
199191

200-
/*
201-
* (non-Javascript)
202-
* @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
203-
*/
204192
@Override
205193
protected Query createQuery(ConvertingParameterAccessor accessor) {
206194
throw new UnsupportedOperationException("No query support for aggregation");
207195
}
208196

209-
/*
210-
* (non-Javascript)
211-
* @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery()
212-
*/
213197
@Override
214198
protected boolean isCountQuery() {
215199
return false;
216200
}
217201

218-
/*
219-
* (non-Javascript)
220-
* @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery()
221-
*/
222202
@Override
223203
protected boolean isExistsQuery() {
224204
return false;
225205
}
226206

227-
/*
228-
* (non-Javascript)
229-
* @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
230-
*/
231207
@Override
232208
protected boolean isDeleteQuery() {
233209
return false;
234210
}
235211

236-
/*
237-
* (non-Javascript)
238-
* @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting()
239-
*/
240212
@Override
241213
protected boolean isLimiting() {
242214
return false;

0 commit comments

Comments
 (0)