DATASOLR-361 - Remove references to single-argument assertion methods.

Author: christophstrobl

src/main/java/org/springframework/data/solr/core/SolrTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -183,7 +183,7 @@ public SolrTemplate(SolrClientFactory solrClientFactory, SolrConverter solrConve
 	 */
 	@Override
 	public <T> T execute(SolrCallback<T> action) {
-		Assert.notNull(action);
+		Assert.notNull(action, "SolrCallback must not be null!");
 
 		try {
 			SolrClient solrClient = this.getSolrClient();
@@ -202,7 +202,7 @@ public <T> T execute(SolrCallback<T> action) {
 	@Override
 	public <T> T execute(String collection, CollectionCallback<T> action) {
 
-		Assert.notNull(action);
+		Assert.notNull(action, "Action must not be null!");
 
 		try {
 

src/main/java/org/springframework/data/solr/core/convert/CustomConversions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2014 the original author or authors.
+ * Copyright 2012 - 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.
@@ -98,7 +98,7 @@ public CustomConversions(List converters) {
 	 * @param conversionService must not be null
 	 */
 	public void registerConvertersIn(GenericConversionService conversionService) {
-		Assert.notNull(conversionService);
+		Assert.notNull(conversionService, "ConversionService must not be null!");
 
 		for (Object converter : converters) {
 			if (converter instanceof Converter) {
@@ -140,13 +140,13 @@ public Class<?> getCustomWriteTarget(Class<?> source) {
 	 * @return
 	 */
 	public Class<?> getCustomWriteTarget(Class<?> sourceType, Class<?> targetType) {
-		Assert.notNull(sourceType);
+		Assert.notNull(sourceType, "SourceType must not be null!");
 		return getCustomTarget(sourceType, targetType, writingPairs);
 	}
 
 	Class<?> getCustomTarget(Class<?> sourceType, Class<?> expectedTargetType, Iterable<ConvertiblePair> pairs) {
-		Assert.notNull(sourceType);
-		Assert.notNull(pairs);
+		Assert.notNull(sourceType, "SourceType must not be null!");
+		Assert.notNull(pairs, "Pairs of ConvertiblePairs must not be null!");
 
 		ConvertiblePair expectedTypePair = new ConvertiblePair(sourceType, expectedTargetType != null ? expectedTargetType
 				: Any.class);
@@ -178,8 +178,8 @@ Class<?> getCustomTarget(Class<?> sourceType, Class<?> expectedTargetType, Itera
 	 * @return true if custom converter registered for source/target type
 	 */
 	public boolean hasCustomReadTarget(Class<?> sourceType, Class<?> targetType) {
-		Assert.notNull(sourceType);
-		Assert.notNull(targetType);
+		Assert.notNull(sourceType, "SourceType must not be null!");
+		Assert.notNull(targetType, "TargetType must not be null!");
 
 		return getCustomReadTarget(sourceType, targetType) != null;
 	}
@@ -252,7 +252,7 @@ static class ConvertibleContext {
 		 * @param isWriting
 		 */
 		public ConvertibleContext(ConvertiblePair convertible, boolean isReading, boolean isWriting) {
-			Assert.notNull(convertible);
+			Assert.notNull(convertible, "ConvertiblePair must not be null!");
 			this.convertible = convertible;
 			this.reading = isReading;
 			this.writing = isWriting;

src/main/java/org/springframework/data/solr/core/convert/MappingSolrConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -53,7 +53,7 @@
 import org.springframework.util.CollectionUtils;
 
 /**
- * Implementation of {@link SolrConverter} to read/write {@link org.apache.solr.common.SolrDocumen}/
+ * Implementation of {@link SolrConverter} to read/write {@link org.apache.solr.common.SolrDocument}/
  * {@link SolrInputDocument}. <br/>
  * 
  * @author Christoph Strobl
@@ -129,7 +129,7 @@ String removeWildcard(String fieldName) {
 
 	public MappingSolrConverter(
 			MappingContext<? extends SolrPersistentEntity<?>, SolrPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
 
 		this.mappingContext = mappingContext;
 	}
@@ -164,7 +164,7 @@ protected <S extends Object> S read(TypeInformation<S> targetTypeInformation, Ma
 		if (source == null) {
 			return null;
 		}
-		Assert.notNull(targetTypeInformation);
+		Assert.notNull(targetTypeInformation, "TargetTypeInformation must not be null!");
 		Class<S> rawType = targetTypeInformation.getType();
 
 		// in case there's a custom conversion for the document
@@ -445,7 +445,7 @@ private <T> T readValue(Object value, TypeInformation<?> type, Object parent) {
 				return null;
 			}
 
-			Assert.notNull(type);
+			Assert.notNull(type, "TypeInformation must not be null!");
 			Class<?> rawType = type.getType();
 			if (hasCustomReadTarget(value.getClass(), rawType)) {
 				return (T) convert(value, rawType);
@@ -600,7 +600,7 @@ private Object readValue(SolrPersistentProperty property, Object o, Object paren
 		}
 
 		private Object readCollection(Collection<?> source, TypeInformation<?> type, Object parent) {
-			Assert.notNull(type);
+			Assert.notNull(type, "Type must not be null!");
 
 			Class<?> collectionType = type.getType();
 			if (CollectionUtils.isEmpty(source)) {

src/main/java/org/springframework/data/solr/core/convert/SolrjConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2014 the original author or authors.
+ * Copyright 2012 - 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.
@@ -92,8 +92,8 @@ public SolrInputDocument convert(Update source) {
 			if (source == null) {
 				return null;
 			}
-			Assert.notNull(source.getIdField());
-			Assert.hasText(source.getIdField().getName());
+			Assert.notNull(source.getIdField(), "Id field must not be null!");
+			Assert.hasText(source.getIdField().getName(), "Name of Id field must not be null nor empty!");
 
 			SolrInputDocument solrInputDocument = new SolrInputDocument();
 			solrInputDocument.addField(source.getIdField().getName(), source.getIdField().getValue());

src/main/java/org/springframework/data/solr/core/query/Criteria.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2014 the original author or authors.
+ * Copyright 2012 - 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.
@@ -497,7 +497,7 @@ public Criteria in(Iterable<?> values) {
 	 * @return
 	 */
 	public Criteria within(Point location, Distance distance) {
-		Assert.notNull(location);
+		Assert.notNull(location, "Location must not be null!");
 		assertPositiveDistanceValue(distance);
 		predicates.add(new Predicate(OperationKey.WITHIN, new Object[] { location,
 				distance != null ? distance : new Distance(0) }));

src/main/java/org/springframework/data/solr/core/query/FacetOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -179,7 +179,7 @@ public final FacetOptions addFacetOnPivot(String... fieldnames) {
 	 * @return
 	 */
 	public final FacetOptions addFacetOnFlieldnames(Collection<String> fieldnames) {
-		Assert.notNull(fieldnames);
+		Assert.notNull(fieldnames, "Fieldnames must not be null!");
 
 		for (String fieldname : fieldnames) {
 			addFacetOnField(fieldname);

src/main/java/org/springframework/data/solr/core/query/FieldWithQueryParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 the original author or authors.
+ * Copyright 2012 - 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.
@@ -36,7 +36,7 @@ public class FieldWithQueryParameters<T extends QueryParameter> extends SimpleFi
 	 */
 	public FieldWithQueryParameters(String fieldname) {
 		super(fieldname);
-		Assert.hasText(fieldname);
+		Assert.hasText(fieldname, "Fieldname must not be null nor empty!");
 	}
 
 	/**
@@ -53,7 +53,7 @@ public T getQueryParameter(String parameterName) {
 	 * @param parameter must not be null
 	 */
 	public void addQueryParameter(T parameter) {
-		Assert.notNull(parameter);
+		Assert.notNull(parameter, "Parameter must not be null!");
 		this.parameterHolder.add(parameter);
 	}
 

src/main/java/org/springframework/data/solr/core/query/HighlightOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -51,7 +51,7 @@ public String getName() {
 	 * @return
 	 */
 	public HighlightOptions addField(Field field) {
-		Assert.notNull(field);
+		Assert.notNull(field, "Field must not be null!");
 		this.fields.add(field);
 		return this;
 	}
@@ -63,7 +63,7 @@ public HighlightOptions addField(Field field) {
 	 * @return
 	 */
 	public HighlightOptions addField(String fieldname) {
-		Assert.hasText(fieldname);
+		Assert.hasText(fieldname, "Fieldname must not be null nor empty!");
 		return addField(new SimpleField(fieldname));
 	}
 
@@ -74,7 +74,7 @@ public HighlightOptions addField(String fieldname) {
 	 * @return
 	 */
 	public HighlightOptions addField(String... fieldnames) {
-		Assert.notNull(fieldnames);
+		Assert.notNull(fieldnames, "Fieldnames must not be null!");
 
 		for (String fieldname : fieldnames) {
 			addField(fieldname);
@@ -89,7 +89,7 @@ public HighlightOptions addField(String... fieldnames) {
 	 * @return
 	 */
 	public HighlightOptions addFields(Collection<String> fieldnames) {
-		Assert.notNull(fieldnames);
+		Assert.notNull(fieldnames, "Fieldnames must not be null!");
 
 		for (String fieldname : fieldnames) {
 			addField(fieldname);
@@ -231,7 +231,7 @@ public HighlightOptions addHighlightParameter(String parameterName, Object value
 	 * @return
 	 */
 	public HighlightOptions addHighlightParameter(HighlightParameter parameter) {
-		Assert.notNull(parameter);
+		Assert.notNull(parameter, "Parameter must not be null!");
 		this.parameterHolder.add(parameter);
 		return this;
 	}

src/main/java/org/springframework/data/solr/core/query/Join.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -94,7 +94,7 @@ public static class Builder {
 		private Join join;
 
 		public Builder(Field from) {
-			Assert.notNull(from);
+			Assert.notNull(from, "From must not be null!");
 
 			join = new Join();
 			join.from = from;
@@ -109,7 +109,7 @@ public Builder(String fieldname) {
 		 * @return completed {@link Join}
 		 */
 		public Join to(Field to) {
-			Assert.notNull(to);
+			Assert.notNull(to, "To must not be null!");
 
 			join.to = to;
 			return this.join;

src/main/java/org/springframework/data/solr/core/query/ParameterHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 the original author or authors.
+ * Copyright 2012 - 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.
@@ -48,7 +48,7 @@ public <S> S getParameterValue(String parameterName) {
 	 * @param queryParameter must not be null
 	 */
 	public void add(T queryParameter) {
-		Assert.notNull(queryParameter);
+		Assert.notNull(queryParameter, "QueryParameter must not be null!");
 		this.parameters.put(queryParameter.getName(), queryParameter);
 	}
 

src/main/java/org/springframework/data/solr/core/query/QueryParameterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 the original author or authors.
+ * Copyright 2012 - 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.
@@ -33,7 +33,7 @@ public class QueryParameterImpl implements QueryParameter {
 	 */
 	public QueryParameterImpl(String name, Object value) {
 		super();
-		Assert.notNull(name);
+		Assert.notNull(name, "Name must not be null!");
 
 		this.name = name;
 		this.value = value;

src/main/java/org/springframework/data/solr/core/query/SimpleQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 the original author or authors.
+ * Copyright 2012 - 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.
@@ -174,7 +174,7 @@ public final <T extends Query> T addProjectionOnFields(String... fieldnames) {
 
 	@Override
 	public final <T extends Query> T setPageRequest(Pageable pageable) {
-		Assert.notNull(pageable);
+		Assert.notNull(pageable, "Pageable must not be null!");
 
 		this.offset = pageable.getOffset();
 		this.rows = pageable.getPageSize();

src/main/java/org/springframework/data/solr/core/query/result/HighlightEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 the original author or authors.
+ * Copyright 2012 - 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.
@@ -37,7 +37,7 @@ public class HighlightEntry<T> {
 	 * @param entity must not be null
 	 */
 	public HighlightEntry(T entity) {
-		Assert.notNull(entity);
+		Assert.notNull(entity, "Entity must not be null!");
 		this.entity = entity;
 	}
 
@@ -88,7 +88,7 @@ public static class Highlight {
 		 * @param snipplets
 		 */
 		Highlight(Field field, List<String> snipplets) {
-			Assert.notNull(field);
+			Assert.notNull(field, "Field must not be null!");
 
 			this.field = field;
 			this.snipplets = snipplets;