DATAMONGO-1816 - Release version 2.0.2 (Kay SR2).

Move overlapping/duplicate documentation into one place.

Original Pull Request: #512

README.md

@@ -83,7 +83,7 @@ You can have Spring automatically create a proxy for the interface by using the
 class ApplicationConfig extends AbstractMongoConfiguration {
 
   @Override
-  public MongoClient mongoClient() throws Exception {
+  public Mongo mongo() throws Exception {
     return new MongoClient();
   }
 

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.1.0.M1</version>
+	<version>2.0.2.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>2.1.0.M1</version>
+		<version>2.0.2.RELEASE</version>
 	</parent>
 
 	<modules>
@@ -27,9 +27,9 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.1.0.M1</springdata.commons>
+		<springdata.commons>2.0.2.RELEASE</springdata.commons>
-		<mongo>3.6.2</mongo>
+		<mongo>3.5.0</mongo>
-		<mongo.reactivestreams>1.7.0</mongo.reactivestreams>
+		<mongo.reactivestreams>1.6.0</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>
 
@@ -183,8 +183,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
+			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-milestone</url>
+			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 
@@ -193,11 +193,6 @@
 			<id>spring-plugins-release</id>
 			<url>https://repo.spring.io/plugins-release</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
-		</pluginRepository>
-
 	</pluginRepositories>
 
 </project>

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.1.0.M1</version>
+		<version>2.0.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.1.0.M1</version>
+		<version>2.0.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>2.1.0.M1</version>
+			<version>2.0.2.RELEASE</version>
 		</dependency>
 
 		<!-- reactive -->

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2013 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.

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011 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.

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011 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.

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011 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.

spring-data-mongodb-distribution/pom.xml

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

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.1.0.M1</version>
+		<version>2.0.2.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -19,7 +19,6 @@
 		<objenesis>1.3</objenesis>
 		<equalsverifier>1.7.8</equalsverifier>
 		<java-module-name>spring.data.mongodb</java-module-name>
-		<multithreadedtc>1.01</multithreadedtc>
 	</properties>
 
 	<dependencies>
@@ -246,13 +245,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>edu.umd.cs.mtc</groupId>
-			<artifactId>multithreadedtc</artifactId>
-			<version>${multithreadedtc}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Kotlin extension -->
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BulkOperationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CodecRegistryProvider.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2018 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb;
-
-import java.util.Optional;
-
-import org.bson.codecs.Codec;
-import org.bson.codecs.configuration.CodecConfigurationException;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.springframework.util.Assert;
-
-/**
- * Provider interface to obtain {@link CodecRegistry} from the underlying MongoDB Java driver.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.1
- */
-@FunctionalInterface
-public interface CodecRegistryProvider {
-
-	/**
-	 * Get the underlying {@link CodecRegistry} used by the MongoDB Java driver.
-	 *
-	 * @return never {@literal null}.
-	 * @throws IllegalStateException if {@link CodecRegistry} cannot be obtained.
-	 */
-	CodecRegistry getCodecRegistry();
-
-	/**
-	 * Checks if a {@link Codec} is registered for a given type.
-	 *
-	 * @param type must not be {@literal null}.
-	 * @return true if {@link #getCodecRegistry()} holds a {@link Codec} for given type.
-	 * @throws IllegalStateException if {@link CodecRegistry} cannot be obtained.
-	 */
-	default boolean hasCodecFor(Class<?> type) {
-		return getCodecFor(type).isPresent();
-	}
-
-	/**
-	 * Get the {@link Codec} registered for the given {@literal type} or an {@link Optional#empty() empty Optional}
-	 * instead.
-	 *
-	 * @param type must not be {@literal null}.
-	 * @param <T>
-	 * @return never {@literal null}.
-	 * @throws IllegalArgumentException if {@literal type} is {@literal null}.
-	 */
-	default <T> Optional<Codec<T>> getCodecFor(Class<T> type) {
-
-		Assert.notNull(type, "Type must not be null!");
-
-		try {
-			return Optional.of(getCodecRegistry().get(type));
-		} catch (CodecConfigurationException e) {
-			// ignore
-		}
-		return Optional.empty();
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2011 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/LazyLoadingException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2013 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,7 +15,6 @@
  */
 package org.springframework.data.mongodb;
 
-import org.bson.codecs.configuration.CodecRegistry;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
@@ -28,9 +27,8 @@ import com.mongodb.client.MongoDatabase;
  * 
  * @author Mark Pollack
  * @author Thomas Darimont
- * @author Christoph Strobl
  */
-public interface MongoDbFactory extends CodecRegistryProvider {
+public interface MongoDbFactory {
 
 	/**
 	 * Creates a default {@link DB} instance.
@@ -57,14 +55,4 @@ public interface MongoDbFactory extends CodecRegistryProvider {
 	PersistenceExceptionTranslator getExceptionTranslator();
 
 	DB getLegacyDb();
-
-	/**
-	 * Get the underlying {@link CodecRegistry} used by the MongoDB Java driver.
-	 *
-	 * @return never {@literal null}.
-	 */
-	@Override
-	default CodecRegistry getCodecRegistry() {
-		return getDb().getCodecRegistry();
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.data.mongodb;
 
-import org.bson.codecs.configuration.CodecRegistry;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
@@ -27,10 +26,9 @@ import com.mongodb.reactivestreams.client.MongoDatabase;
  * Interface for factories creating reactive {@link MongoDatabase} instances.
  *
  * @author Mark Paluch
- * @author Christoph Strobl
  * @since 2.0
  */
-public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
+public interface ReactiveMongoDatabaseFactory {
 
 	/**
 	 * Creates a default {@link MongoDatabase} instance.
@@ -55,14 +53,4 @@ public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
 	 * @return will never be {@literal null}.
 	 */
 	PersistenceExceptionTranslator getExceptionTranslator();
-
-	/**
-	 * Get the underlying {@link CodecRegistry} used by the reactive MongoDB Java driver.
-	 *
-	 * @return never {@literal null}.
-	 */
-	@Override
-	default CodecRegistry getCodecRegistry() {
-		return getMongoDatabase().getCodecRegistry();
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2011 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableMongoAuditing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GeoJsonConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2014 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2014 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2014 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012 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.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

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

@@ -1,117 +0,0 @@
-/*
- * Copyright 2018 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.EqualsAndHashCode;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.messaging.Message;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-import com.mongodb.client.model.changestream.ChangeStreamDocument;
-
-/**
- * {@link Message} implementation specific to MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change
- * Streams</a>.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.1
- */
-@EqualsAndHashCode
-public class ChangeStreamEvent<T> {
-
-	private final @Nullable ChangeStreamDocument<Document> raw;
-
-	private final Class<T> targetType;
-	private final MongoConverter converter;
-	private final AtomicReference<T> converted = new AtomicReference<>();
-
-	/**
-	 * @param raw can be {@literal null}.
-	 * @param targetType must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 */
-	public ChangeStreamEvent(@Nullable ChangeStreamDocument<Document> raw, Class<T> targetType,
-			MongoConverter converter) {
-
-		this.raw = raw;
-		this.targetType = targetType;
-		this.converter = converter;
-	}
-
-	/**
-	 * Get the raw {@link ChangeStreamDocument} as emitted by the driver.
-	 *
-	 * @return can be {@literal null}.
-	 */
-	@Nullable
-	public ChangeStreamDocument<Document> getRaw() {
-		return raw;
-	}
-
-	/**
-	 * Get the potentially converted {@link ChangeStreamDocument#getFullDocument()}.
-	 *
-	 * @return {@literal null} when {@link #getRaw()} or {@link ChangeStreamDocument#getFullDocument()} is
-	 *         {@literal null}.
-	 */
-	@Nullable
-	public T getBody() {
-
-		if (raw == null) {
-			return null;
-		}
-
-		if (raw.getFullDocument() == null) {
-			return targetType.cast(raw.getFullDocument());
-		}
-
-		return getConverted();
-	}
-
-	private T getConverted() {
-
-		T result = converted.get();
-		if (result != null) {
-			return result;
-		}
-
-		if (ClassUtils.isAssignable(Document.class, raw.getFullDocument().getClass())) {
-
-			result = converter.read(targetType, raw.getFullDocument());
-			return converted.compareAndSet(null, result) ? result : converted.get();
-		}
-
-		if (converter.getConversionService().canConvert(raw.getFullDocument().getClass(), targetType)) {
-
-			result = converter.getConversionService().convert(raw.getFullDocument(), targetType);
-			return converted.compareAndSet(null, result) ? result : converted.get();
-		}
-
-		throw new IllegalArgumentException(String.format("No converter found capable of converting %s to %s",
-				raw.getFullDocument().getClass(), targetType));
-	}
-
-	@Override
-	public String toString() {
-		return "ChangeStreamEvent {" + "raw=" + raw + ", targetType=" + targetType + '}';
-	}
-}

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

@@ -1,218 +0,0 @@
-/*
- * Copyright 2018 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import lombok.EqualsAndHashCode;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-import com.mongodb.client.model.changestream.ChangeStreamDocument;
-import com.mongodb.client.model.changestream.FullDocument;
-
-/**
- * Options applicable to MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Streams</a>. Intended
- * to be used along with {@link org.springframework.data.mongodb.core.messaging.ChangeStreamRequest} in a sync world as
- * well {@link ReactiveMongoOperations} if you prefer it that way.
- *
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 2.1
- */
-@EqualsAndHashCode
-public class ChangeStreamOptions {
-
-	private @Nullable Object filter;
-	private @Nullable BsonValue resumeToken;
-	private @Nullable FullDocument fullDocumentLookup;
-	private @Nullable Collation collation;
-
-	protected ChangeStreamOptions() {}
-
-	/**
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<Object> getFilter() {
-		return Optional.ofNullable(filter);
-	}
-
-	/**
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<BsonValue> getResumeToken() {
-		return Optional.ofNullable(resumeToken);
-	}
-
-	/**
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<FullDocument> getFullDocumentLookup() {
-		return Optional.ofNullable(fullDocumentLookup);
-	}
-
-	/**
-	 * @return {@link Optional#empty()} if not set.
-	 */
-	public Optional<Collation> getCollation() {
-		return Optional.ofNullable(collation);
-	}
-
-	/**
-	 * @return empty {@link ChangeStreamOptions}.
-	 */
-	public static ChangeStreamOptions empty() {
-		return ChangeStreamOptions.builder().build();
-	}
-
-	/**
-	 * Obtain a shiny new {@link ChangeStreamOptionsBuilder} and start defining options in this fancy fluent way. Just
-	 * don't forget to call {@link ChangeStreamOptionsBuilder#build() build()} when your're done.
-	 *
-	 * @return new instance of {@link ChangeStreamOptionsBuilder}.
-	 */
-	public static ChangeStreamOptionsBuilder builder() {
-		return new ChangeStreamOptionsBuilder();
-	}
-
-	/**
-	 * Builder for creating {@link ChangeStreamOptions}.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	public static class ChangeStreamOptionsBuilder {
-
-		private @Nullable Object filter;
-		private @Nullable BsonValue resumeToken;
-		private @Nullable FullDocument fullDocumentLookup;
-		private @Nullable Collation collation;
-
-		private ChangeStreamOptionsBuilder() {}
-
-		/**
-		 * Set the collation to use.
-		 *
-		 * @param collation must not be {@literal null} nor {@literal empty}.
-		 * @return this.
-		 */
-		public ChangeStreamOptionsBuilder collation(Collation collation) {
-
-			Assert.notNull(collation, "Collation must not be null nor empty!");
-
-			this.collation = collation;
-			return this;
-		}
-
-		/**
-		 * Set the filter to apply.
-		 * <p/>
-		 * Fields on aggregation expression root level are prefixed to map to fields contained in
-		 * {@link ChangeStreamDocument#getFullDocument() fullDocument}. However {@literal operationType}, {@literal ns},
-		 * {@literal documentKey} and {@literal fullDocument} are reserved words that will be omitted, and therefore taken
-		 * as given, during the mapping procedure. You may want to have a look at the
-		 * <a href="https://docs.mongodb.com/manual/reference/change-events/">structure of Change Events</a>.
-		 * <p/>
-		 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to ensure filter expressions are
-		 * mapped to domain type fields.
-		 *
-		 * @param filter the {@link Aggregation Aggregation pipeline} to apply for filtering events. Must not be
-		 *          {@literal null}.
-		 * @return this.
-		 */
-		public ChangeStreamOptionsBuilder filter(Aggregation filter) {
-
-			Assert.notNull(filter, "Filter must not be null!");
-
-			this.filter = filter;
-			return this;
-		}
-
-		/**
-		 * Set the plain filter chain to apply.
-		 *
-		 * @param filter must not be {@literal null} nor contain {@literal null} values.
-		 * @return this.
-		 */
-		public ChangeStreamOptionsBuilder filter(Document... filter) {
-
-			Assert.noNullElements(filter, "Filter must not contain null values");
-
-			this.filter = Arrays.asList(filter);
-			return this;
-		}
-
-		/**
-		 * Set the resume token (typically a {@link org.bson.BsonDocument} containing a {@link org.bson.BsonBinary binary
-		 * token}) after which to start with listening.
-		 *
-		 * @param resumeToken must not be {@literal null}.
-		 * @return this.
-		 */
-		public ChangeStreamOptionsBuilder resumeToken(BsonValue resumeToken) {
-
-			Assert.notNull(resumeToken, "ResumeToken must not be null!");
-
-			this.resumeToken = resumeToken;
-			return this;
-		}
-
-		/**
-		 * Set the {@link FullDocument} lookup to {@link FullDocument#UPDATE_LOOKUP}.
-		 *
-		 * @return this.
-		 * @see #fullDocumentLookup(FullDocument)
-		 */
-		public ChangeStreamOptionsBuilder returnFullDocumentOnUpdate() {
-			return fullDocumentLookup(FullDocument.UPDATE_LOOKUP);
-		}
-
-		/**
-		 * Set the {@link FullDocument} lookup to use.
-		 *
-		 * @param lookup must not be {@literal null}.
-		 * @return this.
-		 */
-		public ChangeStreamOptionsBuilder fullDocumentLookup(FullDocument lookup) {
-
-			Assert.notNull(lookup, "Lookup must not be null!");
-
-			this.fullDocumentLookup = lookup;
-			return this;
-		}
-
-		/**
-		 * @return the built {@link ChangeStreamOptions}
-		 */
-		public ChangeStreamOptions build() {
-
-			ChangeStreamOptions options = new ChangeStreamOptions();
-
-			options.filter = filter;
-			options.resumeToken = resumeToken;
-			options.fullDocumentLookup = fullDocumentLookup;
-			options.collation = collation;
-
-			return options;
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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,27 +15,18 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.RequiredArgsConstructor;
-
 import java.util.Optional;
 
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
-import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.util.Optionals;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import com.mongodb.client.model.ValidationAction;
-import com.mongodb.client.model.ValidationLevel;
-
 /**
  * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
  *
  * @author Thomas Risberg
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Andreas Zink
  */
 public class CollectionOptions {
 
@@ -43,7 +34,6 @@ public class CollectionOptions {
 	private @Nullable Long size;
 	private @Nullable Boolean capped;
 	private @Nullable Collation collation;
-	private ValidationOptions validationOptions;
 
 	/**
 	 * Constructs a new <code>CollectionOptions</code> instance.
@@ -56,17 +46,16 @@ public class CollectionOptions {
 	 */
 	@Deprecated
 	public CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped) {
-		this(size, maxDocuments, capped, null, ValidationOptions.none());
+		this(size, maxDocuments, capped, null);
 	}
 
 	private CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped,
-			@Nullable Collation collation, ValidationOptions validationOptions) {
+			@Nullable Collation collation) {
 
 		this.maxDocuments = maxDocuments;
 		this.size = size;
 		this.capped = capped;
 		this.collation = collation;
-		this.validationOptions = validationOptions;
 	}
 
 	/**
@@ -80,7 +69,7 @@ public class CollectionOptions {
 
 		Assert.notNull(collation, "Collation must not be null!");
 
-		return new CollectionOptions(null, null, null, collation, ValidationOptions.none());
+		return new CollectionOptions(null, null, null, collation);
 	}
 
 	/**
@@ -90,7 +79,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public static CollectionOptions empty() {
-		return new CollectionOptions(null, null, null, null, ValidationOptions.none());
+		return new CollectionOptions(null, null, null, null);
 	}
 
 	/**
@@ -101,7 +90,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions capped() {
-		return new CollectionOptions(size, maxDocuments, true, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, true, collation);
 	}
 
 	/**
@@ -112,7 +101,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions maxDocuments(long maxDocuments) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation);
 	}
 
 	/**
@@ -123,7 +112,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions size(long size) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation);
 	}
 
 	/**
@@ -134,127 +123,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions collation(@Nullable Collation collation) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationOptions} set to given
-	 * {@link MongoJsonSchema}.
-	 *
-	 * @param schema can be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions schema(@Nullable MongoJsonSchema schema) {
-		return validator(Validator.schema(schema));
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationOptions} set to given
-	 * {@link Validator}.
-	 *
-	 * @param validator can be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions validator(@Nullable Validator validator) {
-		return validation(validationOptions.validator(validator));
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationLevel} set to
-	 * {@link ValidationLevel#OFF}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions disableValidation() {
-		return schemaValidationLevel(ValidationLevel.OFF);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationLevel} set to
-	 * {@link ValidationLevel#STRICT}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions strictValidation() {
-		return schemaValidationLevel(ValidationLevel.STRICT);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationLevel} set to
-	 * {@link ValidationLevel#MODERATE}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions moderateValidation() {
-		return schemaValidationLevel(ValidationLevel.MODERATE);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationAction} set to
-	 * {@link ValidationAction#WARN}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions warnOnValidationError() {
-		return schemaValidationAction(ValidationAction.WARN);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationAction} set to
-	 * {@link ValidationAction#ERROR}.
-	 *
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions failOnValidationError() {
-		return schemaValidationAction(ValidationAction.ERROR);
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationLevel} set given
-	 * {@link ValidationLevel}.
-	 *
-	 * @param validationLevel must not be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions schemaValidationLevel(ValidationLevel validationLevel) {
-
-		Assert.notNull(validationLevel, "ValidationLevel must not be null!");
-		return validation(validationOptions.validationLevel(validationLevel));
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with already given settings and {@code validationAction} set given
-	 * {@link ValidationAction}.
-	 *
-	 * @param validationAction must not be {@literal null}.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions schemaValidationAction(ValidationAction validationAction) {
-
-		Assert.notNull(validationAction, "ValidationAction must not be null!");
-		return validation(validationOptions.validationAction(validationAction));
-	}
-
-	/**
-	 * Create new {@link CollectionOptions} with the given {@link ValidationOptions}.
-	 *
-	 * @param validationOptions must not be {@literal null}. Use {@link ValidationOptions#none()} to remove validation.
-	 * @return new {@link CollectionOptions}.
-	 * @since 2.1
-	 */
-	public CollectionOptions validation(ValidationOptions validationOptions) {
-
-		Assert.notNull(validationOptions, "ValidationOptions must not be null!");
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
 	}
 
 	/**
@@ -294,104 +163,4 @@ public class CollectionOptions {
 	public Optional<Collation> getCollation() {
 		return Optional.ofNullable(collation);
 	}
-
-	/**
-	 * Get the {@link MongoJsonSchema} for the collection.
-	 *
-	 * @return {@link Optional#empty()} if not set.
-	 * @since 2.1
-	 */
-	public Optional<ValidationOptions> getValidationOptions() {
-		return validationOptions.isEmpty() ? Optional.empty() : Optional.of(validationOptions);
-	}
-
-	/**
-	 * Encapsulation of ValidationOptions options.
-	 *
-	 * @author Christoph Strobl
-	 * @author Andreas Zink
-	 * @since 2.1
-	 */
-	@RequiredArgsConstructor
-	public static class ValidationOptions {
-
-		private static final ValidationOptions NONE = new ValidationOptions(null, null, null);
-
-		private final @Nullable Validator validator;
-		private final @Nullable ValidationLevel validationLevel;
-		private final @Nullable ValidationAction validationAction;
-
-		/**
-		 * Create an empty {@link ValidationOptions}.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public static ValidationOptions none() {
-			return NONE;
-		}
-
-		/**
-		 * Define the {@link Validator} to be used for document validation.
-		 *
-		 * @param validator can be {@literal null}.
-		 * @return new instance of {@link ValidationOptions}.
-		 */
-		public ValidationOptions validator(@Nullable Validator validator) {
-			return new ValidationOptions(validator, validationLevel, validationAction);
-		}
-
-		/**
-		 * Define the validation level to apply.
-		 *
-		 * @param validationLevel can be {@literal null}.
-		 * @return new instance of {@link ValidationOptions}.
-		 */
-		public ValidationOptions validationLevel(ValidationLevel validationLevel) {
-			return new ValidationOptions(validator, validationLevel, validationAction);
-		}
-
-		/**
-		 * Define the validation action to take.
-		 *
-		 * @param validationAction can be {@literal null}.
-		 * @return new instance of {@link ValidationOptions}.
-		 */
-		public ValidationOptions validationAction(ValidationAction validationAction) {
-			return new ValidationOptions(validator, validationLevel, validationAction);
-		}
-
-		/**
-		 * Get the {@link Validator} to use.
-		 *
-		 * @return never {@literal null}.
-		 */
-		public Optional<Validator> getValidator() {
-			return Optional.ofNullable(validator);
-		}
-
-		/**
-		 * Get the {@code validationLevel} to apply.
-		 *
-		 * @return {@link Optional#empty()} if not set.
-		 */
-		public Optional<ValidationLevel> getValidationLevel() {
-			return Optional.ofNullable(validationLevel);
-		}
-
-		/**
-		 * Get the {@code validationAction} to perform.
-		 *
-		 * @return @return {@link Optional#empty()} if not set.
-		 */
-		public Optional<ValidationAction> getValidationAction() {
-			return Optional.ofNullable(validationAction);
-		}
-
-		/**
-		 * @return {@literal true} if no arguments set.
-		 */
-		boolean isEmpty() {
-			return !Optionals.isAnyPresent(getValidator(), getValidationAction(), getValidationLevel());
-		}
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.
@@ -19,14 +19,11 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.springframework.dao.DataAccessException;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.lang.Nullable;
 
-import com.mongodb.client.MongoCollection;
-
 /**
  * {@link ExecutableFindOperation} allows creation and execution of MongoDB find operations in a fluent API style.
  * <br />
@@ -205,7 +202,7 @@ public interface ExecutableFindOperation {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	interface FindWithProjection<T> extends FindWithQuery<T>, FindDistinct {
+	interface FindWithProjection<T> extends FindWithQuery<T> {
 
 		/**
 		 * Define the target type fields should be mapped to. <br />
@@ -217,101 +214,6 @@ public interface ExecutableFindOperation {
 		 * @throws IllegalArgumentException if resultType is {@literal null}.
 		 */
 		<R> FindWithQuery<R> as(Class<R> resultType);
-
-	}
-
-	/**
-	 * Distinct Find support.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface FindDistinct {
-
-		/**
-		 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view.
-		 *
-		 * @param field name of the field. Must not be {@literal null}.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if field is {@literal null}.
-		 */
-		TerminatingDistinct<Object> distinct(String field);
-	}
-
-	/**
-	 * Result type override. Optional.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface DistinctWithProjection {
-
-		/**
-		 * Define the target type the result should be mapped to. <br />
-		 * Skip this step if you are anyway fine with the default conversion.
-		 * <dl>
-		 * <dt>{@link Object} (the default)</dt>
-		 * <dd>Result is mapped according to the {@link org.bson.BsonType} converting eg. {@link org.bson.BsonString} into
-		 * plain {@link String}, {@link org.bson.BsonInt64} to {@link Long}, etc. always picking the most concrete type with
-		 * respect to the domain types property.<br />
-		 * Any {@link org.bson.BsonType#DOCUMENT} is run through the {@link org.springframework.data.convert.EntityReader}
-		 * to obtain the domain type. <br />
-		 * Using {@link Object} also works for non strictly typed fields. Eg. a mixture different types like fields using
-		 * {@link String} in one {@link org.bson.Document} while {@link Long} in another.</dd>
-		 * <dt>Any Simple type like {@link String} or {@link Long}.</dt>
-		 * <dd>The result is mapped directly by the MongoDB Java driver and the {@link org.bson.codecs.CodeCodec Codecs} in
-		 * place. This works only for results where all documents considered for the operation use the very same type for
-		 * the field.</dd>
-		 * <dt>Any Domain type</dt>
-		 * <dd>Domain types can only be mapped if the if the result of the actual {@code distinct()} operation returns
-		 * {@link org.bson.BsonType#DOCUMENT}.</dd>
-		 * <dt>{@link org.bson.BsonValue}</dt>
-		 * <dd>Using {@link org.bson.BsonValue} allows retrieval of the raw driver specific format, which returns eg.
-		 * {@link org.bson.BsonString}.</dd>
-		 * </dl>
-		 *
-		 * @param resultType must not be {@literal null}.
-		 * @param <R> result type.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
-		 */
-		<R> TerminatingDistinct<R> as(Class<R> resultType);
-	}
-
-	/**
-	 * Result restrictions. Optional.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface DistinctWithQuery<T> extends DistinctWithProjection {
-
-		/**
-		 * Set the filter query to be used.
-		 *
-		 * @param query must not be {@literal null}.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
-		 */
-		TerminatingDistinct<T> matching(Query query);
-	}
-
-	/**
-	 * Terminating distinct find operations.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface TerminatingDistinct<T> extends DistinctWithQuery<T> {
-
-		/**
-		 * Get all matching distinct field values.
-		 *
-		 * @return empty {@link List} if not match found. Never {@literal null}.
-		 * @throws DataAccessException if eg. result cannot be converted correctly which may happen if the document contains
-		 *           {@link String} whereas the result type is specified as {@link Long}.
-		 */
-		List<T> all();
 	}
 
 	/**
@@ -320,5 +222,5 @@ public interface ExecutableFindOperation {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	interface ExecutableFind<T> extends FindWithCollection<T>, FindWithProjection<T>, FindDistinct {}
+	interface ExecutableFind<T> extends FindWithCollection<T>, FindWithProjection<T> {}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.
@@ -205,19 +205,6 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindDistinct#distinct(java.lang.String)
-		 */
-		@SuppressWarnings("unchecked")
-		@Override
-		public TerminatingDistinct<Object> distinct(String field) {
-
-			Assert.notNull(field, "Field must not be null!");
-
-			return new DistinctOperationSupport(this, field);
-		}
-
 		private List<T> doFind(@Nullable CursorPreparer preparer) {
 
 			Document queryObject = query.getQueryObject();
@@ -227,12 +214,6 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 					getCursorPreparer(query, preparer));
 		}
 
-		private List<T> doFindDistinct(String field) {
-
-			return template.findDistinct(query, field, getCollectionName(), domainType,
-					returnType == domainType ? (Class<T>) Object.class : returnType);
-		}
-
 		private CloseableIterator<T> doStream() {
 			return template.doStream(query, domainType, getCollectionName(), returnType);
 		}
@@ -280,54 +261,4 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return this;
 		}
 	}
-
-	/**
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	static class DistinctOperationSupport<T> implements TerminatingDistinct<T> {
-
-		private final String field;
-		private final ExecutableFindSupport<T> delegate;
-
-		public DistinctOperationSupport(ExecutableFindSupport<T> delegate, String field) {
-
-			this.delegate = delegate;
-			this.field = field;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithProjection#as(java.lang.Class)
-		 */
-		@Override
-		@SuppressWarnings("unchecked")
-		public <R> TerminatingDistinct<R> as(Class<R> resultType) {
-
-			Assert.notNull(resultType, "ResultType must not be null!");
-
-			return new DistinctOperationSupport<>((ExecutableFindSupport) delegate.as(resultType), field);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
-		@Override
-		public TerminatingDistinct<T> matching(Query query) {
-
-			Assert.notNull(query, "Query must not be null!");
-
-			return new DistinctOperationSupport<>((ExecutableFindSupport<T>) delegate.matching(query), field);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingDistinct#all()
-		 */
-		@Override
-		public List<T> all() {
-			return delegate.doFindDistinct(field);
-		}
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2015 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2014 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2017 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.
@@ -709,65 +709,6 @@ public interface MongoOperations extends FluentMongoOperations {
 	@Nullable
 	<T> T findById(Object id, Class<T> entityClass, String collectionName);
 
-	/**
-	 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view and
-	 * returns the results in a {@link List}.
-	 *
-	 * @param field the name of the field to inspect for distinct values. Must not be {@literal null}.
-	 * @param entityClass the domain type used for determining the actual {@link MongoCollection}. Must not be
-	 *          {@literal null}.
-	 * @param resultClass the result type. Must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	default <T> List<T> findDistinct(String field, Class<?> entityClass, Class<T> resultClass) {
-		return findDistinct(new Query(), field, entityClass, resultClass);
-	}
-
-	/**
-	 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view and
-	 * returns the results in a {@link List}.
-	 *
-	 * @param query filter {@link Query} to restrict search. Must not be {@literal null}.
-	 * @param field the name of the field to inspect for distinct values. Must not be {@literal null}.
-	 * @param entityClass the domain type used for determining the actual {@link MongoCollection} and mapping the
-	 *          {@link Query} to the domain type fields. Must not be {@literal null}.
-	 * @param resultClass the result type. Must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	<T> List<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass);
-
-	/**
-	 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view and
-	 * returns the results in a {@link List}.
-	 *
-	 * @param query filter {@link Query} to restrict search. Must not be {@literal null}.
-	 * @param field the name of the field to inspect for distinct values. Must not be {@literal null}.
-	 * @param collectionName the explicit name of the actual {@link MongoCollection}. Must not be {@literal null}.
-	 * @param entityClass the domain type used for mapping the {@link Query} to the domain type fields.
-	 * @param resultClass the result type. Must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	<T> List<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
-			Class<T> resultClass);
-
-	/**
-	 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view and
-	 * returns the results in a {@link List}.
-	 *
-	 * @param query filter {@link Query} to restrict search. Must not be {@literal null}.
-	 * @param field the name of the field to inspect for distinct values. Must not be {@literal null}.
-	 * @param collection the explicit name of the actual {@link MongoCollection}. Must not be {@literal null}.
-	 * @param resultClass the result type. Must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	default <T> List<T> findDistinct(Query query, String field, String collection, Class<T> resultClass) {
-		return findDistinct(query, field, collection, Object.class, resultClass);
-	}
-
 	/**
 	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 the original author or authors.
+ * Copyright 2010-2017 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.
@@ -24,14 +24,22 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Scanner;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
-import org.bson.BsonValue;
 import org.bson.Document;
-import org.bson.codecs.Codec;
 import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,8 +65,6 @@ import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Metric;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.mongodb.MongoDbFactory;
@@ -73,11 +79,9 @@ import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOpe
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
-import org.springframework.data.mongodb.core.convert.JsonSchemaMapper;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
-import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
@@ -107,7 +111,6 @@ import org.springframework.data.mongodb.core.query.Meta;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.mongodb.core.validation.Validator;
 import org.springframework.data.mongodb.util.MongoClientVersion;
 import org.springframework.data.projection.ProjectionInformation;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
@@ -124,6 +127,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.Cursor;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 import com.mongodb.Mongo;
@@ -132,14 +136,19 @@ import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.AggregateIterable;
-import com.mongodb.client.DistinctIterable;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MapReduceIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.MongoIterable;
+import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.*;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import com.mongodb.util.JSONParseException;
@@ -164,8 +173,6 @@ import com.mongodb.util.JSONParseException;
  * @author Laszlo Csontos
  * @author Maninder Singh
  * @author Borislav Rangelov
- * @author duozhilin
- * @author Andreas Zink
  */
 @SuppressWarnings("deprecation")
 public class MongoTemplate implements MongoOperations, ApplicationContextAware, IndexOperationsProvider {
@@ -191,7 +198,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 	private final PersistenceExceptionTranslator exceptionTranslator;
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;
-	private final JsonSchemaMapper schemaMapper;
 	private final SpelAwareProxyProjectionFactory projectionFactory;
 
 	private @Nullable WriteConcern writeConcern;
@@ -236,7 +242,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		this.mongoConverter = mongoConverter == null ? getDefaultMongoConverter(mongoDbFactory) : mongoConverter;
 		this.queryMapper = new QueryMapper(this.mongoConverter);
 		this.updateMapper = new UpdateMapper(this.mongoConverter);
-		this.schemaMapper = new MongoJsonSchemaMapper(this.mongoConverter);
 		this.projectionFactory = new SpelAwareProxyProjectionFactory();
 
 		// We always have a mapping context in the converter, whether it's a simple one or not
@@ -547,9 +552,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 	 */
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
-
+		return createCollection(determineCollectionName(entityClass), collectionOptions);
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		return doCreateCollection(determineCollectionName(entityClass), convertToDocument(collectionOptions, entityClass));
 	}
 
 	/*
@@ -576,7 +579,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#getCollection(java.lang.String)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.String)
 	 */
 	public MongoCollection<Document> getCollection(final String collectionName) {
 
@@ -805,88 +808,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return doFindOne(collectionName, new Document(idKey, id), new Document(), entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
-	@Override
-	public <T> List<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass) {
-		return findDistinct(query, field, determineCollectionName(entityClass), entityClass, resultClass);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> List<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
-			Class<T> resultClass) {
-
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(resultClass, "ResultClass must not be null!");
-
-		MongoPersistentEntity<?> entity = entityClass != Object.class ? getPersistentEntity(entityClass) : null;
-
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), entity);
-		String mappedFieldName = queryMapper.getMappedFields(new Document(field, 1), entity).keySet().iterator().next();
-
-		Class<T> mongoDriverCompatibleType = getMongoDbFactory().getCodecFor(resultClass).map(Codec::getEncoderClass)
-				.orElse((Class) BsonValue.class);
-
-		MongoIterable<?> result = execute((db) -> {
-
-			DistinctIterable<T> iterable = db.getCollection(collectionName).distinct(mappedFieldName, mappedQuery,
-					mongoDriverCompatibleType);
-
-			return query.getCollation().map(Collation::toMongoCollation).map(iterable::collation).orElse(iterable);
-		});
-
-		if (resultClass == Object.class || mongoDriverCompatibleType != resultClass) {
-
-			MongoConverter converter = getConverter();
-			DefaultDbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory);
-
-			result = result.map((source) -> converter.mapValueToTargetType(source,
-					getMostSpecificConversionTargetType(resultClass, entityClass, field), dbRefResolver));
-		}
-
-		try {
-			return (List<T>) result.into(new ArrayList<>());
-		} catch (RuntimeException e) {
-			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
-		}
-	}
-
-	/**
-	 * @param userType must not be {@literal null}.
-	 * @param domainType must not be {@literal null}.
-	 * @param field must not be {@literal null}.
-	 * @return the most specific conversion target type depending on user preference and domain type property.
-	 * @since 2.1
-	 */
-	private static Class<?> getMostSpecificConversionTargetType(Class<?> userType, Class<?> domainType, String field) {
-
-		Class<?> conversionTargetType = userType;
-		try {
-
-			Class<?> propertyType = PropertyPath.from(field, domainType).getLeafProperty().getLeafType();
-
-			// use the more specific type but favor UserType over property one
-			if (ClassUtils.isAssignable(userType, propertyType)) {
-				conversionTargetType = propertyType;
-			}
-
-		} catch (PropertyReferenceException e) {
-			// just don't care about it as we default to Object.class anyway.
-		}
-
-		return conversionTargetType;
-	}
-
 	@Override
 	public <T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass) {
 		return geoNear(near, entityClass, determineCollectionName(entityClass));
@@ -2013,93 +1934,87 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		Assert.notNull(outputType, "Output type must not be null!");
 
 		AggregationOperationContext rootContext = context == null ? Aggregation.DEFAULT_CONTEXT : context;
-
+		Document command = aggregation.toDocument(collectionName, rootContext);
-		return doAggregate(aggregation, collectionName, outputType, rootContext);
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
-			AggregationOperationContext context) {
-
-		DocumentCallback<O> callback = new UnwrapAndReadDocumentCallback<>(mongoConverter, outputType, collectionName);
-
-		AggregationOptions options = aggregation.getOptions();
-		if (options.isExplain()) {
-
-			Document command = aggregation.toDocument(collectionName, context);
-
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Executing aggregation: {}", serializeToJsonSafely(command));
-			}
-
-			Document commandResult = executeCommand(command);
-			return new AggregationResults<>(commandResult.get("results", new ArrayList<Document>(0)).stream()
-					.map(callback::doWith).collect(Collectors.toList()), commandResult);
-		}
-
-		List<Document> pipeline = aggregation.toPipeline(context);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing aggregation: {} in collection {}", serializeToJsonSafely(pipeline), collectionName);
+			LOGGER.debug("Executing aggregation: {}", serializeToJsonSafely(command));
 		}
 
-		return execute(collectionName, collection -> {
+		Document commandResult = executeCommand(command, this.readPreference);
 
-			List<Document> rawResult = new ArrayList<>();
+		return new AggregationResults<O>(returnPotentiallyMappedResults(outputType, commandResult, collectionName),
-
+				commandResult);
-			AggregateIterable<Document> aggregateIterable = collection.aggregate(pipeline, Document.class) //
+	}
-					.collation(options.getCollation().map(Collation::toMongoCollation).orElse(null)) //
+
-					.allowDiskUse(options.isAllowDiskUse());
+	/**
-
+	 * Returns the potentially mapped results of the given {@code commandResult}.
-			if (options.getCursorBatchSize() != null) {
+	 *
-				aggregateIterable = aggregateIterable.batchSize(options.getCursorBatchSize());
+	 * @param outputType
-			}
+	 * @param commandResult
-
+	 * @return
-			MongoIterable<O> iterable = aggregateIterable.map(val -> {
+	 */
-
+	private <O> List<O> returnPotentiallyMappedResults(Class<O> outputType, Document commandResult,
-				rawResult.add(val);
+			String collectionName) {
-				return callback.doWith(val);
+
-			});
+		@SuppressWarnings("unchecked")
-
+		Iterable<Document> resultSet = (Iterable<Document>) commandResult.get("result");
-			return new AggregationResults<>(iterable.into(new ArrayList<>()),
+		if (resultSet == null) {
-					new Document("results", rawResult).append("ok", 1.0D));
+			return Collections.emptyList();
-		});
+		}
+
+		DocumentCallback<O> callback = new UnwrapAndReadDocumentCallback<O>(mongoConverter, outputType, collectionName);
+
+		List<O> mappedResults = new ArrayList<O>();
+		for (Document document : resultSet) {
+			mappedResults.add(callback.doWith(document));
+		}
+
+		return mappedResults;
 	}
 
