From 3e048a6dca493f2199aa201da2d2b88be295bc67 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 31 Jan 2017 11:31:30 +0100 Subject: [PATCH] DATACMNS-985 - Remove references to single-argument assertion methods. --- .../data/auditing/AuditingHandler.java | 2 +- .../data/config/BeanComponentDefinitionBuilder.java | 12 ++++++------ .../convert/ConfigurableTypeInformationMapper.java | 4 ++-- .../data/convert/DefaultTypeMapper.java | 12 ++++++------ .../data/convert/EntityInstantiators.java | 8 ++++---- .../convert/MappingContextTypeInformationMapper.java | 2 +- .../data/domain/jaxb/SpringDataJaxb.java | 4 ++-- src/main/java/org/springframework/data/geo/Box.java | 4 ++-- .../java/org/springframework/data/geo/Circle.java | 4 ++-- .../java/org/springframework/data/geo/GeoResult.java | 4 ++-- .../org/springframework/data/geo/GeoResults.java | 2 +- .../java/org/springframework/data/geo/Point.java | 2 +- .../java/org/springframework/data/geo/Polygon.java | 6 +++--- .../data/history/AnnotationRevisionMetadata.java | 2 +- .../org/springframework/data/history/Revision.java | 4 ++-- .../org/springframework/data/history/Revisions.java | 2 +- .../data/mapping/PreferredConstructor.java | 12 ++++++------ .../data/mapping/context/AbstractMappingContext.java | 2 +- .../context/DefaultPersistentPropertyPath.java | 2 +- .../data/mapping/context/MappingContextEvent.java | 4 ++-- .../mapping/model/AbstractPersistentProperty.java | 4 ++-- .../data/mapping/model/BasicPersistentEntity.java | 12 ++++++------ .../PersistentEntityParameterValueProvider.java | 4 ++-- .../data/mapping/model/SimpleTypeHolder.java | 8 ++++---- .../data/repository/cdi/CdiRepositoryBean.java | 8 ++++---- .../AnnotationRepositoryConfigurationSource.java | 8 ++++---- .../config/DefaultRepositoryConfiguration.java | 4 ++-- .../config/NamedQueriesBeanDefinitionBuilder.java | 4 ++-- .../config/NamedQueriesBeanDefinitionParser.java | 2 +- .../config/RepositoryBeanDefinitionParser.java | 2 +- .../config/RepositoryComponentProvider.java | 4 ++-- .../config/RepositoryConfigurationDelegate.java | 2 +- .../RepositoryConfigurationExtensionSupport.java | 4 ++-- .../config/XmlRepositoryConfigurationSource.java | 4 ++-- .../core/support/AbstractEntityInformation.java | 2 +- .../core/support/DefaultRepositoryInformation.java | 6 +++--- .../core/support/DelegatingEntityInformation.java | 2 +- .../core/support/PropertiesBasedNamedQueries.java | 2 +- .../core/support/ReflectionEntityInformation.java | 2 +- .../core/support/RepositoryFactorySupport.java | 2 +- .../TransactionalRepositoryProxyPostProcessor.java | 4 ++-- .../repository/init/RepositoriesPopulatedEvent.java | 4 ++-- .../init/ResourceReaderRepositoryPopulator.java | 4 ++-- .../data/repository/query/Parameter.java | 2 +- .../data/repository/query/Parameters.java | 2 +- .../query/ParametersParameterAccessor.java | 4 ++-- .../data/repository/query/QueryMethod.java | 2 +- .../data/repository/support/AnnotationAttribute.java | 2 +- .../data/repository/support/MethodParameters.java | 4 ++-- .../data/repository/support/Repositories.java | 2 +- .../data/util/AnnotationDetectionFieldCallback.java | 4 ++-- .../springframework/data/util/TypeDiscoverer.java | 8 ++++---- .../data/util/TypeVariableTypeInformation.java | 2 +- .../java/org/springframework/data/util/Version.java | 6 +++--- .../data/web/SortHandlerMethodArgumentResolver.java | 2 +- 55 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/main/java/org/springframework/data/auditing/AuditingHandler.java b/src/main/java/org/springframework/data/auditing/AuditingHandler.java index 5210104d9..813c4b83c 100644 --- a/src/main/java/org/springframework/data/auditing/AuditingHandler.java +++ b/src/main/java/org/springframework/data/auditing/AuditingHandler.java @@ -82,7 +82,7 @@ public class AuditingHandler implements InitializingBean { */ public void setAuditorAware(final AuditorAware auditorAware) { - Assert.notNull(auditorAware); + Assert.notNull(auditorAware, "AuditorAware must not be null!"); this.auditorAware = auditorAware; } diff --git a/src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java b/src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java index 755dc231b..1466704eb 100644 --- a/src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java +++ b/src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java @@ -43,8 +43,8 @@ public class BeanComponentDefinitionBuilder { */ public BeanComponentDefinitionBuilder(Element defaultSource, ParserContext context) { - Assert.notNull(defaultSource); - Assert.notNull(context); + Assert.notNull(defaultSource, "DefaultSource must not be null!"); + Assert.notNull(context, "Context must not be null!"); this.defaultSource = defaultSource; this.context = context; @@ -58,7 +58,7 @@ public class BeanComponentDefinitionBuilder { */ public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder) { - Assert.notNull(builder); + Assert.notNull(builder, "Builder must not be null!"); AbstractBeanDefinition definition = builder.getRawBeanDefinition(); String name = BeanDefinitionReaderUtils.generateBeanName(definition, context.getRegistry(), context.isNested()); @@ -76,7 +76,7 @@ public class BeanComponentDefinitionBuilder { */ public BeanComponentDefinition getComponentIdButFallback(BeanDefinitionBuilder builder, String fallback) { - Assert.hasText(fallback); + Assert.hasText(fallback, "Fallback component id must not be null or empty!"); String id = defaultSource.getAttribute("id"); return getComponent(builder, StringUtils.hasText(id) ? id : fallback); @@ -104,8 +104,8 @@ public class BeanComponentDefinitionBuilder { */ public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder, String name, Object rawSource) { - Assert.notNull(builder); - Assert.hasText(name); + Assert.notNull(builder, "Builder must not be null!"); + Assert.hasText(name, "Name of bean must not be null or empty!"); AbstractBeanDefinition definition = builder.getRawBeanDefinition(); definition.setSource(context.extractSource(rawSource)); diff --git a/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java index ea4b105e0..df3c13150 100644 --- a/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java @@ -37,13 +37,13 @@ public class ConfigurableTypeInformationMapper implements TypeInformationMapper private final Map, Object> typeMap; /** - * Creates a new {@link ConfigurableTypeMapper} for the given type map. + * Creates a new {@link ConfigurableTypeInformationMapper} for the given type map. * * @param sourceTypeMap must not be {@literal null}. */ public ConfigurableTypeInformationMapper(Map, String> sourceTypeMap) { - Assert.notNull(sourceTypeMap); + Assert.notNull(sourceTypeMap, "SourceTypeMap must not be null!"); this.typeMap = new HashMap, Object>(sourceTypeMap.size()); for (Entry, String> entry : sourceTypeMap.entrySet()) { diff --git a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java index 87abbef21..9e191073d 100644 --- a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java +++ b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java @@ -77,8 +77,8 @@ public class DefaultTypeMapper implements TypeMapper { MappingContext, ?> mappingContext, List additionalMappers) { - Assert.notNull(accessor); - Assert.notNull(additionalMappers); + Assert.notNull(accessor, "Accessor must not be null!"); + Assert.notNull(additionalMappers, "AdditionalMappers must not be null!"); List mappers = new ArrayList(additionalMappers.size() + 1); if (mappingContext != null) { @@ -97,7 +97,7 @@ public class DefaultTypeMapper implements TypeMapper { */ public TypeInformation readType(S source) { - Assert.notNull(source); + Assert.notNull(source, "Source object must not be null!"); Object alias = accessor.readAliasFrom(source); return alias == null ? null : getFromCacheOrCreate(alias); @@ -138,7 +138,7 @@ public class DefaultTypeMapper implements TypeMapper { @SuppressWarnings("unchecked") public TypeInformation readType(S source, TypeInformation basicType) { - Assert.notNull(source); + Assert.notNull(source, "Source object must not be null!"); Class documentsTargetType = getDefaultedTypeToBeUsed(source); if (documentsTargetType == null) { @@ -198,7 +198,7 @@ public class DefaultTypeMapper implements TypeMapper { */ public void writeType(TypeInformation info, S sink) { - Assert.notNull(info); + Assert.notNull(info, "TypeInformation must not be null!"); Object alias = getAliasFor(info); if (alias != null) { @@ -215,7 +215,7 @@ public class DefaultTypeMapper implements TypeMapper { */ protected final Object getAliasFor(TypeInformation info) { - Assert.notNull(info); + Assert.notNull(info, "TypeInformation must not be null!"); for (TypeInformationMapper mapper : mappers) { Object alias = mapper.createAliasFor(info); diff --git a/src/main/java/org/springframework/data/convert/EntityInstantiators.java b/src/main/java/org/springframework/data/convert/EntityInstantiators.java index 77cad6453..14fad8a54 100644 --- a/src/main/java/org/springframework/data/convert/EntityInstantiators.java +++ b/src/main/java/org/springframework/data/convert/EntityInstantiators.java @@ -62,14 +62,14 @@ public class EntityInstantiators { * Creates a new {@link EntityInstantiator} using the given fallback {@link EntityInstantiator} and the given custom * ones. * - * @param fallback must not be {@literal null}. + * @param defaultInstantiator must not be {@literal null}. * @param customInstantiators must not be {@literal null}. */ public EntityInstantiators(EntityInstantiator defaultInstantiator, Map, EntityInstantiator> customInstantiators) { - Assert.notNull(defaultInstantiator); - Assert.notNull(customInstantiators); + Assert.notNull(defaultInstantiator, "DefaultInstantiator must not be null!"); + Assert.notNull(customInstantiators, "CustomInstantiators must not be null!"); this.fallback = defaultInstantiator; this.customInstantiators = customInstantiators; @@ -83,7 +83,7 @@ public class EntityInstantiators { */ public EntityInstantiator getInstantiatorFor(PersistentEntity entity) { - Assert.notNull(entity); + Assert.notNull(entity, "Entity must not be null!"); Class type = entity.getType(); if (!customInstantiators.containsKey(type)) { diff --git a/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java index b8965e739..1e7f4e86b 100644 --- a/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java @@ -46,7 +46,7 @@ public class MappingContextTypeInformationMapper implements TypeInformationMappe */ public MappingContextTypeInformationMapper(MappingContext, ?> mappingContext) { - Assert.notNull(mappingContext); + Assert.notNull(mappingContext, "MappingContext must not be null!"); this.typeMap = new ConcurrentHashMap, CacheValue>(); this.mappingContext = mappingContext; diff --git a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java index ec8d0b707..87f807ef1 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java @@ -110,7 +110,7 @@ public abstract class SpringDataJaxb { */ public static List unmarshal(Collection source, XmlAdapter adapter) { - Assert.notNull(adapter); + Assert.notNull(adapter, "Adapter must not be null!"); if (source == null || source.isEmpty()) { return Collections.emptyList(); @@ -138,7 +138,7 @@ public abstract class SpringDataJaxb { */ public static List marshal(Iterable source, XmlAdapter adapter) { - Assert.notNull(adapter); + Assert.notNull(adapter, "Adapter must not be null!"); if (source == null) { return Collections.emptyList(); diff --git a/src/main/java/org/springframework/data/geo/Box.java b/src/main/java/org/springframework/data/geo/Box.java index 670ad8e54..21b7565a3 100644 --- a/src/main/java/org/springframework/data/geo/Box.java +++ b/src/main/java/org/springframework/data/geo/Box.java @@ -40,8 +40,8 @@ public class Box implements Shape { */ public Box(Point first, Point second) { - Assert.notNull(first); - Assert.notNull(second); + Assert.notNull(first, "First point must not be null!"); + Assert.notNull(second, "Second point must not be null!"); this.first = first; this.second = second; diff --git a/src/main/java/org/springframework/data/geo/Circle.java b/src/main/java/org/springframework/data/geo/Circle.java index daa275486..e075c1b0f 100644 --- a/src/main/java/org/springframework/data/geo/Circle.java +++ b/src/main/java/org/springframework/data/geo/Circle.java @@ -42,8 +42,8 @@ public class Circle implements Shape { @PersistenceConstructor public Circle(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; diff --git a/src/main/java/org/springframework/data/geo/GeoResult.java b/src/main/java/org/springframework/data/geo/GeoResult.java index aadc9f0b0..5be1e2eb6 100644 --- a/src/main/java/org/springframework/data/geo/GeoResult.java +++ b/src/main/java/org/springframework/data/geo/GeoResult.java @@ -41,8 +41,8 @@ public class GeoResult implements Serializable { */ public GeoResult(T content, Distance distance) { - Assert.notNull(content); - Assert.notNull(distance); + Assert.notNull(content, "Content must not be null!"); + Assert.notNull(distance, "Distance must not be null!"); this.content = content; this.distance = distance; diff --git a/src/main/java/org/springframework/data/geo/GeoResults.java b/src/main/java/org/springframework/data/geo/GeoResults.java index c9e5d571f..cac941c36 100644 --- a/src/main/java/org/springframework/data/geo/GeoResults.java +++ b/src/main/java/org/springframework/data/geo/GeoResults.java @@ -68,7 +68,7 @@ public class GeoResults implements Iterable>, Serializable { @PersistenceConstructor public GeoResults(List> results, Distance averageDistance) { - Assert.notNull(results); + Assert.notNull(results, "Results must not be null!"); this.results = results; this.averageDistance = averageDistance; diff --git a/src/main/java/org/springframework/data/geo/Point.java b/src/main/java/org/springframework/data/geo/Point.java index a56f45373..74b4de125 100644 --- a/src/main/java/org/springframework/data/geo/Point.java +++ b/src/main/java/org/springframework/data/geo/Point.java @@ -55,7 +55,7 @@ public class Point implements Serializable { */ public Point(Point point) { - Assert.notNull(point); + Assert.notNull(point, "Source point must not be null!"); this.x = point.x; this.y = point.y; diff --git a/src/main/java/org/springframework/data/geo/Polygon.java b/src/main/java/org/springframework/data/geo/Polygon.java index bbff70d78..e6e798a5e 100644 --- a/src/main/java/org/springframework/data/geo/Polygon.java +++ b/src/main/java/org/springframework/data/geo/Polygon.java @@ -51,7 +51,7 @@ public class Polygon implements Iterable, Shape { Assert.notNull(x, "X coordinate must not be null!"); Assert.notNull(y, "Y coordinate must not be null!"); Assert.notNull(z, "Z coordinate must not be null!"); - Assert.notNull(others); + Assert.notNull(others, "Others must not be null!"); List points = new ArrayList(3 + others.length); points.addAll(Arrays.asList(x, y, z)); @@ -68,13 +68,13 @@ public class Polygon implements Iterable, Shape { @PersistenceConstructor public Polygon(List points) { - Assert.notNull(points); + Assert.notNull(points, "Points must not be null!"); List pointsToSet = new ArrayList(points.size()); for (Point point : points) { - Assert.notNull(point); + Assert.notNull(point, "Single Point in Polygon must not be null!"); pointsToSet.add(point); } diff --git a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java index e00cd95e5..551b9dba6 100755 --- a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java +++ b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java @@ -45,7 +45,7 @@ public class AnnotationRevisionMetadata> implem public AnnotationRevisionMetadata(final Object entity, Class revisionNumberAnnotation, Class revisionTimeStampAnnotation) { - Assert.notNull(entity); + Assert.notNull(entity, "Entity must not be null!"); this.entity = entity; if (revisionNumberAnnotation != null) { diff --git a/src/main/java/org/springframework/data/history/Revision.java b/src/main/java/org/springframework/data/history/Revision.java index 4aeca314d..b31a11e14 100755 --- a/src/main/java/org/springframework/data/history/Revision.java +++ b/src/main/java/org/springframework/data/history/Revision.java @@ -37,8 +37,8 @@ public final class Revision, T> implements Comp */ public Revision(RevisionMetadata metadata, T entity) { - Assert.notNull(metadata); - Assert.notNull(entity); + Assert.notNull(metadata, "Metadata must not be null!"); + Assert.notNull(entity, "Entity must not be null!"); this.metadata = metadata; this.entity = entity; diff --git a/src/main/java/org/springframework/data/history/Revisions.java b/src/main/java/org/springframework/data/history/Revisions.java index 2732da733..c5bca7192 100644 --- a/src/main/java/org/springframework/data/history/Revisions.java +++ b/src/main/java/org/springframework/data/history/Revisions.java @@ -51,7 +51,7 @@ public class Revisions, T> implements Iterable< */ private Revisions(List> revisions, boolean latestLast) { - Assert.notNull(revisions); + Assert.notNull(revisions, "Revisions must not be null!"); this.revisions = new ArrayList>(revisions); this.latestLast = latestLast; diff --git a/src/main/java/org/springframework/data/mapping/PreferredConstructor.java b/src/main/java/org/springframework/data/mapping/PreferredConstructor.java index 9507eff32..708257c2d 100644 --- a/src/main/java/org/springframework/data/mapping/PreferredConstructor.java +++ b/src/main/java/org/springframework/data/mapping/PreferredConstructor.java @@ -58,8 +58,8 @@ public class PreferredConstructor> { */ public PreferredConstructor(Constructor constructor, Parameter... parameters) { - Assert.notNull(constructor); - Assert.notNull(parameters); + Assert.notNull(constructor, "Constructor must not be null!"); + Assert.notNull(parameters, "Parameters must not be null!"); ReflectionUtils.makeAccessible(constructor); this.constructor = constructor; @@ -122,7 +122,7 @@ public class PreferredConstructor> { */ public boolean isConstructorParameter(PersistentProperty property) { - Assert.notNull(property); + Assert.notNull(property, "Property must not be null!"); try { @@ -166,7 +166,7 @@ public class PreferredConstructor> { */ public boolean isEnclosingClassParameter(Parameter parameter) { - Assert.notNull(parameter); + Assert.notNull(parameter, "Parameter must not be null!"); if (parameters.isEmpty() || !parameter.isEnclosingClassParameter()) { return false; @@ -203,8 +203,8 @@ public class PreferredConstructor> { */ public Parameter(String name, TypeInformation type, Annotation[] annotations, PersistentEntity entity) { - Assert.notNull(type); - Assert.notNull(annotations); + Assert.notNull(type, "Type must not be null!"); + Assert.notNull(annotations, "Annotations must not be null!"); this.name = name; this.type = type; diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java index 373899921..274ebb8ed 100644 --- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java +++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java @@ -160,7 +160,7 @@ public abstract class AbstractMappingContext type) { - Assert.notNull(type); + Assert.notNull(type, "Type must not be null!"); try { read.lock(); diff --git a/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java b/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java index 3086bf34e..7b0ae4415 100644 --- a/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java +++ b/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java @@ -51,7 +51,7 @@ class DefaultPersistentPropertyPath> implements */ public DefaultPersistentPropertyPath(List properties) { - Assert.notNull(properties); + Assert.notNull(properties, "Properties must not be null!"); this.properties = properties; } diff --git a/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java b/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java index 4cb7e1277..86da5934a 100644 --- a/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java +++ b/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java @@ -46,8 +46,8 @@ public class MappingContextEvent, P extends Per super(source); - Assert.notNull(source); - Assert.notNull(entity); + Assert.notNull(source, "Source MappingContext must not be null!"); + Assert.notNull(entity, "Entity must not be null!"); this.source = source; this.entity = entity; diff --git a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java index 41a85d375..c36e1ad04 100644 --- a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java +++ b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java @@ -58,8 +58,8 @@ public abstract class AbstractPersistentProperty

public AbstractPersistentProperty(Field field, PropertyDescriptor propertyDescriptor, PersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { - Assert.notNull(simpleTypeHolder); - Assert.notNull(owner); + Assert.notNull(simpleTypeHolder, "SimpleTypeHolder must not be null!"); + Assert.notNull(owner, "Owner entity must not be null!"); this.name = field == null ? propertyDescriptor.getName() : field.getName(); this.rawType = field == null ? propertyDescriptor.getPropertyType() : field.getType(); diff --git a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java index c1c23fb62..1d2e318ca 100644 --- a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java +++ b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java @@ -96,7 +96,7 @@ public class BasicPersistentEntity> implement */ public BasicPersistentEntity(TypeInformation information, Comparator

comparator) { - Assert.notNull(information); + Assert.notNull(information, "Information must not be null!"); this.information = information; this.properties = new ArrayList

(); @@ -188,7 +188,7 @@ public class BasicPersistentEntity> implement */ public void addPersistentProperty(P property) { - Assert.notNull(property); + Assert.notNull(property, "Property must not be null!"); if (properties.contains(property)) { return; @@ -323,7 +323,7 @@ public class BasicPersistentEntity> implement */ public void doWithProperties(PropertyHandler

handler) { - Assert.notNull(handler); + Assert.notNull(handler, "Handler must not be null!"); for (P property : properties) { if (!property.isTransient() && !property.isAssociation()) { @@ -339,7 +339,7 @@ public class BasicPersistentEntity> implement @Override public void doWithProperties(SimplePropertyHandler handler) { - Assert.notNull(handler); + Assert.notNull(handler, "Handler must not be null!"); for (PersistentProperty property : properties) { if (!property.isTransient() && !property.isAssociation()) { @@ -354,7 +354,7 @@ public class BasicPersistentEntity> implement */ public void doWithAssociations(AssociationHandler

handler) { - Assert.notNull(handler); + Assert.notNull(handler, "Handler must not be null!"); for (Association

association : associations) { handler.doWithAssociation(association); @@ -367,7 +367,7 @@ public class BasicPersistentEntity> implement */ public void doWithAssociations(SimpleAssociationHandler handler) { - Assert.notNull(handler); + Assert.notNull(handler, "Handler must not be null!"); for (Association> association : associations) { handler.doWithAssociation(association); diff --git a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java index 7daeb33bf..5df720dc2 100644 --- a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java +++ b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java @@ -47,8 +47,8 @@ public class PersistentEntityParameterValueProvider

entity, PropertyValueProvider

provider, Object parent) { - Assert.notNull(entity); - Assert.notNull(provider); + Assert.notNull(entity, "Entity must not be null!"); + Assert.notNull(provider, "Provider must not be null!"); this.entity = entity; this.provider = provider; diff --git a/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java b/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java index 9dbf067ad..ca570c0bb 100644 --- a/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java +++ b/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java @@ -86,7 +86,7 @@ public class SimpleTypeHolder { */ public SimpleTypeHolder(Set> customSimpleTypes, boolean registerDefaults) { - Assert.notNull(customSimpleTypes); + Assert.notNull(customSimpleTypes, "CustomSimpleTypes must not be null!"); this.simpleTypes = new CopyOnWriteArraySet>(customSimpleTypes); if (registerDefaults) { @@ -102,8 +102,8 @@ public class SimpleTypeHolder { */ public SimpleTypeHolder(Set> customSimpleTypes, SimpleTypeHolder source) { - Assert.notNull(customSimpleTypes); - Assert.notNull(source); + Assert.notNull(customSimpleTypes, "CustomSimpleTypes must not be null!"); + Assert.notNull(source, "SourceTypeHolder must not be null!"); this.simpleTypes = new CopyOnWriteArraySet>(customSimpleTypes); this.simpleTypes.addAll(source.simpleTypes); @@ -117,7 +117,7 @@ public class SimpleTypeHolder { */ public boolean isSimpleType(Class type) { - Assert.notNull(type); + Assert.notNull(type, "Type must not be null!"); if (Object.class.equals(type) || simpleTypes.contains(type)) { return true; diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java index a65a8f459..49590d198 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java @@ -86,10 +86,10 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl public CdiRepositoryBean(Set qualifiers, Class repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) { - Assert.notNull(qualifiers); - Assert.notNull(beanManager); - Assert.notNull(repositoryType); - Assert.isTrue(repositoryType.isInterface()); + Assert.notNull(qualifiers, "Qualifiers must not be null!"); + Assert.notNull(beanManager, "BeanManager must not be null!"); + Assert.notNull(repositoryType, "Repoitory type must not be null!"); + Assert.isTrue(repositoryType.isInterface(), "RepositoryType must be an interface!"); this.qualifiers = qualifiers; this.repositoryType = repositoryType; diff --git a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java index 49cb77933..60a028ddf 100644 --- a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java @@ -67,7 +67,7 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura * Creates a new {@link AnnotationRepositoryConfigurationSource} from the given {@link AnnotationMetadata} and * annotation. * - * @param configMetadata must not be {@literal null}. + * @param metadata must not be {@literal null}. * @param annotation must not be {@literal null}. * @param resourceLoader must not be {@literal null}. * @param environment @@ -77,9 +77,9 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura super(environment); - Assert.notNull(metadata); - Assert.notNull(annotation); - Assert.notNull(resourceLoader); + Assert.notNull(metadata, "Metadata must not be null!"); + Assert.notNull(annotation, "Annotation must not be null!"); + Assert.notNull(resourceLoader, "ResourceLoader must not be null!"); this.attributes = new AnnotationAttributes(metadata.getAnnotationAttributes(annotation.getName())); this.enableAnnotationMetadata = new StandardAnnotationMetadata(annotation); diff --git a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java index bbf858a6e..b1bb3a9ce 100644 --- a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java +++ b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java @@ -44,8 +44,8 @@ public class DefaultRepositoryConfiguration delegates) { - Assert.notNull(delegates); + Assert.notNull(delegates, "TypeFilter deleages must not be null!"); this.delegates = delegates; } diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java index 6b0718d91..85588314e 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java @@ -73,7 +73,7 @@ public class RepositoryConfigurationDelegate { Assert.isTrue(isXml || isAnnotation, "Configuration source must either be an Xml- or an AnnotationBasedConfigurationSource!"); - Assert.notNull(resourceLoader); + Assert.notNull(resourceLoader, "ResourceLoader must not be null!"); RepositoryBeanNameGenerator generator = new RepositoryBeanNameGenerator(); generator.setBeanClassLoader(resourceLoader.getClassLoader()); diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java index 4ec55a0cf..e070032a8 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java @@ -76,8 +76,8 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit public Collection> getRepositoryConfigurations( T configSource, ResourceLoader loader, boolean strictMatchesOnly) { - Assert.notNull(configSource); - Assert.notNull(loader); + Assert.notNull(configSource, "ConfigSource must not be null!"); + Assert.notNull(loader, "Loader must not be null!"); Set> result = new HashSet>(); diff --git a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java index 2f4f5daa2..861008bee 100644 --- a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java @@ -62,8 +62,8 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou super(environment); - Assert.notNull(element); - Assert.notNull(context); + Assert.notNull(element, "Element must not be null!"); + Assert.notNull(context, "Context must not be null!"); this.element = element; this.context = context; diff --git a/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java index e31d13d0a..3e8a9513b 100644 --- a/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java @@ -38,7 +38,7 @@ public abstract class AbstractEntityInformation impl */ public AbstractEntityInformation(Class domainClass) { - Assert.notNull(domainClass); + Assert.notNull(domainClass, "DomainClass must not be null!"); this.domainClass = domainClass; } diff --git a/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java b/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java index d8f498208..8cabd5e5f 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java @@ -73,8 +73,8 @@ class DefaultRepositoryInformation implements RepositoryInformation { public DefaultRepositoryInformation(RepositoryMetadata metadata, Class repositoryBaseClass, Class customImplementationClass) { - Assert.notNull(metadata); - Assert.notNull(repositoryBaseClass); + Assert.notNull(metadata, "Metadata must not be null!"); + Assert.notNull(repositoryBaseClass, "RepositoryBaseClass must not be null!"); this.metadata = metadata; this.repositoryBaseClass = repositoryBaseClass; @@ -146,7 +146,7 @@ class DefaultRepositoryInformation implements RepositoryInformation { */ private boolean isTargetClassMethod(Method method, Class targetType) { - Assert.notNull(method); + Assert.notNull(method, "Method must not be null!"); if (targetType == null) { return false; diff --git a/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java index a25a6f7c3..7a11e4f68 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java @@ -38,7 +38,7 @@ public class DelegatingEntityInformation implements */ public DelegatingEntityInformation(EntityInformation delegate) { - Assert.notNull(delegate); + Assert.notNull(delegate, "Delegate EnittyInformation must not be null!"); this.delegate = delegate; } diff --git a/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java b/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java index c09502011..770b0b85c 100644 --- a/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java +++ b/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java @@ -37,7 +37,7 @@ public class PropertiesBasedNamedQueries implements NamedQueries { * @param properties */ public PropertiesBasedNamedQueries(Properties properties) { - Assert.notNull(properties); + Assert.notNull(properties, "Properties must not be null!"); this.properties = properties; } diff --git a/src/main/java/org/springframework/data/repository/core/support/ReflectionEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/ReflectionEntityInformation.java index 3d1935a3d..34224de8a 100644 --- a/src/main/java/org/springframework/data/repository/core/support/ReflectionEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/ReflectionEntityInformation.java @@ -58,7 +58,7 @@ public class ReflectionEntityInformation extends Abs public ReflectionEntityInformation(Class domainClass, final Class annotation) { super(domainClass); - Assert.notNull(annotation); + Assert.notNull(annotation, "Annotation must not be null!"); ReflectionUtils.doWithFields(domainClass, new FieldCallback() { public void doWith(Field field) { diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java index e422f7802..c1a733436 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java @@ -153,7 +153,7 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, */ public void addQueryCreationListener(QueryCreationListener listener) { - Assert.notNull(listener); + Assert.notNull(listener, "Listener must not be null!"); this.queryPostProcessors.add(listener); } diff --git a/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java b/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java index bff3e6faa..d43c10d6b 100644 --- a/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java +++ b/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java @@ -70,8 +70,8 @@ class TransactionalRepositoryProxyPostProcessor implements RepositoryProxyPostPr public TransactionalRepositoryProxyPostProcessor(ListableBeanFactory beanFactory, String transactionManagerName, boolean enableDefaultTransaction) { - Assert.notNull(beanFactory); - Assert.notNull(transactionManagerName); + Assert.notNull(beanFactory, "BeanFactory must not be null!"); + Assert.notNull(transactionManagerName, "TransactionManagerName must not be null!"); this.beanFactory = beanFactory; this.transactionManagerName = transactionManagerName; diff --git a/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java b/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java index d819932f7..8c9c654d0 100644 --- a/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java +++ b/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java @@ -43,8 +43,8 @@ public class RepositoriesPopulatedEvent extends ApplicationEvent { super(populator); - Assert.notNull(populator); - Assert.notNull(repositories); + Assert.notNull(populator, "Populator must not be null!"); + Assert.notNull(repositories, "Repositories must not be null!"); this.repositories = repositories; } diff --git a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java index e560c5755..9acc90a23 100644 --- a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java +++ b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java @@ -67,7 +67,7 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A */ public ResourceReaderRepositoryPopulator(ResourceReader reader, ClassLoader classLoader) { - Assert.notNull(reader); + Assert.notNull(reader, "Reader must not be null!"); this.reader = reader; this.classLoader = classLoader; @@ -82,7 +82,7 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A * @throws IOException */ public void setResourceLocation(String location) throws IOException { - Assert.hasText(location); + Assert.hasText(location, "Location must not be null!"); setResources(resolver.getResources(location)); } diff --git a/src/main/java/org/springframework/data/repository/query/Parameter.java b/src/main/java/org/springframework/data/repository/query/Parameter.java index 8b3de4a55..826045a05 100644 --- a/src/main/java/org/springframework/data/repository/query/Parameter.java +++ b/src/main/java/org/springframework/data/repository/query/Parameter.java @@ -54,7 +54,7 @@ public class Parameter { */ protected Parameter(MethodParameter parameter) { - Assert.notNull(parameter); + Assert.notNull(parameter, "MethodParameter must not be null!"); this.parameter = parameter; this.parameterType = potentiallyUnwrapParameterType(parameter); diff --git a/src/main/java/org/springframework/data/repository/query/Parameters.java b/src/main/java/org/springframework/data/repository/query/Parameters.java index 3afb3ffbd..a72593a7c 100644 --- a/src/main/java/org/springframework/data/repository/query/Parameters.java +++ b/src/main/java/org/springframework/data/repository/query/Parameters.java @@ -60,7 +60,7 @@ public abstract class Parameters, T extends Parameter */ public Parameters(Method method) { - Assert.notNull(method); + Assert.notNull(method, "Method must not be null!"); List> types = Arrays.asList(method.getParameterTypes()); diff --git a/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java b/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java index ddeb5db57..61c362789 100644 --- a/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java +++ b/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java @@ -42,8 +42,8 @@ public class ParametersParameterAccessor implements ParameterAccessor { */ public ParametersParameterAccessor(Parameters parameters, Object[] values) { - Assert.notNull(parameters); - Assert.notNull(values); + Assert.notNull(parameters, "Parameters must not be null!"); + Assert.notNull(values, "Values must not be null!"); Assert.isTrue(parameters.getNumberOfParameters() == values.length, "Invalid number of parameters given!"); diff --git a/src/main/java/org/springframework/data/repository/query/QueryMethod.java b/src/main/java/org/springframework/data/repository/query/QueryMethod.java index 3e876764d..12a28e4e9 100644 --- a/src/main/java/org/springframework/data/repository/query/QueryMethod.java +++ b/src/main/java/org/springframework/data/repository/query/QueryMethod.java @@ -87,7 +87,7 @@ public class QueryMethod { } } - Assert.notNull(this.parameters); + Assert.notNull(this.parameters, String.format("Parameters extracted from method '%s' must not be null!", method.getName())); if (isPageQuery()) { Assert.isTrue(this.parameters.hasPageableParameter(), diff --git a/src/main/java/org/springframework/data/repository/support/AnnotationAttribute.java b/src/main/java/org/springframework/data/repository/support/AnnotationAttribute.java index 656817389..4b3576a2c 100644 --- a/src/main/java/org/springframework/data/repository/support/AnnotationAttribute.java +++ b/src/main/java/org/springframework/data/repository/support/AnnotationAttribute.java @@ -50,7 +50,7 @@ class AnnotationAttribute { */ public AnnotationAttribute(Class annotationType, String attributeName) { - Assert.notNull(annotationType); + Assert.notNull(annotationType, "AnnotationType must not be null!"); this.annotationType = annotationType; this.attributeName = attributeName; diff --git a/src/main/java/org/springframework/data/repository/support/MethodParameters.java b/src/main/java/org/springframework/data/repository/support/MethodParameters.java index 558f80e94..821574764 100644 --- a/src/main/java/org/springframework/data/repository/support/MethodParameters.java +++ b/src/main/java/org/springframework/data/repository/support/MethodParameters.java @@ -54,7 +54,7 @@ class MethodParameters { */ public MethodParameters(Method method, AnnotationAttribute namingAnnotation) { - Assert.notNull(method); + Assert.notNull(method, "Method must not be null!"); this.parameters = new ArrayList(); for (int i = 0; i < method.getParameterTypes().length; i++) { @@ -122,7 +122,7 @@ class MethodParameters { */ public List getParametersWith(Class annotation) { - Assert.notNull(annotation); + Assert.notNull(annotation, "Annotation must not be null!"); List result = new ArrayList(); for (MethodParameter parameter : getParameters()) { diff --git a/src/main/java/org/springframework/data/repository/support/Repositories.java b/src/main/java/org/springframework/data/repository/support/Repositories.java index f15c49c87..42692124c 100644 --- a/src/main/java/org/springframework/data/repository/support/Repositories.java +++ b/src/main/java/org/springframework/data/repository/support/Repositories.java @@ -72,7 +72,7 @@ public class Repositories implements Iterable> { */ public Repositories(ListableBeanFactory factory) { - Assert.notNull(factory); + Assert.notNull(factory, "Factory must not be null!"); this.beanFactory = factory; this.repositoryFactoryInfos = new HashMap, RepositoryFactoryInformation>(); diff --git a/src/main/java/org/springframework/data/util/AnnotationDetectionFieldCallback.java b/src/main/java/org/springframework/data/util/AnnotationDetectionFieldCallback.java index ddd62ebbf..84ba76449 100755 --- a/src/main/java/org/springframework/data/util/AnnotationDetectionFieldCallback.java +++ b/src/main/java/org/springframework/data/util/AnnotationDetectionFieldCallback.java @@ -42,7 +42,7 @@ public class AnnotationDetectionFieldCallback implements FieldCallback { */ public AnnotationDetectionFieldCallback(Class annotationType) { - Assert.notNull(annotationType); + Assert.notNull(annotationType, "AnnotationType must not be null!"); this.annotationType = annotationType; } @@ -83,7 +83,7 @@ public class AnnotationDetectionFieldCallback implements FieldCallback { @SuppressWarnings("unchecked") public T getValue(Object source) { - Assert.notNull(source); + Assert.notNull(source, "Source object must not be null!"); return field == null ? null : (T) ReflectionUtils.getField(field, source); } } diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java index 52cdc0596..8355db256 100644 --- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java +++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java @@ -91,8 +91,8 @@ class TypeDiscoverer implements TypeInformation { */ protected TypeDiscoverer(Type type, Map, Type> typeVariableMap) { - Assert.notNull(type); - Assert.notNull(typeVariableMap); + Assert.notNull(type, "Type must not be null!"); + Assert.notNull(typeVariableMap, "TypeVariableMap must not be null!"); this.type = type; this.typeVariableMap = typeVariableMap; @@ -447,7 +447,7 @@ class TypeDiscoverer implements TypeInformation { */ public TypeInformation getReturnType(Method method) { - Assert.notNull(method); + Assert.notNull(method, "Method must not be null!"); return createInfo(method.getGenericReturnType()); } @@ -532,7 +532,7 @@ class TypeDiscoverer implements TypeInformation { @Override public TypeInformation specialize(ClassTypeInformation type) { - Assert.isTrue(getType().isAssignableFrom(type.getType())); + Assert.isTrue(getType().isAssignableFrom(type.getType()), String.format("%s must be assignable from %s", getType(), type.getType())); List> arguments = getTypeArguments(); diff --git a/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java b/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java index ec36f9071..b9dd5439b 100644 --- a/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java +++ b/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java @@ -47,7 +47,7 @@ class TypeVariableTypeInformation extends ParentTypeAwareTypeInformation { Map, Type> typeVariableMap) { super(variable, parent, typeVariableMap); - Assert.notNull(variable); + Assert.notNull(variable, "TypeVariable must not be null!"); this.variable = variable; this.owningType = owningType; } diff --git a/src/main/java/org/springframework/data/util/Version.java b/src/main/java/org/springframework/data/util/Version.java index cf2215831..ee2272f54 100644 --- a/src/main/java/org/springframework/data/util/Version.java +++ b/src/main/java/org/springframework/data/util/Version.java @@ -42,8 +42,8 @@ public class Version implements Comparable { */ public Version(int... parts) { - Assert.notNull(parts); - Assert.isTrue(parts.length > 0 && parts.length < 5); + Assert.notNull(parts, "Parts must not be null!"); + Assert.isTrue(parts.length > 0 && parts.length < 5, String.format("Invalid parts length. 0 < %s < 5", parts.length)); this.major = parts[0]; this.minor = parts.length > 1 ? parts[1] : 0; @@ -64,7 +64,7 @@ public class Version implements Comparable { */ public static Version parse(String version) { - Assert.hasText(version); + Assert.hasText(version, "Version must not be null o empty!"); String[] parts = version.trim().split("\\."); int[] intParts = new int[parts.length]; diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java index cc7b0f11d..2c06a081a 100644 --- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java @@ -64,7 +64,7 @@ public class SortHandlerMethodArgumentResolver implements SortArgumentResolver { */ public void setSortParameter(String sortParameter) { - Assert.hasText(sortParameter); + Assert.hasText(sortParameter, "SortParameter must not be null nor empty!"); this.sortParameter = sortParameter; }