DATAMONGO-1502 - Release version 1.9.5 (Hopper SR5).

Deprecated the one taking an int.

.travis.yml

@@ -15,6 +15,7 @@ env:
     - PROFILE=mongo31
     - PROFILE=mongo32
     - PROFILE=mongo33
+    - PROFILE=mongo34-next
 
 # Current MongoDB version is 2.4.2 as of 2016-04, see https://github.com/travis-ci/travis-ci/issues/3694
 # apt-get starts a MongoDB instance so it's not started using before_script

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.9.4.RELEASE</version>
+	<version>1.9.5.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.8.4.RELEASE</version>
+		<version>1.8.5.RELEASE</version>
 	</parent>
 
 	<modules>
@@ -28,7 +28,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.12.4.RELEASE</springdata.commons>
+		<springdata.commons>1.12.5.RELEASE</springdata.commons>
 		<mongo>2.14.3</mongo>
 		<mongo.osgi>2.13.0</mongo.osgi>
 	</properties>
@@ -178,6 +178,22 @@
 
 		</profile>
 
+		<profile>
+
+			<id>mongo34-next</id>
+			<properties>
+				<mongo>3.4.0-SNAPSHOT</mongo>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>mongo-snapshots</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</repository>
+			</repositories>
+
+		</profile>
+
 		<profile>
 			<id>release</id>
 			<build>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.4.RELEASE</version>
+		<version>1.9.5.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.9.4.RELEASE</version>
+			<version>1.9.5.RELEASE</version>
 		</dependency>
 
 		<dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.4.RELEASE</version>
+		<version>1.9.5.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.4.RELEASE</version>
+		<version>1.9.5.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/src/main/java/org/springframework/data/mongodb/log4j/MongoLog4jAppender.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import com.mongodb.WriteConcern;
 
 /**
@@ -37,6 +38,7 @@ import com.mongodb.WriteConcern;
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @auhtor Christoph Strobl
  */
 public class MongoLog4jAppender extends AppenderSkeleton {
 
@@ -58,8 +60,8 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 	protected String collectionPattern = "%c";
 	protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
 	protected String applicationId = System.getProperty("APPLICATION_ID", null);
-	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
-	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
+	protected WriteConcern warnOrHigherWriteConcern = WriteConcern.ACKNOWLEDGED;
+	protected WriteConcern infoOrLowerWriteConcern = WriteConcern.UNACKNOWLEDGED;
 	protected Mongo mongo;
 	protected DB db;
 
@@ -128,7 +130,7 @@ public class MongoLog4jAppender extends AppenderSkeleton {
 	}
 
 	protected void connectToMongo() throws UnknownHostException {
-		this.mongo = new Mongo(host, port);
+		this.mongo = new MongoClient(host, port);
 		this.db = mongo.getDB(database);
 	}
 

spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,37 +22,44 @@ import java.util.Calendar;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 
 /**
  * Integration tests for {@link MongoLog4jAppender}.
  * 
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Christoph Strobl
  */
 public class MongoLog4jAppenderIntegrationTests {
 
 	static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName();
 
 	private static final Logger log = Logger.getLogger(NAME);
-	Mongo mongo;
+	MongoClient mongo;
 	DB db;
 	String collection;
 
 	@Before
 	public void setUp() throws Exception {
 
-		mongo = new Mongo("localhost", 27017);
+		mongo = new MongoClient("localhost", 27017);
 		db = mongo.getDB("logs");
 
 		Calendar now = Calendar.getInstance();
 		collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
-		db.getCollection(collection).drop();
+	}
+
+	@After
+	public void tearDown() {
+		db.getCollection(collection).remove(new BasicDBObject());
 	}
 
 	@Test
@@ -64,7 +71,6 @@ public class MongoLog4jAppenderIntegrationTests {
 		log.error("ERROR message");
 
 		DBCursor msgs = db.getCollection(collection).find();
-
 		assertThat(msgs.count(), is(4));
 	}
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.9.4.RELEASE</version>
+		<version>1.9.5.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -932,7 +932,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			maybeEmitEvent(new BeforeSaveEvent<T>(o, dbDoc, collectionName));
 			dbObjectList.add(dbDoc);
 		}
-		List<ObjectId> ids = insertDBObjectList(collectionName, dbObjectList);
+
+		List<Object> ids = consolidateIdentifiers(insertDBObjectList(collectionName, dbObjectList), dbObjectList);
+
 		int i = 0;
 		for (T obj : batchToSave) {
 			if (i < ids.size()) {
@@ -1037,6 +1039,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		});
 	}
 