-	@SuppressWarnings("ConstantConditions")
 	protected <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName,
 			Class<O> outputType, @Nullable AggregationOperationContext context) {
 
 		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
 		Assert.notNull(outputType, "Output type must not be null!");
-		Assert.isTrue(!aggregation.getOptions().isExplain(), "Can't use explain option with streaming!");
 
 		AggregationOperationContext rootContext = context == null ? Aggregation.DEFAULT_CONTEXT : context;
-		AggregationOptions options = aggregation.getOptions();
+
-		List<Document> pipeline = aggregation.toPipeline(rootContext);
+		Document command = aggregation.toDocument(collectionName, rootContext);
+
+		assertNotExplain(command);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Streaming aggregation: {} in collection {}", serializeToJsonSafely(pipeline), collectionName);
+			LOGGER.debug("Streaming aggregation: {}", serializeToJsonSafely(command));
 		}
 
-		ReadDocumentCallback<O> readCallback = new ReadDocumentCallback<>(mongoConverter, outputType, collectionName);
+		ReadDocumentCallback<O> readCallback = new ReadDocumentCallback<O>(mongoConverter, outputType, collectionName);
 
-		return execute(collectionName, (CollectionCallback<CloseableIterator<O>>) collection -> {
+		return execute(collectionName, new CollectionCallback<CloseableIterator<O>>() {
 
-			AggregateIterable<Document> cursor = collection.aggregate(pipeline) //
+			@Override
-					.allowDiskUse(options.isAllowDiskUse()) //
+			public CloseableIterator<O> doInCollection(MongoCollection<Document> collection)
-					.useCursor(true);
+					throws MongoException, DataAccessException {
 
-			if (options.getCursorBatchSize() != null) {
+				List<Document> pipeline = (List<Document>) command.get("pipeline");
-				cursor = cursor.batchSize(options.getCursorBatchSize());
+
+				AggregationOptions options = AggregationOptions.fromDocument(command);
+
+				AggregateIterable<Document> cursor = collection.aggregate(pipeline).allowDiskUse(options.isAllowDiskUse())
+						.useCursor(true);
+
+				Integer cursorBatchSize = options.getCursorBatchSize();
+				if (cursorBatchSize != null) {
+					cursor = cursor.batchSize(cursorBatchSize);
+				}
+
+				if (options.getCollation().isPresent()) {
+					cursor = cursor.collation(options.getCollation().map(Collation::toMongoCollation).get());
+				}
+
+				return new CloseableIterableCursorAdapter<O>(cursor.iterator(), exceptionTranslator, readCallback);
 			}
-
-			if (options.getCollation().isPresent()) {
-				cursor = cursor.collation(options.getCollation().map(Collation::toMongoCollation).get());
-			}
-
-			return new CloseableIterableCursorAdapter<>(cursor.iterator(), exceptionTranslator, readCallback);
 		});
 	}
 
@@ -2148,6 +2063,20 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return new ExecutableInsertOperationSupport(this).insert(domainType);
 	}
 
+	/**
+	 * Assert that the {@link Document} does not enable Aggregation explain mode.
+	 *
+	 * @param command the command {@link Document}.
+	 */
+	private void assertNotExplain(Document command) {
+
+		Boolean explain = command.get("explain", Boolean.class);
+
+		if (explain != null && explain) {
+			throw new IllegalArgumentException("Can't use explain option with streaming!");
+		}
+	}
+
 	protected String replaceWithResourceIfNecessary(String function) {
 
 		String func = function;
@@ -2231,21 +2160,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 					co.collation(IndexConverters.fromDocument(collectionOptions.get("collation", Document.class)));
 				}
 
-				if (collectionOptions.containsKey("validator")) {
-
-					com.mongodb.client.model.ValidationOptions options = new com.mongodb.client.model.ValidationOptions();
-
-					if (collectionOptions.containsKey("validationLevel")) {
-						options.validationLevel(ValidationLevel.fromString(collectionOptions.getString("validationLevel")));
-					}
-					if (collectionOptions.containsKey("validationAction")) {
-						options.validationAction(ValidationAction.fromString(collectionOptions.getString("validationAction")));
-					}
-
-					options.validator(collectionOptions.get("validator", Document.class));
-					co.validationOptions(options);
-				}
-
 				db.createCollection(collectionName, co);
 
 				MongoCollection<Document> coll = db.getCollection(collectionName, Document.class);
@@ -2358,70 +2272,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				new ProjectingReadCallback<>(mongoConverter, sourceClass, targetClass, collectionName), collectionName);
 	}
 
