DATAMONGO-1602 - Remove references to Assert single-arg methods.

Replace references to Assert single-arg methods with references to methods accepting the test object and message.

Related ticket: SPR-15196.

Author: mp911de

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 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.
@@ -361,7 +361,9 @@ private static class NegatingFilter implements TypeFilter {
 		 * @param filters
 		 */
 		public NegatingFilter(TypeFilter... filters) {
-			Assert.notNull(filters);
+
+			Assert.notNull(filters, "TypeFilters must not be null");
+
 			this.delegates = new HashSet<TypeFilter>(Arrays.asList(filters));
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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/MongoAdmin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 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.
@@ -27,18 +27,20 @@
  * Mongo server administration exposed via JMX annotations
  * 
  * @author Mark Pollack
- * @author Thomas Darimont
+ * @author Thomas Darimont
+ * @author Mark Paluch
  */
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
 
 	private final Mongo mongo;
 	private String username;
 	private String password;
-	private String authenticationDatabaseName;
+	private String authenticationDatabaseName;
 
 	public MongoAdmin(Mongo mongo) {
-		Assert.notNull(mongo);
+
+		Assert.notNull(mongo, "Mongo must not be null!");
 		this.mongo = mongo;
 	}
 
@@ -84,16 +86,16 @@ public void setPassword(String password) {
 		this.password = password;
 	}
 
-	/**
-	 * Sets the authenticationDatabaseName to use to authenticate with the Mongo database.
-	 * 
-	 * @param authenticationDatabaseName The authenticationDatabaseName to use.
-	 */
-	public void setAuthenticationDatabaseName(String authenticationDatabaseName) {
-		this.authenticationDatabaseName = authenticationDatabaseName;
-	}
-
+	/**
+	 * Sets the authenticationDatabaseName to use to authenticate with the Mongo database.
+	 * 
+	 * @param authenticationDatabaseName The authenticationDatabaseName to use.
+	 */
+	public void setAuthenticationDatabaseName(String authenticationDatabaseName) {
+		this.authenticationDatabaseName = authenticationDatabaseName;
+	}
+
 	DB getDB(String databaseName) {
-		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
+		return MongoDbUtils.getDB(mongo, databaseName, new UserCredentials(username, password), authenticationDatabaseName);
 	}
 }

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

@@ -211,7 +211,7 @@ public MongoTemplate(MongoDbFactory mongoDbFactory) {
 	 */
 	public MongoTemplate(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) {
 
-		Assert.notNull(mongoDbFactory);
+		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
@@ -423,7 +423,7 @@ public void executeQuery(Query query, String collectionName, DocumentCallbackHan
 	protected void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch,
 			CursorPreparer preparer) {
 
-		Assert.notNull(query);
+		Assert.notNull(query, "Query must not be null!");
 
 		DBObject queryObject = queryMapper.getMappedObject(query.getQueryObject(), null);
 		DBObject sortObject = query.getSortObject();
@@ -439,7 +439,7 @@ protected void executeQuery(Query query, String collectionName, DocumentCallback
 
 	public <T> T execute(DbCallback<T> action) {
 
-		Assert.notNull(action);
+		Assert.notNull(action, "DbCallbackmust not be null!");
 
 		try {
 			DB db = this.getDb();
@@ -455,7 +455,7 @@ public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
 
 	public <T> T execute(String collectionName, CollectionCallback<T> callback) {
 
-		Assert.notNull(callback);
+		Assert.notNull(callback, "CollectionCallback must not be null!");
 
 		try {
 			DBCollection collection = getAndPrepareCollection(getDb(), collectionName);
@@ -733,7 +733,8 @@ public <T> T findAndRemove(Query query, Class<T> entityClass, String collectionN
 	}
 
 	public long count(Query query, Class<?> entityClass) {
-		Assert.notNull(entityClass);
+
+		Assert.notNull(entityClass, "Entity class must not be null!");
 		return count(query, entityClass, determineCollectionName(entityClass));
 	}
 
@@ -747,7 +748,8 @@ public long count(final Query query, String collectionName) {
 	 */
 	public long count(Query query, Class<?> entityClass, String collectionName) {
 
-		Assert.hasText(collectionName);
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		
 		final DBObject dbObject = query == null ? null
 				: queryMapper.getMappedObject(query.getQueryObject(),
 						entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
@@ -918,7 +920,7 @@ protected <T> void doInsertAll(Collection<? extends T> listToSave, MongoWriter<T
 
 	protected <T> void doInsertBatch(String collectionName, Collection<? extends T> batchToSave, MongoWriter<T> writer) {
 
-		Assert.notNull(writer);
+		Assert.notNull(writer, "MongoWriter must not be null!");
 
 		List<DBObject> dbObjectList = new ArrayList<DBObject>();
 		for (T o : batchToSave) {
@@ -947,14 +949,14 @@ protected <T> void doInsertBatch(String collectionName, Collection<? extends T>
 
 	public void save(Object objectToSave) {
 
-		Assert.notNull(objectToSave);
+		Assert.notNull(objectToSave, "Object to save must not be null!");
 		save(objectToSave, determineEntityCollectionName(objectToSave));
 	}
 
 	public void save(Object objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave);
-		Assert.hasText(collectionName);
+		Assert.notNull(objectToSave, "Object to save must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 
 		MongoPersistentEntity<?> mongoPersistentEntity = getPersistentEntity(objectToSave.getClass());
 
@@ -1200,7 +1202,7 @@ public WriteResult remove(Object object) {
 
 	public WriteResult remove(Object object, String collection) {
 
-		Assert.hasText(collection);
+		Assert.hasText(collection, "Collection name must not be null or empty!");
 
 		if (object == null) {
 			return null;
@@ -2281,8 +2283,9 @@ private class ReadDbObjectCallback<T> implements DbObjectCallback<T> {
 
 		public ReadDbObjectCallback(EntityReader<? super T, DBObject> reader, Class<T> type, String collectionName) {
 
-			Assert.notNull(reader);
-			Assert.notNull(type);
+			Assert.notNull(reader, "EntityReader must not be null!");
+			Assert.notNull(type, "Entity type must not be null!");
+
 			this.reader = reader;
 			this.type = type;
 			this.collectionName = collectionName;
@@ -2404,7 +2407,9 @@ static class GeoNearResultDbObjectCallback<T> implements DbObjectCallback<GeoRes
 		 * @param delegate must not be {@literal null}.
 		 */
 		public GeoNearResultDbObjectCallback(DbObjectCallback<T> delegate, Metric metric) {
-			Assert.notNull(delegate);
+
+			Assert.notNull(delegate, "DocumentCallback must not be null!");
+
 			this.delegate = delegate;
 			this.metric = metric;
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 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.
@@ -29,6 +29,7 @@
  * @author Tobias Trelle
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Mark Paluch
  * @param <T> The class in which the results are mapped onto.
  * @since 1.3
  */
@@ -46,8 +47,8 @@ public class AggregationResults<T> implements Iterable<T> {
 	 */
 	public AggregationResults(List<T> mappedResults, DBObject rawResults) {
 
-		Assert.notNull(mappedResults);
-		Assert.notNull(rawResults);
+		Assert.notNull(mappedResults, "List of mapped results must not be null!");
+		Assert.notNull(rawResults, "Raw results must not be null!");
 
 		this.mappedResults = Collections.unmodifiableList(mappedResults);
 		this.rawResults = rawResults;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
@@ -23,6 +23,7 @@
  * Conversion registration information.
  * 
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 class ConverterRegistration {
 
@@ -39,7 +40,7 @@ class ConverterRegistration {
 	 */
 	public ConverterRegistration(ConvertiblePair convertiblePair, boolean isReading, boolean isWriting) {
 
-		Assert.notNull(convertiblePair);
+		Assert.notNull(convertiblePair, "ConvertiblePair must not be null!");
 
 		this.convertiblePair = convertiblePair;
 		this.reading = isReading;

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

@@ -89,7 +89,7 @@ public class CustomConversions {
 	 */
 	public CustomConversions(List<?> converters) {
 
-		Assert.notNull(converters);
+		Assert.notNull(converters, "List of converters must not be null!");
 
 		this.readingPairs = new LinkedHashSet<ConvertiblePair>();
 		this.writingPairs = new LinkedHashSet<ConvertiblePair>();
@@ -346,8 +346,8 @@ public Class<?> get() {
 	private static Class<?> getCustomTarget(Class<?> sourceType, Class<?> requestedTargetType,
 			Collection<ConvertiblePair> pairs) {
 
-		Assert.notNull(sourceType);
-		Assert.notNull(pairs);
+		Assert.notNull(sourceType, "Source Class must not be null!");
+		Assert.notNull(pairs, "Collection of ConvertiblePair must not be null!");
 
 		if (requestedTargetType != null && pairs.contains(new ConvertiblePair(sourceType, requestedTargetType))) {
 			return requestedTargetType;

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2011-2017 by the original author(s).
+ * 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -310,7 +310,7 @@ public void doWithAssociation(Association<MongoPersistentProperty> association)
 		return result;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#toDBRef(java.lang.Object, org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
 	 */
@@ -478,7 +478,7 @@ protected void writePropertyInternal(Object obj, DBObject dbo, MongoPersistentPr
 			DBRef dbRefObj = null;
 
 			/*
-			 * If we already have a LazyLoadingProxy, we use it's cached DBRef value instead of 
+			 * If we already have a LazyLoadingProxy, we use it's cached DBRef value instead of
 			 * unnecessarily initializing it only to convert it to a DBRef a few instructions later.
 			 */
 			if (obj instanceof LazyLoadingProxy) {
@@ -825,7 +825,7 @@ private Object getPotentiallyConvertedSimpleRead(Object value, Class<?> target)
 
 	protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
 
-		Assert.notNull(target);
+		Assert.notNull(target, "Target object must not be null!");
 
 		if (target instanceof DBRef) {
 			return (DBRef) target;
@@ -1053,7 +1053,7 @@ public BasicDBList maybeConvertList(Iterable<?> source, TypeInformation<?> typeI
 
 	/**
 	 * Removes the type information from the entire conversion result.
-	 * 
+	 *
 	 * @param object
 	 * @param recursively whether to apply the removal recursively
 	 * @return
@@ -1114,22 +1114,22 @@ private class MongoDbPropertyValueProvider implements PropertyValueProvider<Mong
 		/**
 		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link SpELExpressionEvaluator} and
 		 * {@link ObjectPath}.
-		 * 
+		 *
 		 * @param source must not be {@literal null}.
 		 * @param evaluator must not be {@literal null}.
 		 * @param path can be {@literal null}.
 		 */
 		public MongoDbPropertyValueProvider(DBObject source, SpELExpressionEvaluator evaluator, ObjectPath path) {
 
-			Assert.notNull(source);
-			Assert.notNull(evaluator);
+			Assert.notNull(source, "DBObject must not be null!");
+			Assert.notNull(evaluator, "SpELExpressionEvaluator must not be null!");
 
 			this.source = new DBObjectAccessor(source);
 			this.evaluator = evaluator;
 			this.path = path;
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
 		 */
@@ -1172,7 +1172,7 @@ public ConverterAwareSpELExpressionParameterValueProvider(SpELExpressionEvaluato
 			this.path = path;
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter)
 		 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 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.
@@ -82,7 +82,7 @@ private enum MetaMapping {
 	 */
 	public QueryMapper(MongoConverter converter) {
 
-		Assert.notNull(converter);
+		Assert.notNull(converter, "MongoConverter must not be null!");
 
 		this.conversionService = converter.getConversionService();
 		this.converter = converter;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.
@@ -29,6 +29,7 @@
  * Represents a geospatial sphere value.
  * 
  * @author Thomas Darimont
+ * @author Mark Paluch
  * @since 1.5
  */
 public class Sphere implements Shape {
@@ -46,8 +47,8 @@ public class Sphere implements Shape {
 	@PersistenceConstructor
 	public Sphere(Point center, Distance radius) {
 
-		Assert.notNull(center);
-		Assert.notNull(radius);
+		Assert.notNull(center, "Center point must not be null!");
+		Assert.notNull(radius, "Radius must not be null!");
 		Assert.isTrue(radius.getValue() >= 0, "Radius must not be negative!");
 
 		this.center = center;