Browse Source

Polishing.

Reformat code.

See #3842
Original pull request: #3844.
pull/3856/head
Mark Paluch 4 years ago
parent
commit
c350be1f52
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 4
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java
  2. 18
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegateUnitTests.java

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java

@ -127,7 +127,7 @@ public final class ReferenceLookupDelegate { @@ -127,7 +127,7 @@ public final class ReferenceLookupDelegate {
// Use the first value as a reference for others in case of collection like
if (value instanceof Iterable) {
Iterator iterator = ((Iterable) value).iterator();
Iterator<?> iterator = ((Iterable<?>) value).iterator();
value = iterator.hasNext() ? iterator.next() : new Document();
}
@ -198,7 +198,7 @@ public final class ReferenceLookupDelegate { @@ -198,7 +198,7 @@ public final class ReferenceLookupDelegate {
return (T) codec.decode(value, bindingContext);
}
if(!value.startsWith("#") && ExpressionUtils.detectExpression(value) == null) {
if (!value.startsWith("#") && ExpressionUtils.detectExpression(value) == null) {
return (T) value;
}

18
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegateUnitTests.java

@ -18,22 +18,17 @@ package org.springframework.data.mongodb.core.convert; @@ -18,22 +18,17 @@ package org.springframework.data.mongodb.core.convert;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
import java.util.Collections;
import org.assertj.core.api.Assertions;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.model.SpELContext;
import org.springframework.data.mongodb.core.convert.ReferenceLoader.DocumentReferenceQuery;
import org.springframework.data.mongodb.core.convert.ReferenceLookupDelegate.LookupFunction;
import org.springframework.data.mongodb.core.convert.ReferenceResolver.MongoEntityReader;
import org.springframework.data.mongodb.core.convert.ReferenceResolver.ReferenceCollection;
import org.springframework.data.mongodb.core.mapping.DocumentReference;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@ -41,6 +36,8 @@ import org.springframework.expression.EvaluationContext; @@ -41,6 +36,8 @@ import org.springframework.expression.EvaluationContext;
import org.springframework.expression.spel.standard.SpelExpressionParser;
/**
* Unit tests for {@link ReferenceLookupDelegate}.
*
* @author Christoph Strobl
*/
@ExtendWith(MockitoExtension.class)
@ -73,13 +70,10 @@ class ReferenceLookupDelegateUnitTests { @@ -73,13 +70,10 @@ class ReferenceLookupDelegateUnitTests {
when(property.getDocumentReference()).thenReturn(documentReference);
when(documentReference.collection()).thenReturn("collection1");
lookupDelegate.readReference(property, Arrays.asList("one"), new LookupFunction() {
@Override
public Iterable<Document> apply(DocumentReferenceQuery referenceQuery, ReferenceCollection referenceCollection) {
lookupDelegate.readReference(property, Collections.singletonList("one"), (referenceQuery, referenceCollection) -> {
assertThat(referenceCollection.getCollection()).isEqualTo("collection1");
return Collections.emptyList();
}
assertThat(referenceCollection.getCollection()).isEqualTo("collection1");
return Collections.emptyList();
}, entityReader);
}
}

Loading…
Cancel
Save