DATAMONGO-2267 - Fix eager collection resolution in Object path.

We now lazily read the collection of an entity as it potentially requires a more expensive SpEL evaluation that might not have been required in fist place.

Original pull request: #746.

Author: christophstrobl

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

@@ -17,8 +17,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.util.Lazy;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -46,14 +48,14 @@ class ObjectPath {
 	private final @Nullable ObjectPath parent;
 	private final @Nullable Object object;
 	private final @Nullable Object idValue;
-	private final String collection;
+	private final Lazy<String> collection;
 
 	private ObjectPath() {
 
 		this.parent = null;
 		this.object = null;
 		this.idValue = null;
-		this.collection = "";
+		this.collection = Lazy.empty();
 	}
 
 	/**
@@ -64,7 +66,7 @@ private ObjectPath() {
 	 * @param idValue
 	 * @param collection
 	 */
-	private ObjectPath(ObjectPath parent, Object object, @Nullable Object idValue, String collection) {
+	private ObjectPath(ObjectPath parent, Object object, @Nullable Object idValue, Lazy<String> collection) {
 
 		this.parent = parent;
 		this.object = object;
@@ -85,7 +87,7 @@ ObjectPath push(Object object, MongoPersistentEntity<?> entity, @Nullable Object
 		Assert.notNull(object, "Object must not be null!");
 		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
 
-		return new ObjectPath(this, object, id, entity.getCollection());
+		return new ObjectPath(this, object, id, Lazy.of(() -> entity.getCollection()));
 	}
 
 	/**
@@ -175,7 +177,7 @@ private Object getIdValue() {
 	}
 
 	private String getCollection() {
-		return collection;
+		return collection.get();
 	}
 
 	/*

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

@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -81,6 +82,19 @@ public void getPathItemShouldReturnNullWhenIdAndCollectionMatchAndAssignableToIn
 		assertThat(path.getPathItem("id-1", "one", ValueInterface.class)).isNotNull();
 	}
 
+	@Test // DATAMONGO-2267
+	public void collectionLookupShouldBeLazy/* because we may need to resolve SpEL which can be pretty expensive */() {
+
+		MongoPersistentEntity<EntityOne> spied = spy(one);
+		ObjectPath path = ObjectPath.ROOT.push(new EntityThree(), spied, "id-1");
+
+		verify(spied, never()).getCollection();
+
+		path.getPathItem("id-1", "foo", EntityTwo.class);
+
+		verify(spied).getCollection();
+	}
+
 	@Document("one")
 	static class EntityOne {