-	/**
-	 * Convert given {@link CollectionOptions} to a document and take the domain type information into account when
-	 * creating a mapped schema for validation. <br />
-	 * This method calls {@link #convertToDocument(CollectionOptions)} for backwards compatibility and potentially
-	 * overwrites the validator with the mapped validator document. In the long run
-	 * {@link #convertToDocument(CollectionOptions)} will be removed so that this one becomes the only source of truth.
-	 *
-	 * @param collectionOptions can be {@literal null}.
-	 * @param targetType must not be {@literal null}. Use {@link Object} type instead.
-	 * @return never {@literal null}.
-	 * @since 2.1
-	 */
-	protected Document convertToDocument(@Nullable CollectionOptions collectionOptions, Class<?> targetType) {
-
-		Document doc = convertToDocument(collectionOptions);
-
-		if (collectionOptions != null) {
-
-			collectionOptions.getValidationOptions().ifPresent(it -> it.getValidator() //
-					.ifPresent(val -> doc.put("validator", getMappedValidator(val, targetType))));
-		}
-
-		return doc;
-	}
-
-	/**
-	 * @param collectionOptions can be {@literal null}.
-	 * @return never {@literal null}.
-	 * @deprecated since 2.1 in favor of {@link #convertToDocument(CollectionOptions, Class)}.
-	 */
-	@Deprecated
 	protected Document convertToDocument(@Nullable CollectionOptions collectionOptions) {
 
 		Document document = new Document();
-
 		if (collectionOptions != null) {
 
 			collectionOptions.getCapped().ifPresent(val -> document.put("capped", val));
 			collectionOptions.getSize().ifPresent(val -> document.put("size", val));
 			collectionOptions.getMaxDocuments().ifPresent(val -> document.put("max", val));
 			collectionOptions.getCollation().ifPresent(val -> document.append("collation", val.toDocument()));
-
-			collectionOptions.getValidationOptions().ifPresent(it -> {
-
-				it.getValidationLevel().ifPresent(val -> document.append("validationLevel", val.getValue()));
-				it.getValidationAction().ifPresent(val -> document.append("validationAction", val.getValue()));
-				it.getValidator().ifPresent(val -> document.append("validator", getMappedValidator(val, Object.class)));
-			});
 		}
-
 		return document;
 	}
 
