Remove punctuation from Exception messages.

jxblum · jxblum · commit 11f56c4c48ce · 2022-06-08T16:18:50.000-07:00
Closes #1277.
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingRegistrar.java
@@ -51,16 +51,16 @@ protected String getAuditingHandlerBeanName() {
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
 
-		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
 	@Override
 	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
 
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
+		Assert.notNull(configuration, "AuditingConfiguration must not be null");
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
 
@@ -75,8 +75,8 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon
 	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
 			BeanDefinitionRegistry registry) {
 
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
 				.rootBeanDefinition(AuditingEntityCallback.class);
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ReactiveCassandraAuditingRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ReactiveCassandraAuditingRegistrar.java
@@ -51,16 +51,16 @@ protected String getAuditingHandlerBeanName() {
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
 
-		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
 	@Override
 	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
 
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
+		Assert.notNull(configuration, "AuditingConfiguration must not be null");
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveIsNewAwareAuditingHandler.class);
 
@@ -75,8 +75,8 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon
 	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
 			BeanDefinitionRegistry registry) {
 
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java
@@ -634,7 +634,7 @@ private <T> ListenableFuture<EntityWriteResult<T>> doUpdateVersioned(T entity, U
 
 			if (!result.wasApplied()) {
 				throw new OptimisticLockingFailureException(
-						String.format("Cannot save entity %s with version %s to table %s. Has it been modified meanwhile?", toSave,
+						String.format("Cannot save entity %s with version %s to table %s; Has it been modified meanwhile", toSave,
 								source.getVersion(), tableName));
 			}
 		});
@@ -677,7 +677,7 @@ private ListenableFuture<WriteResult> doDeleteVersioned(Object entity, QueryOpti
 
 			if (!result.wasApplied()) {
 				throw new OptimisticLockingFailureException(
-						String.format("Cannot delete entity %s with version %s in table %s. Has it been modified meanwhile?",
+						String.format("Cannot delete entity %s with version %s in table %s; Has it been modified meanwhile",
 								entity, source.getVersion(), tableName));
 			}
 		});
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java
@@ -244,7 +244,7 @@ private void assertNotQueryOptions(Iterable<?> entities) {
 		for (Object entity : entities) {
 			if (entity instanceof QueryOptions) {
 				throw new IllegalArgumentException(
-						String.format("%s must not be used as entity. Please make sure to call the appropriate method accepting %s",
+						String.format("%s must not be used as entity; Please make sure to call the appropriate method accepting %s",
 								ClassUtils.getDescriptiveType(entity), ClassUtils.getShortName(entity.getClass())));
 			}
 		}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java
@@ -656,7 +656,7 @@ private <T> EntityWriteResult<T> doUpdateVersioned(T entity, UpdateOptions optio
 
 			if (!result.wasApplied()) {
 				throw new OptimisticLockingFailureException(
-						String.format("Cannot save entity %s with version %s to table %s. Has it been modified meanwhile?", toSave,
+						String.format("Cannot save entity %s with version %s to table %s; Has it been modified meanwhile", toSave,
 								source.getVersion(), tableName));
 			}
 		});
@@ -700,7 +700,7 @@ private WriteResult doDeleteVersioned(SimpleStatement statement, Object entity,
 
 			if (!result.wasApplied()) {
 				throw new OptimisticLockingFailureException(
-						String.format("Cannot delete entity %s with version %s in table %s. Has it been modified meanwhile?",
+						String.format("Cannot delete entity %s with version %s in table %s; Has it been modified meanwhile",
 								entity, source.getVersion(), tableName));
 			}
 		});
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupport.java
@@ -124,7 +124,7 @@ public T oneValue() {
 
 			if (result.size() > 1) {
 				throw new IncorrectResultSizeDataAccessException(
-						String.format("Query [%s] returned non unique result.", this.query), 1);
+						String.format("Query [%s] returned non unique result", this.query), 1);
 			}
 
 			return result.iterator().next();
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java
@@ -140,10 +140,10 @@ private static String getMessage(Statement<?> statement) {
 		String cql = QueryExtractorDelegate.getCql(statement);
 
 		if (StringUtils.hasText(cql)) {
-			return String.format("Cannot prepare statement %s (%s). Statement must be a SimpleStatement.", cql, statement);
+			return String.format("Cannot prepare statement %s (%s); Statement must be a SimpleStatement", cql, statement);
 		}
 
-		return String.format("Cannot prepare statement %s. Statement must be a SimpleStatement.", statement);
+		return String.format("Cannot prepare statement %s; Statement must be a SimpleStatement", statement);
 	}
 
 	enum Mapper {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java
@@ -333,7 +333,7 @@ private void assertNotQueryOptions(Iterable<?> entities) {
 		for (Object entity : entities) {
 			if (entity instanceof QueryOptions) {
 				throw new IllegalArgumentException(
-						String.format("%s must not be used as entity. Please make sure to call the appropriate method accepting %s",
+						String.format("%s must not be used as entity; Please make sure to call the appropriate method accepting %s",
 								ClassUtils.getDescriptiveType(entity), ClassUtils.getShortName(entity.getClass())));
 			}
 		}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java
@@ -630,7 +630,7 @@ private <T> Mono<EntityWriteResult<T>> doUpdateVersioned(T entity, UpdateOptions
 			if (!result.wasApplied()) {
 
 				sink.error(new OptimisticLockingFailureException(
-						String.format("Cannot save entity %s with version %s to table %s. Has it been modified meanwhile?", toSave,
+						String.format("Cannot save entity %s with version %s to table %s; Has it been modified meanwhile", toSave,
 								source.getVersion(), tableName)));
 
 				return;
@@ -678,7 +678,7 @@ private Mono<WriteResult> doDeleteVersioned(SimpleStatement delete, Object entit
 			if (!result.wasApplied()) {
 
 				sink.error(new OptimisticLockingFailureException(
-						String.format("Cannot delete entity %s with version %s in table %s. Has it been modified meanwhile?",
+						String.format("Cannot delete entity %s with version %s in table %s; Has it been modified meanwhile",
 								entity, source.getVersion(), tableName)));
 
 				return;
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupport.java
@@ -127,7 +127,7 @@ public Mono<T> one() {
 						}
 
 						sink.error(new IncorrectResultSizeDataAccessException(
-								String.format("Query [%s] returned non unique result.", this.query), 1));
+								String.format("Query [%s] returned non unique result", this.query), 1));
 					});
 		}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/IndexSpecificationFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/IndexSpecificationFactory.java
@@ -109,7 +109,7 @@ static List<CreateIndexSpecification> createIndexSpecifications(CassandraPersist
 						|| (keyIndex != null && valueIndex != null)) {
 
 					throw new MappingException("Multiple index declarations for " + property
-							+ " found. A map index must be either declared for entries, keys or values.");
+							+ " found; A map index must be either declared for entries, keys or values");
 				}
 
 				if (keyIndex != null) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java
@@ -480,7 +480,7 @@ protected <S> S doReadEntity(ConversionContext context, CassandraValueProvider v
 
 		if (entity == null) {
 			throw new MappingException(
-					String.format("Expected to read %s into type %s but didn't find a PersistentEntity for the latter!",
+					String.format("Expected to read %s into type %s but didn't find a PersistentEntity for the latter",
 							rawSourceType.getSimpleName(), rawType.getName()));
 		}
 
@@ -1327,7 +1327,7 @@ public <S extends Object> S convert(Object source, TypeInformation<? extends S>
 				if (!Object.class.equals(rawType)) {
 					if (!rawType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawType)) {
 						throw new MappingException(String.format(
-								"Cannot convert %1$s of type %2$s into an instance of %3$s! Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions.",
+								"Cannot convert %1$s of type %2$s into an instance of %3$s; Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions",
 								source, source.getClass(), rawType));
 					}
 				}
@@ -1415,15 +1415,15 @@ public <T> T getParameterValue(Parameter<T, CassandraPersistentProperty> paramet
 			String name = parameter.getName();
 
 			if (name == null) {
-				throw new MappingException(String.format("Parameter %s does not have a name!", parameter));
+				throw new MappingException(String.format("Parameter %s does not have a name", parameter));
 			}
 
 			CassandraPersistentProperty property = getPersistentProperty(name, parameter.getType(),
 					parameter.getAnnotations());
 
 			if (property == null) {
 
-				throw new MappingException(String.format("No property %s found on entity %s to bind constructor parameter to!",
+				throw new MappingException(String.format("No property %s found on entity %s to bind constructor parameter to",
 						name, entity.getType()));
 			}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java
@@ -121,7 +121,7 @@ public Filter getMappedObject(Filter filter, CassandraPersistentEntity<?> entity
 
 			field.getProperty().filter(CassandraPersistentProperty::isCompositePrimaryKey).ifPresent(it -> {
 				throw new IllegalArgumentException(
-						"Cannot use composite primary key directly. Reference a property of the composite primary key");
+						"Cannot use composite primary key directly; Reference a property of the composite primary key");
 			});
 
 			field.getProperty().filter(CassandraPersistentProperty::hasOrdinal).ifPresent(it -> {
@@ -489,7 +489,7 @@ protected static class Field {
 		 * @param name must not be {@literal null} or empty.
 		 */
 		Field(ColumnName name) {
-			Assert.notNull(name, "Name must not be null!");
+			Assert.notNull(name, "Name must not be null");
 			this.name = name;
 		}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowReader.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowReader.java
@@ -159,7 +159,7 @@ private Object getCollection(int index, DataType type) {
 			return row.getObject(index);
 		}
 
-		throw new IllegalStateException("Unknown Collection type encountered; valid collections are List, Set and Map.");
+		throw new IllegalStateException("Unknown Collection type encountered; valid collections are List, Set and Map");
 	}
 
 	private int getColumnIndex(String columnName) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java
@@ -197,7 +197,7 @@ private DataType getDataType(CassandraPersistentProperty property) {
 		} catch (MappingException e) {
 
 			throw new MappingException(String.format(
-					"Cannot resolve DataType for type [%s] for property [%s] in entity [%s]; Consider registering a Converter or annotating the property with @CassandraType.",
+					"Cannot resolve DataType for type [%s] for property [%s] in entity [%s]; Consider registering a Converter or annotating the property with @CassandraType",
 					property.getType(), property.getName(), property.getOwner().getName()), e);
 		}
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java
@@ -90,7 +90,7 @@ public static ColumnSpecification name(CqlIdentifier name) {
 	 */
 	public ColumnSpecification type(DataType type) {
 
-		Assert.notNull(type, "DataType must not be null!");
+		Assert.notNull(type, "DataType must not be null");
 
 		this.type = type;
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ScriptUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ScriptUtils.java
@@ -558,7 +558,7 @@ public static void executeCqlScript(CqlSession session, EncodedResource resource
 
 			long elapsedTime = System.currentTimeMillis() - startTime;
 			if (logger.isDebugEnabled()) {
-				logger.debug("Executed CQL script from " + resource + " in " + elapsedTime + " ms.");
+				logger.debug("Executed CQL script from " + resource + " in " + elapsedTime + " ms");
 			}
 		} catch (Exception ex) {
 			if (ex instanceof ScriptException) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractDeleteEvent.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractDeleteEvent.java
@@ -41,7 +41,7 @@ public AbstractDeleteEvent(Statement<?> source, Class<T> type, CqlIdentifier tab
 
 		super(source, source, tableName);
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		this.type = type;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AfterLoadEvent.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AfterLoadEvent.java
@@ -44,7 +44,7 @@ public AfterLoadEvent(Row source, Class<T> type, CqlIdentifier tableName) {
 
 		super(source, tableName);
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		this.type = type;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AuditingEntityCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AuditingEntityCallback.java
@@ -43,7 +43,7 @@ public class AuditingEntityCallback implements BeforeConvertCallback<Object>, Or
 	 */
 	public AuditingEntityCallback(ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory) {
 
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
+		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null");
 		this.auditingHandlerFactory = auditingHandlerFactory;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/CassandraMappingEvent.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/CassandraMappingEvent.java
@@ -43,7 +43,7 @@ public CassandraMappingEvent(T source, CqlIdentifier tableName) {
 
 		super(source);
 
-		Assert.notNull(tableName, "Table name must not be null!");
+		Assert.notNull(tableName, "Table name must not be null");
 		this.tableName = tableName;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/ReactiveAuditingEntityCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/ReactiveAuditingEntityCallback.java
@@ -44,7 +44,7 @@ public class ReactiveAuditingEntityCallback implements ReactiveBeforeConvertCall
 	 */
 	public ReactiveAuditingEntityCallback(ObjectFactory<ReactiveIsNewAwareAuditingHandler> auditingHandlerFactory) {
 
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
+		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null");
 		this.auditingHandlerFactory = auditingHandlerFactory;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CassandraPageRequest.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CassandraPageRequest.java
@@ -61,7 +61,7 @@ private CassandraPageRequest(int page, int size, Sort sort, @Nullable ByteBuffer
 	public static CassandraPageRequest of(int page, int size) {
 
 		Assert.isTrue(page == 0,
-				"Cannot create a Cassandra page request for an indexed page other than the first page (0).");
+				"Cannot create a Cassandra page request for an indexed page other than the first page (0)");
 
 		return of(page, size, Sort.unsorted());
 	}
@@ -77,7 +77,7 @@ public static CassandraPageRequest of(int page, int size) {
 	public static CassandraPageRequest of(int page, int size, Sort sort) {
 
 		Assert.isTrue(page == 0,
-				"Cannot create a Cassandra page request for an indexed page other than the first page (0).");
+				"Cannot create a Cassandra page request for an indexed page other than the first page (0)");
 
 		return new CassandraPageRequest(page, size, sort, null, false);
 	}
@@ -94,7 +94,7 @@ public static CassandraPageRequest of(int page, int size, Sort sort) {
 	public static CassandraPageRequest of(int page, int size, Direction direction, String... properties) {
 
 		Assert.isTrue(page == 0,
-				"Cannot create a Cassandra page request for an indexed page other than the first page (0).");
+				"Cannot create a Cassandra page request for an indexed page other than the first page (0)");
 
 		return of(page, size, Sort.by(direction, properties));
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingFactory.java
@@ -31,7 +31,7 @@
 public final class CqlSessionTracingFactory {
 
 	private CqlSessionTracingFactory() {
-		throw new IllegalStateException("Can't instantiate a utility class.");
+		throw new IllegalStateException("Can't instantiate a utility class");
 	}
 
 	/**
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingObservationHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingObservationHandler.java
@@ -82,7 +82,7 @@ public void onStop(CqlSessionContext context) {
 				span.remoteIpAndPort(uri.getHost(), uri.getPort());
 			} catch (Exception e) {
 				if (log.isDebugEnabled()) {
-					log.debug("Failed to parse the url [" + url + "]. Won't set this value on the span");
+					log.debug("Failed to parse the url [" + url + "]; Won't set this value on the span");
 				}
 			}
 		}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java
@@ -53,7 +53,7 @@ public CassandraRepositoryBean(Bean<CassandraOperations> operations, Set<Annotat
 			Class<T> repositoryType, BeanManager beanManager, @Nullable CustomRepositoryImplementationDetector detector) {
 		super(qualifiers, repositoryType, beanManager, Optional.ofNullable(detector));
 
-		Assert.notNull(operations, "Cannot create repository with 'null' for CassandraOperations.");
+		Assert.notNull(operations, "Cannot create repository with 'null' for CassandraOperations");
 		this.cassandraOperationsBean = operations;
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java
@@ -91,7 +91,7 @@ private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, S
 
 		Bean<CassandraOperations> cassandraOperationsBean = Optional.ofNullable(this.cassandraOperationsMap.get(qualifiers))
 				.orElseThrow(() -> new UnsatisfiedResolutionException(String.format(
-						"Unable to resolve a bean for '%s' with qualifiers %s.", CassandraOperations.class.getName(), qualifiers)));
+						"Unable to resolve a bean for '%s' with qualifiers %s", CassandraOperations.class.getName(), qualifiers)));
 
 		return new CassandraRepositoryBean<>(cassandraOperationsBean, qualifiers, repositoryType, beanManager,
 				getCustomImplementationDetector());
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java
@@ -90,7 +90,7 @@ public CassandraQueryMethod(Method method, RepositoryMetadata repositoryMetadata
 	public void verify(Method method, RepositoryMetadata metadata) {
 
 		if (isPageQuery()) {
-			throw new InvalidDataAccessApiUsageException("Page queries are not supported. Use a Slice query.");
+			throw new InvalidDataAccessApiUsageException("Page queries are not supported; Use a Slice query");
 		}
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/QueryStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/QueryStatementCreator.java
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQuery.java
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/AbstractRoutingSessionFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/AbstractRoutingSessionFactoryUnitTests.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulatorUnitTests.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraConnectionProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraConnectionProperties.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CqlDataSet.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CqlDataSet.java
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraExtension.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraExtension.java

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ private void assertNotQueryOptions(Iterable<?> entities) {`
`244`	`244`	`for (Object entity : entities) {`
`245`	`245`	`if (entity instanceof QueryOptions) {`
`246`	`246`	`throw new IllegalArgumentException(`
`247`		`- String.format("%s must not be used as entity. Please make sure to call the appropriate method accepting %s",`
	`247`	`+ String.format("%s must not be used as entity; Please make sure to call the appropriate method accepting %s",`
`248`	`248`	`ClassUtils.getDescriptiveType(entity), ClassUtils.getShortName(entity.getClass())));`
`249`	`249`	`}`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public T oneValue() {`
`124`	`124`
`125`	`125`	`if (result.size() > 1) {`
`126`	`126`	`throw new IncorrectResultSizeDataAccessException(`
`127`		`- String.format("Query [%s] returned non unique result.", this.query), 1);`
	`127`	`+ String.format("Query [%s] returned non unique result", this.query), 1);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return result.iterator().next();`
Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,10 @@ private static String getMessage(Statement<?> statement) {`
`140`	`140`	`String cql = QueryExtractorDelegate.getCql(statement);`
`141`	`141`
`142`	`142`	`if (StringUtils.hasText(cql)) {`
`143`		`- return String.format("Cannot prepare statement %s (%s). Statement must be a SimpleStatement.", cql, statement);`
	`143`	`+ return String.format("Cannot prepare statement %s (%s); Statement must be a SimpleStatement", cql, statement);`
`144`	`144`	`}`
`145`	`145`
`146`		`- return String.format("Cannot prepare statement %s. Statement must be a SimpleStatement.", statement);`
	`146`	`+ return String.format("Cannot prepare statement %s; Statement must be a SimpleStatement", statement);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`enum Mapper {`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ private void assertNotQueryOptions(Iterable<?> entities) {`
`333`	`333`	`for (Object entity : entities) {`
`334`	`334`	`if (entity instanceof QueryOptions) {`
`335`	`335`	`throw new IllegalArgumentException(`
`336`		`- String.format("%s must not be used as entity. Please make sure to call the appropriate method accepting %s",`
	`336`	`+ String.format("%s must not be used as entity; Please make sure to call the appropriate method accepting %s",`
`337`	`337`	`ClassUtils.getDescriptiveType(entity), ClassUtils.getShortName(entity.getClass())));`
`338`	`338`	`}`
`339`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public Mono<T> one() {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`sink.error(new IncorrectResultSizeDataAccessException(`
`130`		`- String.format("Query [%s] returned non unique result.", this.query), 1));`
	`130`	`+ String.format("Query [%s] returned non unique result", this.query), 1));`
`131`	`131`	`});`
`132`	`132`	`}`
`133`	`133`