From 11f56c4c48cee1303363cbe521986bbed5758b02 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 8 Jun 2022 16:18:24 -0700 Subject: [PATCH] Remove punctuation from Exception messages. Closes #1277. --- .../cassandra/config/CassandraAuditingRegistrar.java | 10 +++++----- .../config/ReactiveCassandraAuditingRegistrar.java | 10 +++++----- .../data/cassandra/core/AsyncCassandraTemplate.java | 4 ++-- .../data/cassandra/core/CassandraBatchTemplate.java | 2 +- .../data/cassandra/core/CassandraTemplate.java | 4 ++-- .../core/ExecutableSelectOperationSupport.java | 2 +- .../data/cassandra/core/PreparedStatementDelegate.java | 4 ++-- .../cassandra/core/ReactiveCassandraBatchTemplate.java | 2 +- .../data/cassandra/core/ReactiveCassandraTemplate.java | 4 ++-- .../cassandra/core/ReactiveSelectOperationSupport.java | 2 +- .../core/convert/IndexSpecificationFactory.java | 2 +- .../core/convert/MappingCassandraConverter.java | 8 ++++---- .../data/cassandra/core/convert/QueryMapper.java | 4 ++-- .../data/cassandra/core/convert/RowReader.java | 2 +- .../data/cassandra/core/convert/SchemaFactory.java | 2 +- .../core/cql/keyspace/ColumnSpecification.java | 2 +- .../cassandra/core/cql/session/init/ScriptUtils.java | 2 +- .../core/mapping/event/AbstractDeleteEvent.java | 2 +- .../cassandra/core/mapping/event/AfterLoadEvent.java | 2 +- .../core/mapping/event/AuditingEntityCallback.java | 2 +- .../core/mapping/event/CassandraMappingEvent.java | 2 +- .../mapping/event/ReactiveAuditingEntityCallback.java | 2 +- .../cassandra/core/query/CassandraPageRequest.java | 6 +++--- .../observability/CqlSessionTracingFactory.java | 2 +- .../CqlSessionTracingObservationHandler.java | 2 +- .../repository/cdi/CassandraRepositoryBean.java | 2 +- .../repository/cdi/CassandraRepositoryExtension.java | 2 +- .../repository/query/CassandraQueryMethod.java | 2 +- .../repository/query/QueryStatementCreator.java | 10 +++++----- .../query/ReactiveStringBasedCassandraQuery.java | 2 +- .../repository/query/StringBasedCassandraQuery.java | 2 +- .../support/CassandraRepositoryFactoryBean.java | 2 +- .../ReactiveCassandraRepositoryFactoryBean.java | 2 +- .../core/convert/ColumnTypeResolverUnitTests.java | 2 +- .../lookup/AbstractRoutingSessionFactoryUnitTests.java | 2 +- .../init/ResourceKeyspacePopulatorUnitTests.java | 4 ++-- .../support/CassandraConnectionProperties.java | 2 +- .../data/cassandra/support/CqlDataSet.java | 2 +- .../data/cassandra/test/util/CassandraExtension.java | 2 +- 39 files changed, 62 insertions(+), 62 deletions(-) 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 index 0ef4e3b03..3157409e3 100644 --- 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,8 +51,8 @@ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport @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); } @@ -60,7 +60,7 @@ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport @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 @@ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport 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 index e76b362f3..35fa0894c 100644 --- 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,8 +51,8 @@ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrar @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); } @@ -60,7 +60,7 @@ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrar @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 @@ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrar 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 index f5036e38a..82a7089d0 100644 --- 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 @@ public class AsyncCassandraTemplate 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 @@ public class AsyncCassandraTemplate 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 index 34d4f8925..6297dcc66 100644 --- 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 @@ class CassandraBatchTemplate implements CassandraBatchOperations { 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 index 36a91ec67..6970962da 100644 --- 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 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP 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 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP 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 index bcdf2a344..2dcfcf015 100644 --- 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 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { 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 index 7ccc5abf3..fdf1f46b7 100644 --- 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 @@ class PreparedStatementDelegate { 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 index 6c0da7ce7..f3168ae58 100644 --- 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 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations 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 index 686c6992f..94cdc1b54 100644 --- 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 @@ public class ReactiveCassandraTemplate 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 @@ public class ReactiveCassandraTemplate 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 index 9196e94c2..5b31c06ae 100644 --- 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 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { } 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 index 4a68c1dd3..384c3fd62 100644 --- 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 @@ class IndexSpecificationFactory { || (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 index f2a9dbf9f..a820a7fa4 100644 --- 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 @@ public class MappingCassandraConverter extends AbstractCassandraConverter 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 class MappingCassandraConverter extends AbstractCassandraConverter 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,7 +1415,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter 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(), @@ -1423,7 +1423,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter 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 index c8a5ca441..1054ef92d 100644 --- 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 class QueryMapper { 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 @@ public class QueryMapper { * @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 index 6ad3d79a9..087bc9e21 100644 --- 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 @@ class RowReader { 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 index 7fc2f26ec..7841c73af 100644 --- 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 @@ public class SchemaFactory { } 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 index b166a5126..63c4956ef 100644 --- 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 class ColumnSpecification { */ 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 index c2be08d6c..9953f37e6 100644 --- 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 abstract class ScriptUtils { 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 index 186e1b87d..f38284ce4 100644 --- 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 class AbstractDeleteEvent extends AbstractStatementAwareMappingEvent extends CassandraMappingEvent { 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 index 394671882..609f8787c 100644 --- 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, Or */ public AuditingEntityCallback(ObjectFactory 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 index 0a5f6524a..11723bf50 100644 --- 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 class CassandraMappingEvent extends ApplicationEvent { 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 index f7429b6bb..52489caba 100644 --- 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 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 index 6bff673fe..a118502ff 100644 --- 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 @@ public class CassandraPageRequest extends PageRequest { 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 class CassandraPageRequest extends PageRequest { 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 class CassandraPageRequest extends PageRequest { 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 index 6a1092c52..8cf03efc1 100644 --- 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 @@ import com.datastax.oss.driver.api.core.CqlSession; 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 index 0cd9666af..be8fd795b 100644 --- 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 class CqlSessionTracingObservationHandler implements TracingObservationHa 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 index c9c5a1113..5639d0ac6 100644 --- 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 class CassandraRepositoryBean extends CdiRepositoryBean { Class 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 index 3c021773f..5ad107483 100644 --- 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 @@ public class CassandraRepositoryExtension extends CdiRepositoryExtensionSupport Bean 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 index f305a2609..871226ad4 100644 --- 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 class CassandraQueryMethod extends QueryMethod { 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 index d2f7bc045..65b0d75e9 100644 --- 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 @@ -90,7 +90,7 @@ class QueryStatementCreator { SimpleStatement statement = statementFactory.select(query, getPersistentEntity()).build(); if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Created query [%s].", statement)); + LOG.debug(String.format("Created query [%s]", statement)); } return statement; @@ -116,7 +116,7 @@ class QueryStatementCreator { SimpleStatement statement = statementFactory.count(query, getPersistentEntity()).build(); if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Created query [%s].", QueryExtractorDelegate.getCql(statement))); + LOG.debug(String.format("Created query [%s]", QueryExtractorDelegate.getCql(statement))); } return statement; @@ -143,7 +143,7 @@ class QueryStatementCreator { SimpleStatement statement = statementFactory.delete(query, getPersistentEntity()).build(); if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Created query [%s].", QueryExtractorDelegate.getCql(statement))); + LOG.debug(String.format("Created query [%s]", QueryExtractorDelegate.getCql(statement))); } return statement; @@ -170,7 +170,7 @@ class QueryStatementCreator { SimpleStatement statement = statementFactory.select(query.limit(1), getPersistentEntity()).build(); if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Created query [%s].", QueryExtractorDelegate.getCql(statement))); + LOG.debug(String.format("Created query [%s]", QueryExtractorDelegate.getCql(statement))); } return statement; @@ -255,7 +255,7 @@ class QueryStatementCreator { } if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Created query [%s].", QueryExtractorDelegate.getCql(queryToUse))); + LOG.debug(String.format("Created query [%s]", QueryExtractorDelegate.getCql(queryToUse))); } return queryToUse; 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 index fc03d7777..adbe605f9 100644 --- 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 @@ -43,7 +43,7 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; */ public class ReactiveStringBasedCassandraQuery extends AbstractReactiveCassandraQuery { - private static final String COUNT_AND_EXISTS = "Manually defined query for %s cannot be a count and exists query at the same time!"; + private static final String COUNT_AND_EXISTS = "Manually defined query for %s cannot be a count and exists query at the same time"; private final StringBasedQuery stringBasedQuery; 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 index 788e00132..2c8fbae08 100644 --- 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 @@ -38,7 +38,7 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; */ public class StringBasedCassandraQuery extends AbstractCassandraQuery { - private static final String COUNT_AND_EXISTS = "Manually defined query for %s cannot be a count and exists query at the same time!"; + private static final String COUNT_AND_EXISTS = "Manually defined query for %s cannot be a count and exists query at the same time"; private final StringBasedQuery stringBasedQuery; 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 index 0939562eb..ac7cc7966 100644 --- 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 @@ -71,6 +71,6 @@ public class CassandraRepositoryFactoryBean, S, ID> super.afterPropertiesSet(); - Assert.notNull(cassandraOperations, "CassandraOperations must not be null!"); + Assert.notNull(cassandraOperations, "CassandraOperations must not be null"); } } 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 index fb8554ed9..9ac08dcbc 100644 --- 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 @@ -99,7 +99,7 @@ public class ReactiveCassandraRepositoryFactoryBean, super.afterPropertiesSet(); - Assert.notNull(operations, "ReactiveCassandraOperations must not be null!"); + Assert.notNull(operations, "ReactiveCassandraOperations must not be null"); if (!mappingContextConfigured) { setMappingContext(operations.getConverter().getMappingContext()); 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 index d4d9369bb..cb19d6195 100644 --- 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 @@ -226,7 +226,7 @@ public class ColumnTypeResolverUnitTests { DataType dataType = resolver.resolve(entity.getRequiredPersistentProperty("frozenListContent")).getDataType(); assertThat(dataType).isInstanceOf(ListType.class); - assertThat(((ListType) dataType).isFrozen()).describedAs("The collection itself should not be frozen.").isFalse(); + assertThat(((ListType) dataType).isFrozen()).describedAs("The collection itself should not be frozen").isFalse(); DataType elementType = ((ListType) dataType).getElementType(); assertThat(elementType).isInstanceOf(com.datastax.oss.driver.api.core.type.UserDefinedType.class); 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 index 069ac5e55..64f86a41c 100644 --- 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 @@ -84,7 +84,7 @@ class AbstractRoutingSessionFactoryUnitTests { sut.afterPropertiesSet(); fail("Missing IllegalArgumentException"); } catch (IllegalArgumentException e) { - assertThat(e).hasMessageContaining("Illegal session factory value."); + assertThat(e).hasMessageContaining("Illegal session factory value"); } } 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 index 16748551c..61d387c3b 100644 --- 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 @@ -116,7 +116,7 @@ class ResourceKeyspacePopulatorUnitTests { keyspacePopulator.setScripts(new ByteArrayResource("drop table;create table;".getBytes())); CqlSession sessionMock = mock(CqlSession.class); - when(sessionMock.execute("drop table")).thenThrow(new IllegalStateException("Boom!")); + when(sessionMock.execute("drop table")).thenThrow(new IllegalStateException("Boom")); assertThatExceptionOfType(ScriptStatementFailedException.class) .isThrownBy(() -> keyspacePopulator.populate(sessionMock)); @@ -133,7 +133,7 @@ class ResourceKeyspacePopulatorUnitTests { keyspacePopulator.setScripts(new ByteArrayResource("drop table;create table;".getBytes())); CqlSession sessionMock = mock(CqlSession.class); - when(sessionMock.execute("drop table")).thenThrow(new IllegalStateException("Boom!")); + when(sessionMock.execute("drop table")).thenThrow(new IllegalStateException("Boom")); when(sessionMock.execute("create table")).thenReturn(mock(ResultSet.class)); 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 index 446da8fd6..06fc060da 100644 --- 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 @@ -209,7 +209,7 @@ public class CassandraConnectionProperties extends Properties { private T convert(String propertyName, Class type, Converter converter) { - Assert.hasText(propertyName, "PropertyName must not be empty!"); + Assert.hasText(propertyName, "PropertyName must not be empty"); String propertyValue = getProperty(propertyName); try { 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 index 0f611eb8b..a05aa6552 100644 --- 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 @@ -75,7 +75,7 @@ public class CqlDataSet { */ public CqlDataSet executeIn(String keyspaceName) { - Assert.hasText(keyspaceName, "KeyspaceName must not be empty!"); + Assert.hasText(keyspaceName, "KeyspaceName must not be empty"); return new CqlDataSet(location, keyspaceName); } 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 index 9abec87c7..2d40cc3f9 100644 --- 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 @@ -94,7 +94,7 @@ public class CassandraExtension implements BeforeAllCallback, AfterAllCallback, Resources resources = TEST_RESOURCES.get(); Assert.state(resources != null, - "No test in progress. Did you annotate your test class with @ExtendWith(CassandraExtension.class)?"); + "No test in progress; Did you annotate your test class with @ExtendWith(CassandraExtension.class)"); return resources; }