-	Document getMappedValidator(Validator validator, Class<?> domainType) {
-
-		Document validationRules = validator.toDocument();
-
-		if (validationRules.containsKey("$jsonSchema")) {
-			return schemaMapper.mapSchema(validationRules, domainType);
-		}
-
-		return queryMapper.getMappedObject(validationRules, mappingContext.getPersistentEntity(domainType));
-	}
-
 	/**
 	 * Map the results of an ad-hoc query on the default MongoDB collection to an object using the template's converter.
 	 * The first document that matches the query is returned and also removed from the collection in the database.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.
@@ -156,7 +156,7 @@ public interface ReactiveFindOperation {
 	/**
 	 * Result type override (optional).
 	 */
-	interface FindWithProjection<T> extends FindWithQuery<T>, FindDistinct {
+	interface FindWithProjection<T> extends FindWithQuery<T> {
 
 		/**
 		 * Define the target type fields should be mapped to. <br />
@@ -170,101 +170,8 @@ public interface ReactiveFindOperation {
 		<R> FindWithQuery<R> as(Class<R> resultType);
 	}
 
-	/**
-	 * Distinct Find support.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface FindDistinct {
-
-		/**
-		 * Finds the distinct values for a specified {@literal field} across a single
-		 * {@link com.mongodb.reactivestreams.client.MongoCollection} or view.
-		 *
-		 * @param field name of the field. Must not be {@literal null}.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if field is {@literal null}.
-		 */
-		TerminatingDistinct<Object> distinct(String field);
-	}
-
-	/**
-	 * Result type override. Optional.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface DistinctWithProjection {
-
-		/**
-		 * Define the target type the result should be mapped to. <br />
-		 * Skip this step if you are anyway fine with the default conversion.
-		 * <dl>
-		 * <dt>{@link Object} (the default)</dt>
-		 * <dd>Result is mapped according to the {@link org.bson.BsonType} converting eg. {@link org.bson.BsonString} into
-		 * plain {@link String}, {@link org.bson.BsonInt64} to {@link Long}, etc. always picking the most concrete type with
-		 * respect to the domain types property.<br />
-		 * Any {@link org.bson.BsonType#DOCUMENT} is run through the {@link org.springframework.data.convert.EntityReader}
-		 * to obtain the domain type. <br />
-		 * Using {@link Object} also works for non strictly typed fields. Eg. a mixture different types like fields using
-		 * {@link String} in one {@link org.bson.Document} while {@link Long} in another.</dd>
-		 * <dt>Any Simple type like {@link String}, {@link Long}, ...</dt>
-		 * <dd>The result is mapped directly by the MongoDB Java driver and the {@link org.bson.codecs.CodeCodec Codecs} in
-		 * place. This works only for results where all documents considered for the operation use the very same type for
-		 * the field.</dd>
-		 * <dt>Any Domain type</dt>
-		 * <dd>Domain types can only be mapped if the if the result of the actual {@code distinct()} operation returns
-		 * {@link org.bson.BsonType#DOCUMENT}.</dd>
-		 * <dt>{@link org.bson.BsonValue}</dt>
-		 * <dd>Using {@link org.bson.BsonValue} allows retrieval of the raw driver specific format, which returns eg.
-		 * {@link org.bson.BsonString}.</dd>
-		 * </dl>
-		 *
-		 * @param resultType must not be {@literal null}.
-		 * @param <R> result type.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
-		 */
-		<R> TerminatingDistinct<R> as(Class<R> resultType);
-	}
-
-	/**
-	 * Result restrictions. Optional.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface DistinctWithQuery<T> extends DistinctWithProjection {
-
-		/**
-		 * Set the filter query to be used.
-		 *
-		 * @param query must not be {@literal null}.
-		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
-		 */
-		TerminatingDistinct<T> matching(Query query);
-	}
-
-	/**
-	 * Terminating distinct find operations.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	interface TerminatingDistinct<T> extends DistinctWithQuery<T> {
-
-		/**
-		 * Get all matching distinct field values.
-		 *
-		 * @return empty {@link Flux} if not match found. Never {@literal null}.
-		 */
-		Flux<T> all();
-	}
-
 	/**
 	 * {@link ReactiveFind} provides methods for constructing lookup operations in a fluent way.
 	 */
