DATAMONGO-1823 - Emit ApplicationEvents using projecting find methods.

We now again emit application events when using finder methods that apply projection.

Original pull request: spring-projects#517.

Author: christophstrobl

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

@@ -2813,10 +2813,15 @@ public T doWith(@Nullable Document object) {
 
 			Class<?> typeToRead = targetType.isInterface() || targetType.isAssignableFrom(entityType) ? entityType
 					: targetType;
+
+			if (null != object) {
+				maybeEmitEvent(new AfterLoadEvent<T>(object, targetType, collectionName));
+			}
+
 			Object source = reader.read(typeToRead, object);
 			Object result = targetType.isInterface() ? projectionFactory.createProjection(targetType, source) : source;
 
-			if (result == null) {
+			if (result != null) {
 				maybeEmitEvent(new AfterConvertEvent<>(object, result, collectionName));
 			}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java

@@ -19,10 +19,12 @@
 import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsEqual.*;
 import static org.junit.Assert.*;
-import static org.springframework.data.mongodb.core.DocumentTestUtils.assertTypeHint;
+import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
+import lombok.Data;
+
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -46,8 +48,6 @@
 import com.mongodb.MongoClient;
 import com.mongodb.WriteConcern;
 
-import lombok.Data;
-
 /**
  * Integration test for Mapping Events.
  * 
@@ -390,6 +390,24 @@ public void publishesAfterLoadAndAfterConvertEventsForLazyLoadingMapOfDBRef() th
 				is(equalTo(RELATED_COLLECTION_NAME)));
 	}
 
+	@Test // DATAMONGO-1823
+	public void publishesAfterConvertEventForFindQueriesUsingProjections() {
+
+		PersonPojoStringId entity = new PersonPojoStringId("1", "Text");
+		template.insert(entity);
+
+		template.query(PersonPojoStringId.class).matching(query(where("id").is(entity.getId()))).all();
+
+		assertThat(simpleMappingEventListener.onAfterLoadEvents.size(), is(1));
+		assertThat(simpleMappingEventListener.onAfterLoadEvents.get(0).getCollectionName(), is(COLLECTION_NAME));
+
+		assertThat(simpleMappingEventListener.onBeforeConvertEvents.size(), is(1));
+		assertThat(simpleMappingEventListener.onBeforeConvertEvents.get(0).getCollectionName(), is(COLLECTION_NAME));
+
+		assertThat(simpleMappingEventListener.onAfterConvertEvents.size(), is(1));
+		assertThat(simpleMappingEventListener.onAfterConvertEvents.get(0).getCollectionName(), is(COLLECTION_NAME));
+	}
+
 	private void comparePersonAndDocument(PersonPojoStringId p, PersonPojoStringId p2, org.bson.Document document) {
 
 		assertEquals(p.getId(), p2.getId());