DATAMONGO-1609 - Adapt to API changes in Spring Data Commons.

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java

@@ -53,8 +53,8 @@ public AuditingEventListener(ObjectFactory<IsNewAwareAuditingHandler> auditingHa
 	 */
 	public void onApplicationEvent(BeforeConvertEvent<Object> event) {
 
-		Object entity = event.getSource();
-		auditingHandlerFactory.getObject().markAudited(Optional.ofNullable(entity));
+		Optional.ofNullable(event.getSource())//
+				.ifPresent(it -> auditingHandlerFactory.getObject().markAudited(it));
 	}
 
 	/* 

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

@@ -25,7 +25,6 @@
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 
 /**
  * Builder class to build near-queries.
@@ -151,7 +150,7 @@ public NearQuery skip(long skip) {
 	public NearQuery with(Pageable pageable) {
 
 		Assert.notNull(pageable, "Pageable must not be 'null'.");
-		if(!ObjectUtils.nullSafeEquals(Pageable.NONE, pageable)) {
+		if (pageable.isPaged()) {
 			this.num = pageable.getOffset() + pageable.getPageSize();
 			this.skip = pageable.getOffset();
 		}

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

@@ -152,7 +152,7 @@ public Query withHint(String name) {
 	 */
 	public Query with(Pageable pageable) {
 
-		if (pageable == null || ObjectUtils.nullSafeEquals(Pageable.NONE, pageable)) {
+		if (pageable.isUnpaged()) {
 			return this;
 		}
 

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Optional;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -87,7 +85,7 @@ public Object execute(Object[] parameters) {
 
 		applyQueryMetaAttributesWhenPresent(query);
 
-		ResultProcessor processor = method.getResultProcessor().withDynamicProjection(Optional.of(accessor));
+		ResultProcessor processor = method.getResultProcessor().withDynamicProjection(accessor);
 		String collection = method.getEntityInformation().getCollectionName();
 
 		MongoQueryExecution execution = getExecution(query, accessor,

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Optional;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -104,7 +102,7 @@ private Object execute(MongoParameterAccessor parameterAccessor) {
 
 		applyQueryMetaAttributesWhenPresent(query);
 
-		ResultProcessor processor = method.getResultProcessor().withDynamicProjection(Optional.of(parameterAccessor));
+		ResultProcessor processor = method.getResultProcessor().withDynamicProjection(parameterAccessor);
 		String collection = method.getEntityInformation().getCollectionName();
 
 		ReactiveMongoQueryExecution execution = getExecution(query, parameterAccessor,

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

@@ -15,11 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Optional;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
 import org.bson.Document;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -36,6 +31,8 @@
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.util.JSON;
 import com.mongodb.util.JSONParseException;
 
 /**
@@ -101,7 +98,7 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 
 		if (!StringUtils.hasText(fieldSpec)) {
 
-			ReturnedType returnedType = processor.withDynamicProjection(Optional.of(accessor)).getReturnedType();
+			ReturnedType returnedType = processor.withDynamicProjection(accessor).getReturnedType();
 
 			if (returnedType.isProjecting()) {
 

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Optional;
-
 import org.bson.Document;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -96,7 +94,7 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 
 		if (!StringUtils.hasText(fieldSpec)) {
 
-			ReturnedType returnedType = processor.withDynamicProjection(Optional.of(accessor)).getReturnedType();
+			ReturnedType returnedType = processor.withDynamicProjection(accessor).getReturnedType();
 
 			if (returnedType.isProjecting()) {
 				returnedType.getInputProperties().forEach(query.fields()::include);

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

@@ -17,19 +17,16 @@
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Optional;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.core.Ordered;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
@@ -57,16 +54,10 @@ public void setUp() {
 		mappingContext.getPersistentEntity(Sample.class);
 
 		handler = spy(new IsNewAwareAuditingHandler(new PersistentEntities(Arrays.asList(mappingContext))));
-		doNothing().when(handler).markCreated(Mockito.any(Optional.class));
-		doNothing().when(handler).markModified(Mockito.any(Optional.class));
+		doNothing().when(handler).markCreated(any());
+		doNothing().when(handler).markModified(any());
 
-		listener = new AuditingEventListener(new ObjectFactory<IsNewAwareAuditingHandler>() {
-
-			@Override
-			public IsNewAwareAuditingHandler getObject() throws BeansException {
-				return handler;
-			}
-		});
+		listener = new AuditingEventListener(() -> handler);
 	}
 
 	@Test(expected = IllegalArgumentException.class) // DATAMONGO-577
@@ -80,8 +71,8 @@ public void triggersCreationMarkForObjectWithEmptyId() {
 		Sample sample = new Sample();
 		listener.onApplicationEvent(new BeforeConvertEvent<Object>(sample, "collection-1"));
 
-		verify(handler, times(1)).markCreated(Optional.of(sample));
-		verify(handler, times(0)).markModified(Mockito.any(Optional.class));
+		verify(handler, times(1)).markCreated(sample);
+		verify(handler, times(0)).markModified(any());
 	}
 
 	@Test // DATAMONGO-577
@@ -91,8 +82,8 @@ public void triggersModificationMarkForObjectWithSetId() {
 		sample.id = "id";
 		listener.onApplicationEvent(new BeforeConvertEvent<Object>(sample, "collection-1"));
 
-		verify(handler, times(0)).markCreated(Mockito.any(Optional.class));
-		verify(handler, times(1)).markModified(Optional.of(sample));
+		verify(handler, times(0)).markCreated(any());
+		verify(handler, times(1)).markModified(sample);
 	}
 
 	@Test