Remove punctuation in Exception messages.

Closes #1259.

Author: jxblum

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java

@@ -53,8 +53,8 @@
 @SuppressWarnings("rawtypes")
 class JdbcAggregateChangeExecutionContext {
 
-	private static final String UPDATE_FAILED = "Failed to update entity [%s]. Id [%s] not found in database.";
-	private static final String UPDATE_FAILED_OPTIMISTIC_LOCKING = "Failed to update entity [%s]. The entity was updated since it was rea or it isn't in the database at all.";
+	private static final String UPDATE_FAILED = "Failed to update entity [%s]; Id [%s] not found in database";
+	private static final String UPDATE_FAILED_OPTIMISTIC_LOCKING = "Failed to update entity [%s]; The entity was updated since it was rea or it isn't in the database at all";
 
 	private final MappingContext<? extends RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> context;
 	private final JdbcConverter converter;
@@ -268,7 +268,7 @@ <T> List<T> populateIdsIfNecessary() {
 
 		if (roots.isEmpty()) {
 			throw new IllegalStateException(
-					String.format("Cannot retrieve the resulting instance(s) unless a %s or %s action was successfully executed.",
+					String.format("Cannot retrieve the resulting instance(s) unless a %s or %s action was successfully executed",
 							DbAction.InsertRoot.class.getName(), DbAction.UpdateRoot.class.getName()));
 		}
 
@@ -312,7 +312,7 @@ private PersistentPropertyPath<?> getRelativePath(DbAction<?> action, Persistent
 			return pathToValue;
 		}
 
-		throw new IllegalArgumentException(String.format("DbAction of type %s is not supported.", action.getClass()));
+		throw new IllegalArgumentException(String.format("DbAction of type %s is not supported", action.getClass()));
 	}
 
 	private <T> RelationalPersistentEntity<T> getRequiredPersistentEntity(Class<T> type) {
@@ -331,7 +331,7 @@ private <T> void updateWithoutVersion(DbAction.UpdateRoot<T> update) {
 	private <T> void updateWithVersion(DbAction.UpdateRoot<T> update) {
 
 		Number previousVersion = update.getPreviousVersion();
-		Assert.notNull(previousVersion, "The root aggregate cannot be updated because the version property is null.");
+		Assert.notNull(previousVersion, "The root aggregate cannot be updated because the version property is null");
 
 		if (!accessStrategy.updateWithVersion(update.getEntity(), update.getEntityType(), previousVersion)) {
 
@@ -460,8 +460,8 @@ public List createEmptyInstance() {
 		@Override
 		public List add(@Nullable List list, @Nullable Object qualifier, Object value) {
 
-			Assert.notNull(list, "List must not be null.");
-			Assert.notNull(qualifier, "ListAggregator can't handle a null qualifier.");
+			Assert.notNull(list, "List must not be null");
+			Assert.notNull(qualifier, "ListAggregator can't handle a null qualifier");
 
 			int index = (int) qualifier;
 			if (index >= list.size()) {
@@ -492,7 +492,7 @@ public Map createEmptyInstance() {
 		@Override
 		public Map add(@Nullable Map map, @Nullable Object qualifier, Object value) {
 
-			Assert.notNull(map, "Map must not be null.");
+			Assert.notNull(map, "Map must not be null");
 
 			map.put(qualifier, value);
 			return map;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java

@@ -87,10 +87,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations {
 	public JdbcAggregateTemplate(ApplicationContext publisher, RelationalMappingContext context, JdbcConverter converter,
 			DataAccessStrategy dataAccessStrategy) {
 
-		Assert.notNull(publisher, "ApplicationContext must not be null!");
-		Assert.notNull(context, "RelationalMappingContext must not be null!");
-		Assert.notNull(converter, "RelationalConverter must not be null!");
-		Assert.notNull(dataAccessStrategy, "DataAccessStrategy must not be null!");
+		Assert.notNull(publisher, "ApplicationContext must not be null");
+		Assert.notNull(context, "RelationalMappingContext must not be null");
+		Assert.notNull(converter, "RelationalConverter must not be null");
+		Assert.notNull(dataAccessStrategy, "DataAccessStrategy must not be null");
 
 		this.publisher = publisher;
 		this.context = context;
@@ -115,10 +115,10 @@ public JdbcAggregateTemplate(ApplicationContext publisher, RelationalMappingCont
 	public JdbcAggregateTemplate(ApplicationEventPublisher publisher, RelationalMappingContext context,
 			JdbcConverter converter, DataAccessStrategy dataAccessStrategy) {
 
-		Assert.notNull(publisher, "ApplicationEventPublisher must not be null!");
-		Assert.notNull(context, "RelationalMappingContext must not be null!");
-		Assert.notNull(converter, "RelationalConverter must not be null!");
-		Assert.notNull(dataAccessStrategy, "DataAccessStrategy must not be null!");
+		Assert.notNull(publisher, "ApplicationEventPublisher must not be null");
+		Assert.notNull(context, "RelationalMappingContext must not be null");
+		Assert.notNull(converter, "RelationalConverter must not be null");
+		Assert.notNull(dataAccessStrategy, "DataAccessStrategy must not be null");
 
 		this.publisher = publisher;
 		this.context = context;
@@ -137,23 +137,23 @@ public JdbcAggregateTemplate(ApplicationEventPublisher publisher, RelationalMapp
 	 */
 	public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
 
-		Assert.notNull(entityCallbacks, "Callbacks must not be null.");
+		Assert.notNull(entityCallbacks, "Callbacks must not be null");
 
 		this.entityCallbacks = entityCallbacks;
 	}
 
 	@Override
 	public <T> T save(T instance) {
 
-		Assert.notNull(instance, "Aggregate instance must not be null!");
+		Assert.notNull(instance, "Aggregate instance must not be null");
 
 		return performSave(instance, changeCreatorSelectorForSave(instance));
 	}
 
 	@Override
 	public <T> Iterable<T> saveAll(Iterable<T> instances) {
 
-		Assert.isTrue(instances.iterator().hasNext(), "Aggregate instances must not be empty!");
+		Assert.isTrue(instances.iterator().hasNext(), "Aggregate instances must not be empty");
 
 		return performSaveAll(instances);
 	}
@@ -168,7 +168,7 @@ public <T> Iterable<T> saveAll(Iterable<T> instances) {
 	@Override
 	public <T> T insert(T instance) {
 
-		Assert.notNull(instance, "Aggregate instance must not be null!");
+		Assert.notNull(instance, "Aggregate instance must not be null");
 
 		return performSave(instance, entity -> createInsertChange(prepareVersionForInsert(entity)));
 	}
@@ -183,7 +183,7 @@ public <T> T insert(T instance) {
 	@Override
 	public <T> T update(T instance) {
 
-		Assert.notNull(instance, "Aggregate instance must not be null!");
+		Assert.notNull(instance, "Aggregate instance must not be null");
 
 		return performSave(instance, entity -> createUpdateChange(prepareVersionForUpdate(entity)));
 	}
@@ -199,8 +199,8 @@ public long count(Class<?> domainType) {
 	@Override
 	public <T> T findById(Object id, Class<T> domainType) {
 
-		Assert.notNull(id, "Id must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(id, "Id must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		T entity = accessStrategy.findById(id, domainType);
 		if (entity == null) {
@@ -212,16 +212,16 @@ public <T> T findById(Object id, Class<T> domainType) {
 	@Override
 	public <T> boolean existsById(Object id, Class<T> domainType) {
 
-		Assert.notNull(id, "Id must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(id, "Id must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		return accessStrategy.existsById(id, domainType);
 	}
 
 	@Override
 	public <T> Iterable<T> findAll(Class<T> domainType, Sort sort) {
 
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		Iterable<T> all = accessStrategy.findAll(domainType, sort);
 		return triggerAfterConvert(all);
@@ -230,7 +230,7 @@ public <T> Iterable<T> findAll(Class<T> domainType, Sort sort) {
 	@Override
 	public <T> Page<T> findAll(Class<T> domainType, Pageable pageable) {
 
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		Iterable<T> items = triggerAfterConvert(accessStrategy.findAll(domainType, pageable));
 		List<T> content = StreamSupport.stream(items.spliterator(), false).collect(Collectors.toList());
@@ -241,7 +241,7 @@ public <T> Page<T> findAll(Class<T> domainType, Pageable pageable) {
 	@Override
 	public <T> Iterable<T> findAll(Class<T> domainType) {
 
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		Iterable<T> all = accessStrategy.findAll(domainType);
 		return triggerAfterConvert(all);
@@ -250,8 +250,8 @@ public <T> Iterable<T> findAll(Class<T> domainType) {
 	@Override
 	public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
 
-		Assert.notNull(ids, "Ids must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(ids, "Ids must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		Iterable<T> allById = accessStrategy.findAllById(ids, domainType);
 		return triggerAfterConvert(allById);
@@ -260,8 +260,8 @@ public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
 	@Override
 	public <S> void delete(S aggregateRoot, Class<S> domainType) {
 
-		Assert.notNull(aggregateRoot, "Aggregate root must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(aggregateRoot, "Aggregate root must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		IdentifierAccessor identifierAccessor = context.getRequiredPersistentEntity(domainType)
 				.getIdentifierAccessor(aggregateRoot);
@@ -272,16 +272,16 @@ public <S> void delete(S aggregateRoot, Class<S> domainType) {
 	@Override
 	public <S> void deleteById(Object id, Class<S> domainType) {
 
-		Assert.notNull(id, "Id must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(id, "Id must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		deleteTree(id, null, domainType);
 	}
 
 	@Override
 	public <T> void deleteAllById(Iterable<?> ids, Class<T> domainType) {
 
-		Assert.isTrue(ids.iterator().hasNext(), "Ids must not be empty!");
+		Assert.isTrue(ids.iterator().hasNext(), "Ids must not be empty");
 
 		BatchingAggregateChange<T, DeleteAggregateChange<T>> batchingAggregateChange = BatchingAggregateChange
 				.forDelete(domainType);
@@ -301,7 +301,7 @@ public <T> void deleteAllById(Iterable<?> ids, Class<T> domainType) {
 	@Override
 	public void deleteAll(Class<?> domainType) {
 
-		Assert.notNull(domainType, "Domain type must not be null!");
+		Assert.notNull(domainType, "Domain type must not be null");
 
 		MutableAggregateChange<?> change = createDeletingChange(domainType);
 		executor.executeDelete(change);
@@ -310,7 +310,7 @@ public void deleteAll(Class<?> domainType) {
 	@Override
 	public <T> void deleteAll(Iterable<? extends T> instances, Class<T> domainType) {
 
-		Assert.isTrue(instances.iterator().hasNext(), "Aggregate instances must not be empty!");
+		Assert.isTrue(instances.iterator().hasNext(), "Aggregate instances must not be empty");
 
 		BatchingAggregateChange<T, DeleteAggregateChange<T>> batchingAggregateChange = BatchingAggregateChange
 				.forDelete(domainType);
@@ -335,14 +335,14 @@ private <T> T afterExecute(AggregateChange<T> change, T entityAfterExecution) {
 		Object identifier = context.getRequiredPersistentEntity(change.getEntityType())
 				.getIdentifierAccessor(entityAfterExecution).getIdentifier();
 
-		Assert.notNull(identifier, "After saving the identifier must not be null!");
+		Assert.notNull(identifier, "After saving the identifier must not be null");
 
 		return triggerAfterSave(entityAfterExecution, change);
 	}
 
 	private <T> RootAggregateChange<T> beforeExecute(T aggregateRoot, Function<T, RootAggregateChange<T>> changeCreator) {
 
-		Assert.notNull(aggregateRoot, "Aggregate instance must not be null!");
+		Assert.notNull(aggregateRoot, "Aggregate instance must not be null");
 
 		aggregateRoot = triggerBeforeConvert(aggregateRoot);
 
@@ -375,7 +375,7 @@ private <T> T performSave(T instance, Function<T, RootAggregateChange<T>> change
 
 		Iterator<T> afterExecutionIterator = executor.executeSave(batchingAggregateChange).iterator();
 
-		Assert.isTrue(afterExecutionIterator.hasNext(), "Instances after execution must not be empty!");
+		Assert.isTrue(afterExecutionIterator.hasNext(), "Instances after execution must not be empty");
 
 		return afterExecute(batchingAggregateChange, afterExecutionIterator.next());
 	}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java

@@ -217,7 +217,7 @@ public Object readValue(@Nullable Object value, TypeInformation<?> type) {
 			try {
 				return super.readValue(((Array) value).getArray(), type);
 			} catch (SQLException | ConverterNotFoundException e) {
-				LOG.info("Failed to extract a value of type %s from an Array. Attempting to use standard conversions.", e);
+				LOG.info("Failed to extract a value of type %s from an Array; Attempting to use standard conversions", e);
 			}
 		}
 
@@ -380,7 +380,7 @@ private ReadingContext(PersistentPropertyPathExtension rootPath, ResultSetAccess
 				Object key) {
 			RelationalPersistentEntity<T> entity = (RelationalPersistentEntity<T>) rootPath.getLeafEntity();
 
-			Assert.notNull(entity, "The rootPath must point to an entity.");
+			Assert.notNull(entity, "The rootPath must point to an entity");
 
 			this.entity = entity;
 			this.rootPath = rootPath;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

@@ -148,7 +148,7 @@ public <S> boolean updateWithVersion(S instance, Class<S> domainType, Number pre
 		if (affectedRows == 0) {
 
 			throw new OptimisticLockingFailureException(
-					String.format("Optimistic lock exception on saving entity of type %s.", persistentEntity.getName()));
+					String.format("Optimistic lock exception on saving entity of type %s", persistentEntity.getName()));
 		}
 
 		return true;
@@ -166,7 +166,7 @@ public void delete(Object id, Class<?> domainType) {
 	@Override
 	public <T> void deleteWithVersion(Object id, Class<T> domainType, Number previousVersion) {
 
-		Assert.notNull(id, "Id must not be null.");
+		Assert.notNull(id, "Id must not be null");
 
 		RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(domainType);
 
@@ -176,7 +176,7 @@ public <T> void deleteWithVersion(Object id, Class<T> domainType, Number previou
 
 		if (affectedRows == 0) {
 			throw new OptimisticLockingFailureException(
-					String.format("Optimistic lock exception deleting entity of type %s.", persistentEntity.getName()));
+					String.format("Optimistic lock exception deleting entity of type %s", persistentEntity.getName()));
 		}
 	}
 
@@ -242,7 +242,7 @@ public long count(Class<?> domainType) {
 
 		Long result = operations.getJdbcOperations().queryForObject(sql(domainType).getCount(), Long.class);
 
-		Assert.notNull(result, "The result of a count query must not be null.");
+		Assert.notNull(result, "The result of a count query must not be null");
 
 		return result;
 	}
@@ -287,8 +287,8 @@ public <T> Iterable<T> findAllById(Iterable<?> ids, Class<T> domainType) {
 	public Iterable<Object> findAllByPath(Identifier identifier,
 			PersistentPropertyPath<? extends RelationalPersistentProperty> propertyPath) {
 
-		Assert.notNull(identifier, "identifier must not be null.");
-		Assert.notNull(propertyPath, "propertyPath must not be null.");
+		Assert.notNull(identifier, "identifier must not be null");
+		Assert.notNull(propertyPath, "propertyPath must not be null");
 
 		PersistentPropertyPathExtension path = new PersistentPropertyPathExtension(context, propertyPath);
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultJdbcTypeFactory.java

@@ -63,7 +63,7 @@ public DefaultJdbcTypeFactory(JdbcOperations operations, JdbcArrayColumns arrayC
 	@Override
 	public Array createArray(Object[] value) {
 
-		Assert.notNull(value, "Value must not be null.");
+		Assert.notNull(value, "Value must not be null");
 
 		Class<?> componentType = arrayColumns.getArrayType(value.getClass());
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingBatchInsertStrategy.java

@@ -84,7 +84,7 @@ public Object[] execute(String sql, SqlParameterSource[] sqlParameterSources) {
 			} else {
 				ids[i] = keys.entrySet().stream().findFirst() //
 						.map(Map.Entry::getValue) //
-						.orElseThrow(() -> new IllegalStateException("KeyHolder contains an empty key list."));
+						.orElseThrow(() -> new IllegalStateException("KeyHolder contains an empty key list"));
 			}
 		}
 		return ids;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java

@@ -66,8 +66,8 @@ public static Identifier empty() {
 	 */
 	public static Identifier of(SqlIdentifier name, Object value, Class<?> targetType) {
 
-		Assert.notNull(name, "Name must not be empty!");
-		Assert.notNull(targetType, "Target type must not be null!");
+		Assert.notNull(name, "Name must not be empty");
+		Assert.notNull(targetType, "Target type must not be null");
 
 		return new Identifier(Collections.singletonList(new SingleIdentifierValue(name, value, targetType)));
 	}
@@ -80,7 +80,7 @@ public static Identifier of(SqlIdentifier name, Object value, Class<?> targetTyp
 	 */
 	public static Identifier from(Map<SqlIdentifier, Object> map) {
 
-		Assert.notNull(map, "Map must not be null!");
+		Assert.notNull(map, "Map must not be null");
 
 		if (map.isEmpty()) {
 			return empty();
@@ -108,8 +108,8 @@ public static Identifier from(Map<SqlIdentifier, Object> map) {
 	 */
 	public Identifier withPart(SqlIdentifier name, Object value, Class<?> targetType) {
 
-		Assert.notNull(name, "Name must not be null!");
-		Assert.notNull(targetType, "Target type must not be null!");
+		Assert.notNull(name, "Name must not be null");
+		Assert.notNull(targetType, "Target type must not be null");
 
 		boolean overwritten = false;
 		List<SingleIdentifierValue> keys = new ArrayList<>(this.parts.size() + 1);
@@ -187,8 +187,8 @@ static final class SingleIdentifierValue {
 
 		private SingleIdentifierValue(SqlIdentifier name, @Nullable Object value, Class<?> targetType) {
 
-			Assert.notNull(name, "Name must not be null.");
-			Assert.notNull(targetType, "TargetType must not be null.");
+			Assert.notNull(name, "Name must not be null");
+			Assert.notNull(targetType, "TargetType must not be null");
 
 			this.name = name;
 			this.value = value;