Polishing.

Add missing Override annotations to template API methods.

See #3984

Author: mp911de

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

@@ -314,6 +314,7 @@ public void setReadPreference(@Nullable ReadPreference readPreference) {
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		prepareIndexCreator(applicationContext);
@@ -417,6 +418,7 @@ private void prepareIndexCreator(ApplicationContext context) {
 	 *
 	 * @return
 	 */
+	@Override
 	public MongoConverter getConverter() {
 		return this.mongoConverter;
 	}
@@ -557,6 +559,7 @@ protected void executeQuery(Query query, String collectionName, DocumentCallback
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(org.springframework.data.mongodb.core.DbCallback)
 	 */
+	@Override
 	public <T> T execute(DbCallback<T> action) {
 
 		Assert.notNull(action, "DbCallback must not be null!");
@@ -573,6 +576,7 @@ public <T> T execute(DbCallback<T> action) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.DbCallback)
 	 */
+	@Override
 	public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
 
 		Assert.notNull(entityClass, "EntityClass must not be null!");
@@ -583,6 +587,7 @@ public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.DbCallback)
 	 */
+	@Override
 	public <T> T execute(String collectionName, CollectionCallback<T> callback) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -635,6 +640,7 @@ public void setSessionSynchronization(SessionSynchronization sessionSynchronizat
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class)
 	 */
+	@Override
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass) {
 		return createCollection(entityClass, operations.forType(entityClass).getCollectionOptions());
 	}
@@ -643,6 +649,7 @@ public <T> MongoCollection<Document> createCollection(Class<T> entityClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class, org.springframework.data.mongodb.core.CollectionOptions)
 	 */
+	@Override
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
 
@@ -656,6 +663,7 @@ public <T> MongoCollection<Document> createCollection(Class<T> entityClass,
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String)
 	 */
+	@Override
 	public MongoCollection<Document> createCollection(String collectionName) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -667,6 +675,7 @@ public MongoCollection<Document> createCollection(String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String, org.springframework.data.mongodb.core.CollectionOptions)
 	 */
+	@Override
 	public MongoCollection<Document> createCollection(String collectionName,
 			@Nullable CollectionOptions collectionOptions) {
 
@@ -679,6 +688,7 @@ public MongoCollection<Document> createCollection(String collectionName,
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#getCollection(java.lang.String)
 	 */
+	@Override
 	@SuppressWarnings("ConstantConditions")
 	public MongoCollection<Document> getCollection(String collectionName) {
 
@@ -691,6 +701,7 @@ public MongoCollection<Document> getCollection(String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.Class)
 	 */
+	@Override
 	public <T> boolean collectionExists(Class<T> entityClass) {
 		return collectionExists(getCollectionName(entityClass));
 	}
@@ -699,6 +710,7 @@ public <T> boolean collectionExists(Class<T> entityClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.String)
 	 */
+	@Override
 	@SuppressWarnings("ConstantConditions")
 	public boolean collectionExists(String collectionName) {
 
@@ -719,6 +731,7 @@ public boolean collectionExists(String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.Class)
 	 */
+	@Override
 	public <T> void dropCollection(Class<T> entityClass) {
 		dropCollection(getCollectionName(entityClass));
 	}
@@ -727,6 +740,7 @@ public <T> void dropCollection(Class<T> entityClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.String)
 	 */
+	@Override
 	public void dropCollection(String collectionName) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -750,6 +764,7 @@ public IndexOperations indexOps(String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.String)
 	 */
+	@Override
 	public IndexOperations indexOps(String collectionName, @Nullable Class<?> type) {
 		return new DefaultIndexOperations(this, collectionName, type);
 	}
@@ -758,6 +773,7 @@ public IndexOperations indexOps(String collectionName, @Nullable Class<?> type)
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.Class)
 	 */
+	@Override
 	public IndexOperations indexOps(Class<?> entityClass) {
 		return indexOps(getCollectionName(entityClass), entityClass);
 	}
@@ -766,6 +782,7 @@ public IndexOperations indexOps(Class<?> entityClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.String)
 	 */
+	@Override
 	public BulkOperations bulkOps(BulkMode bulkMode, String collectionName) {
 		return bulkOps(bulkMode, null, collectionName);
 	}
@@ -774,6 +791,7 @@ public BulkOperations bulkOps(BulkMode bulkMode, String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class)
 	 */
+	@Override
 	public BulkOperations bulkOps(BulkMode bulkMode, Class<?> entityClass) {
 		return bulkOps(bulkMode, entityClass, getCollectionName(entityClass));
 	}
@@ -782,6 +800,7 @@ public BulkOperations bulkOps(BulkMode bulkMode, Class<?> entityClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class, java.lang.String)
 	 */
+	@Override
 	public BulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName) {
 
 		Assert.notNull(mode, "BulkMode must not be null!");
@@ -1145,6 +1164,7 @@ public long count(Query query, String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
 	 */
+	@Override
 	public long count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		Assert.notNull(query, "Query must not be null!");
@@ -1984,10 +2004,12 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 		return mappedResults;
 	}
 
+	@Override
 	public <T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass) {
 		return group(null, inputCollectionName, groupBy, entityClass);
 	}
 
+	@Override
 	public <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionName, GroupBy groupBy,
 			Class<T> entityClass) {
 
@@ -2396,6 +2418,7 @@ protected String replaceWithResourceIfNecessary(String function) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollectionNames()
 	 */
+	@Override
 	@SuppressWarnings("ConstantConditions")
 	public Set<String> getCollectionNames() {
 		return execute(db -> {
@@ -3089,6 +3112,7 @@ public FindCallback(Document query, Document fields, @Nullable com.mongodb.clien
 			this.collation = collation;
 		}
 
+		@Override
 		public FindIterable<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
 
@@ -3148,6 +3172,7 @@ private static class FindAndRemoveCallback implements CollectionCallback<Documen
 			this.collation = Optional.ofNullable(collation);
 		}
 
+		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
 			FindOneAndDeleteOptions opts = new FindOneAndDeleteOptions().sort(sort).projection(fields);
@@ -3177,6 +3202,7 @@ private static class FindAndModifyCallback implements CollectionCallback<Documen
 			this.options = options;
 		}
 
+		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
 			FindOneAndUpdateOptions opts = new FindOneAndUpdateOptions();
@@ -3289,6 +3315,7 @@ private class ReadDocumentCallback<T> implements DocumentCallback<T> {
 			this.collectionName = collectionName;
 		}
 
+		@Override
 		public T doWith(Document document) {
 
 			maybeEmitEvent(new AfterLoadEvent<>(document, type, collectionName));
@@ -3330,6 +3357,7 @@ private class ProjectingReadCallback<S, T> implements DocumentCallback<T> {
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.MongoTemplate.DocumentCallback#doWith(org.bson.Document)
 		 */
+		@Override
 		@SuppressWarnings("unchecked")
 		public T doWith(Document document) {
 
@@ -3365,6 +3393,7 @@ class QueryCursorPreparer implements CursorPreparer {
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.DBCursor)
 		 */
+		@Override
 		public FindIterable<Document> prepare(FindIterable<Document> iterable) {
 
 			FindIterable<Document> cursorToUse = iterable;
@@ -3483,6 +3512,7 @@ static class GeoNearResultDocumentCallback<T> implements DocumentCallback<GeoRes
 			this.metric = metric;
 		}
 
+		@Override
 		public GeoResult<T> doWith(Document object) {
 
 			double distance = Double.NaN;