+	// TODO: 2.0 - Change method signature to return List<Object> and return all identifiers (DATAMONGO-1513,
+	// DATAMONGO-1519)
 	protected List<ObjectId> insertDBObjectList(final String collectionName, final List<DBObject> dbDocList) {
 		if (dbDocList.isEmpty()) {
 			return Collections.emptyList();
@@ -2115,6 +2119,28 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		return resolved == null ? ex : resolved;
 	}
 
+	/**
+	 * Returns all identifiers for the given documents. Will augment the given identifiers and fill in only the ones that
+	 * are {@literal null} currently. This would've been better solved in {@link #insertDBObjectList(String, List)}
+	 * directly but would require a signature change of that method.
+	 * 
+	 * @param ids
+	 * @param documents
+	 * @return TODO: Remove for 2.0 and change method signature of {@link #insertDBObjectList(String, List)}.
+	 */
+	private static List<Object> consolidateIdentifiers(List<ObjectId> ids, List<DBObject> documents) {
+
+		List<Object> result = new ArrayList<Object>(ids.size());
+
+		for (int i = 0; i < ids.size(); i++) {
+
+			ObjectId objectId = ids.get(i);
+			result.add(objectId == null ? documents.get(i).get(ID_FIELD) : objectId);
+		}
+
+		return result;
+	}
+
 	// Callback implementations
 
 	/**
@@ -2168,7 +2194,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		}
 
 		public FindCallback(DBObject query, DBObject fields) {
-			this.query = query;
+			this.query = query == null ? new BasicDBObject() : query;
 			this.fields = fields;
 		}
 

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

@@ -248,11 +248,22 @@ public class Aggregation {
 	 *
 	 * @param elementsToSkip must not be less than zero.
 	 * @return
+	 * @deprecated prepare to get this one removed in favor of {@link #skip(long)}.
 	 */
 	public static SkipOperation skip(int elementsToSkip) {
 		return new SkipOperation(elementsToSkip);
 	}
 
+	/**
+	 * Creates a new {@link SkipOperation} skipping the given number of elements.
+	 *
+	 * @param elementsToSkip must not be less than zero.
+	 * @return
+	 */
+	public static SkipOperation skip(long elementsToSkip) {
+		return new SkipOperation(elementsToSkip);
+	}
+
 	/**
 	 * Creates a new {@link LimitOperation} limiting the result to the given number of elements.
 	 *

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class SkipOperation implements AggregationOperation {
 	/**
 	 * Creates a new {@link SkipOperation} skipping the given number of elements.
 	 * 
-	 * @param skipCount number of documents to skip.
+	 * @param skipCount number of documents to skip, must not be less than zero.
 	 */
 	public SkipOperation(long skipCount) {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ import com.mongodb.gridfs.GridFSInputFile;
  * @author Philipp Schneider
  * @author Thomas Darimont
  * @author Martin Baumgartner
+ * @author Christoph Strobl
  */
 public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver {
 
@@ -182,7 +183,7 @@ public class GridFsTemplate implements GridFsOperations, ResourcePatternResolver
 	public List<GridFSDBFile> find(Query query) {
 
 		if (query == null) {
-			return getGridFs().find((DBObject) null);
+			return getGridFs().find(new BasicDBObject());
 		}
 
 		DBObject queryObject = getMappedQuery(query.getQueryObject());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -110,7 +112,7 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 
 		try {
 
-			BasicQuery result = new BasicQuery(query.getQueryObject().toString(), fieldSpec);
+			BasicQuery result = new BasicQuery(query.getQueryObject(), (DBObject) JSON.parse(fieldSpec));
 			result.setSortObject(query.getSortObject());
 
 			return result;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import com.querydsl.mongodb.AbstractMongodbQuery;
  * 
  * @author Oliver Gierke
  */
-class SpringDataMongodbQuery<T> extends AbstractMongodbQuery<T, SpringDataMongodbQuery<T>> {
+public class SpringDataMongodbQuery<T> extends AbstractMongodbQuery<T, SpringDataMongodbQuery<T>> {
 
 	private final MongoOperations operations;
 

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

@@ -33,6 +33,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.bson.types.ObjectId;
 import org.joda.time.DateTime;
@@ -43,6 +44,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -70,11 +72,14 @@ import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
+import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ObjectUtils;
@@ -114,6 +119,7 @@ public class MongoTemplateTests {
 
 	@Autowired MongoTemplate template;
 	@Autowired MongoDbFactory factory;
+	@Autowired ConfigurableApplicationContext context;
 
 	MongoTemplate mappingTemplate;
 	org.springframework.data.util.Version mongoVersion;
@@ -3164,6 +3170,28 @@ public class MongoTemplateTests {
 		assertThat(template.findOne(query(where("id").is(wgj.id)), WithGeoJson.class).point, is(equalTo(wgj.point)));
 	}
 
+	/**
+	 * @see DATAMONGO-1513
+	 */
+	@Test
+	@DirtiesContext
+	public void populatesIdsAddedByEventListener() {
+
+		context.addApplicationListener(new AbstractMongoEventListener<Document>() {
+
+			@Override
+			public void onBeforeSave(BeforeSaveEvent<Document> event) {
+				event.getDBObject().put("_id", UUID.randomUUID().toString());
+			}
+		});
+
+		Document document = new Document();
+
+		template.insertAll(Arrays.asList(document));
+
+		assertThat(document.id, is(notNullValue()));
+	}
+
 	static class DoucmentWithNamedIdField {
 
 		@Id String someIdKey;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ public class PerformanceTests {
 	private static final int ITERATIONS = 50;
 	private static final StopWatch watch = new StopWatch();
 	private static final Collection<String> IGNORED_WRITE_CONCERNS = Arrays.asList("MAJORITY", "REPLICAS_SAFE",
-			"FSYNC_SAFE", "FSYNCED", "JOURNAL_SAFE", "JOURNALED", "REPLICA_ACKNOWLEDGED");
+			"FSYNC_SAFE", "FSYNCED", "JOURNAL_SAFE", "JOURNALED", "REPLICA_ACKNOWLEDGED", "W2", "W3");
 	private static final int COLLECTION_SIZE = 1024 * 1024 * 256; // 256 MB
 	private static final Collection<String> COLLECTION_NAMES = Arrays.asList("template", "driver", "person");
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.IsTextQuery.*;
 
 import java.lang.reflect.Method;
+import java.util.List;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -40,6 +41,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
@@ -192,6 +194,18 @@ public class PartTreeMongoQueryUnitTests {
 		assertThat(fields.get("age"), is((Object) 1));
 	}
 
+	/**
+	 * @see DATAMONGO-1500
+	 */
+	@Test
+	public void shouldLeaveParameterConversionToQueryMapper() {
+
+		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findBySex", Sex.FEMALE);
+
+		assertThat(query.getQueryObject().get("sex"), is((Object) Sex.FEMALE));
+		assertThat(query.getFieldsObject().get("firstname"), is((Object) 1));
+	}
+
 	private org.springframework.data.mongodb.core.query.Query deriveQueryFromMethod(String method, Object... args) {
 
 		Class<?>[] types = new Class<?>[args.length];
@@ -249,6 +263,9 @@ public class PartTreeMongoQueryUnitTests {
 		PersonDto findPersonDtoByAge(Integer age);
 
 		<T> T findDynamicallyProjectedBy(Class<T> type);
+
+		@Query(fields = "{ 'firstname' : 1 }")
+		List<Person> findBySex(Sex sex);
 	}
 
 	interface PersonProjection {

src/main/resources/changelog.txt

@@ -1,6 +1,16 @@
 Spring Data MongoDB Changelog
 =============================
 
+Changes in version 1.9.5.RELEASE (2016-11-03)
+---------------------------------------------
+* DATAMONGO-1521 - Aggregation.skip(...) expects int but new SkipOperation(...) supports long.
+* DATAMONGO-1514 - SpringDataMongodbQuery should be public.
+* DATAMONGO-1513 - Non-ObjectId identifiers generated by event listeners are not populated if documents are inserted as batch.
+* DATAMONGO-1504 - Assert compatibility with MongoDB 3.4 server and driver.
+* DATAMONGO-1502 - Release 1.9.5 (Hopper SR5).
+* DATAMONGO-1500 - RuntimeException for query methods with fields declaration and Pageable parameters.
+
+
 Changes in version 1.9.4.RELEASE (2016-09-29)
 ---------------------------------------------
 * DATAMONGO-1498 - MongoMappingContext doesn't know about types usually auto-detected (JodaTime, JDK 8 date time types).

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data MongoDB 1.9.4
+Spring Data MongoDB 1.9.5
 Copyright (c) [2010-2015] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").