-	interface ReactiveFind<T> extends FindWithCollection<T>, FindWithProjection<T>, FindDistinct {}
+	interface ReactiveFind<T> extends FindWithCollection<T>, FindWithProjection<T> {}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.
@@ -19,6 +19,7 @@ import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
+import org.springframework.lang.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -27,7 +28,6 @@ import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -196,18 +196,6 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindDistinct#distinct(java.lang.String)
-		 */
-		@Override
-		public TerminatingDistinct<Object> distinct(String field) {
-
-			Assert.notNull(field, "Field must not be null!");
-
-			return new DistinctOperationSupport<>(this, field);
-		}
-
 		private Flux<T> doFind(@Nullable FindPublisherPreparer preparer) {
 
 			Document queryObject = query.getQueryObject();
@@ -217,13 +205,6 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 					preparer != null ? preparer : getCursorPreparer(query));
 		}
 
-		@SuppressWarnings("unchecked")
-		private Flux<T> doFindDistinct(String field) {
-
-			return template.findDistinct(query, field, getCollectionName(), domainType,
-					returnType == domainType ? (Class<T>) Object.class : returnType);
-		}
-
 		private FindPublisherPreparer getCursorPreparer(Query query) {
 			return template.new QueryFindPublisherPreparer(query, domainType);
 		}
@@ -235,55 +216,5 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 		private String asString() {
 			return SerializationUtils.serializeToJsonSafely(query);
 		}
-
-		/**
-		 * @author Christoph Strobl
-		 * @since 2.1
-		 */
-		static class DistinctOperationSupport<T> implements TerminatingDistinct<T> {
-
-			private final String field;
-			private final ReactiveFindSupport delegate;
-
-			public DistinctOperationSupport(ReactiveFindSupport delegate, String field) {
-
-				this.delegate = delegate;
-				this.field = field;
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithProjection#as(java.lang.Class)
-			 */
-			@Override
-			public <R> TerminatingDistinct<R> as(Class<R> resultType) {
-
-				Assert.notNull(resultType, "ResultType must not be null!");
-
-				return new DistinctOperationSupport<>((ReactiveFindSupport) delegate.as(resultType), field);
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-			 */
-			@Override
-			@SuppressWarnings("unchecked")
-			public TerminatingDistinct<T> matching(Query query) {
-
-				Assert.notNull(query, "Query must not be null!");
-
-				return new DistinctOperationSupport<>((ReactiveFindSupport<T>) delegate.matching(query), field);
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core..ReactiveFindOperation.TerminatingDistinct#all()
-			 */
-			@Override
-			public Flux<T> all() {
-				return delegate.doFindDistinct(field);
-			}
-		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2017 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 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.