From 4e753a9cfa6eb0b64537a9f1bfff11f800b4ec1b Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 5 Jan 2022 14:02:59 +0100 Subject: [PATCH] Remove Eclipse Non-Javadoc comments. Closes #1204 --- ...CassandraAuditingBeanDefinitionParser.java | 12 - .../config/CassandraAuditingRegistrar.java | 20 -- .../CassandraCqlTemplateFactoryBean.java | 12 - .../config/CassandraCqlTemplateParser.java | 9 - .../config/CassandraMappingContextParser.java | 9 - .../CassandraMappingConverterParser.java | 9 - .../config/CassandraNamespaceHandler.java | 4 - .../config/CassandraTemplateFactoryBean.java | 16 -- .../config/CassandraTemplateParser.java | 9 - .../cassandra/config/CqlNamespaceHandler.java | 3 - .../config/CqlSessionFactoryBean.java | 20 -- .../cassandra/config/CqlSessionParser.java | 9 - ...eyspaceActionSpecificationFactoryBean.java | 12 - .../cassandra/config/KeyspaceActions.java | 12 - .../config/PersistentEntitiesFactoryBean.java | 8 - .../ReactiveCassandraAuditingRegistrar.java | 20 -- .../SessionFactoryBeanDefinitionParser.java | 9 - .../config/SessionFactoryFactoryBean.java | 4 - .../core/AsyncCassandraTemplate.java | 108 -------- .../core/CassandraAdminTemplate.java | 21 -- .../core/CassandraBatchTemplate.java | 33 --- .../cassandra/core/CassandraTemplate.java | 123 ---------- .../data/cassandra/core/DeleteOptions.java | 56 ----- .../data/cassandra/core/EntityOperations.java | 30 --- .../ExecutableDeleteOperationSupport.java | 12 - .../ExecutableInsertOperationSupport.java | 12 - .../ExecutableSelectOperationSupport.java | 30 --- .../ExecutableUpdateOperationSupport.java | 12 - .../data/cassandra/core/InsertOptions.java | 56 ----- .../core/ReactiveCassandraBatchTemplate.java | 51 ---- .../core/ReactiveCassandraTemplate.java | 111 --------- .../core/ReactiveDeleteOperationSupport.java | 12 - .../core/ReactiveInsertOperationSupport.java | 12 - .../core/ReactiveSelectOperationSupport.java | 27 -- .../core/ReactiveUpdateOperationSupport.java | 12 - .../data/cassandra/core/UpdateOptions.java | 56 ----- .../convert/AbstractCassandraConverter.java | 6 - .../core/convert/CassandraConverter.java | 3 - .../convert/DefaultCassandraColumnType.java | 8 - .../core/convert/DefaultColumnType.java | 32 --- .../convert/DefaultColumnTypeResolver.java | 16 -- .../convert/MappingCassandraConverter.java | 26 -- .../cassandra/core/convert/QueryMapper.java | 10 - .../core/convert/RowValueProvider.java | 9 - .../core/convert/TupleValueProvider.java | 9 - .../core/convert/UdtValueProvider.java | 9 - .../cql/ArgumentPreparedStatementBinder.java | 3 - .../cassandra/core/cql/AsyncCqlTemplate.java | 179 -------------- .../cql/AsyncRowMapperResultSetExtractor.java | 3 - .../cql/CachedPreparedStatementCreator.java | 3 - .../cql/CassandraExceptionTranslator.java | 6 - .../core/cql/ColumnMapRowMapper.java | 3 - .../cassandra/core/cql/CqlIdentifier.java | 4 - .../data/cassandra/core/cql/CqlTemplate.java | 231 ------------------ ...ionTranslatingListenableFutureAdapter.java | 22 -- .../core/cql/KeyspaceIdentifier.java | 7 - .../data/cassandra/core/cql/QueryOptions.java | 8 - .../core/cql/ReactiveCqlTemplate.java | 123 ---------- .../ReactiveRowMapperResultSetExtractor.java | 3 - .../core/cql/RingMemberHostMapper.java | 3 - .../core/cql/RowMapperResultSetExtractor.java | 3 - .../cql/SimplePreparedStatementCreator.java | 6 - .../data/cassandra/core/cql/WriteOptions.java | 44 ---- .../converter/ResultSetToArrayConverter.java | 3 - .../ResultSetToBigDecimalConverter.java | 6 - .../ResultSetToBigIntegerConverter.java | 6 - .../ResultSetToBooleanConverter.java | 6 - .../ResultSetToByteBufferConverter.java | 6 - .../converter/ResultSetToDateConverter.java | 6 - .../converter/ResultSetToDoubleConverter.java | 6 - .../converter/ResultSetToFloatConverter.java | 6 - .../ResultSetToInetAddressConverter.java | 6 - .../ResultSetToIntegerConverter.java | 6 - .../converter/ResultSetToListConverter.java | 3 - .../ResultSetToListOfStringConverter.java | 6 - .../converter/ResultSetToLongConverter.java | 6 - .../converter/ResultSetToStringConverter.java | 6 - .../converter/ResultSetToUuidConverter.java | 6 - .../cql/converter/RowToArrayConverter.java | 3 - .../cql/converter/RowToListConverter.java | 3 - .../core/cql/converter/RowToMapConverter.java | 3 - .../cql/generator/AddColumnCqlGenerator.java | 3 - .../generator/AlterUserTypeCqlGenerator.java | 4 - .../generator/CreateTableCqlGenerator.java | 3 - .../generator/CreateUserTypeCqlGenerator.java | 4 - .../generator/DropUserTypeCqlGenerator.java | 4 - .../generator/RenameColumnCqlGenerator.java | 4 - .../cql/keyspace/ColumnSpecification.java | 4 - .../keyspace/CreateIndexSpecification.java | 12 - .../keyspace/CreateKeyspaceSpecification.java | 17 -- .../keyspace/CreateTableSpecification.java | 12 - .../cql/keyspace/DataCenterReplication.java | 4 - .../core/cql/keyspace/DefaultOption.java | 25 -- .../keyspace/DropKeyspaceSpecification.java | 8 - .../core/cql/keyspace/FieldSpecification.java | 4 - .../keyspace/KeyspaceActionSpecification.java | 8 - .../KeyspaceOptionsSpecification.java | 8 - .../DefaultBridgedReactiveSession.java | 51 ---- .../cql/session/DefaultSessionFactory.java | 3 - .../lookup/AbstractRoutingSessionFactory.java | 3 - .../BeanFactorySessionFactoryLookup.java | 6 - .../lookup/MapSessionFactoryLookup.java | 3 - .../lookup/SingleSessionFactoryLookup.java | 3 - .../CachedPreparedStatementCreator.java | 3 - .../support/MapPreparedStatementCache.java | 11 - .../BasicCassandraPersistentEntity.java | 30 --- ...andraPersistentEntityMetadataVerifier.java | 4 - .../BasicCassandraPersistentProperty.java | 48 ---- .../BasicCassandraPersistentTupleEntity.java | 9 - ...BasicCassandraPersistentTupleProperty.java | 30 --- .../cassandra/core/mapping/BasicMapId.java | 48 ---- .../CachingCassandraPersistentProperty.java | 21 -- .../core/mapping/CassandraMappingContext.java | 21 -- ...CassandraPersistentPropertyComparator.java | 3 - ...sandraPersistentTupleMetadataVerifier.java | 3 - ...aPrimaryKeyColumnAnnotationComparator.java | 3 - .../CassandraUserTypePersistentEntity.java | 6 - .../CodecRegistryTupleTypeFactory.java | 6 - ...andraPersistentEntityMetadataVerifier.java | 4 - .../cassandra/core/mapping/EntityMapping.java | 9 - ...PrimaryKeyClassEntityMetadataVerifier.java | 4 - .../core/mapping/PropertyMapping.java | 12 - .../core/mapping/SimpleTupleTypeFactory.java | 6 - .../core/mapping/SimpleUserTypeResolver.java | 3 - .../mapping/VerifierMappingExceptions.java | 3 - .../event/AbstractCassandraEventListener.java | 3 - .../mapping/event/AuditingEntityCallback.java | 8 - .../mapping/event/CassandraMappingEvent.java | 4 - .../event/ReactiveAuditingEntityCallback.java | 8 - .../core/query/CassandraPageRequest.java | 15 -- .../data/cassandra/core/query/ColumnName.java | 30 --- .../data/cassandra/core/query/Columns.java | 37 --- .../data/cassandra/core/query/Criteria.java | 11 - .../core/query/CriteriaDefinition.java | 12 - .../cassandra/core/query/DefaultFilter.java | 6 - .../data/cassandra/core/query/Filter.java | 3 - .../data/cassandra/core/query/Query.java | 15 -- .../data/cassandra/core/query/Update.java | 68 ------ .../repository/CassandraRepository.java | 6 - .../cdi/CassandraRepositoryBean.java | 4 - .../CassandraRepositoriesRegistrar.java | 6 - ...andraRepositoryConfigurationExtension.java | 25 -- .../CassandraRepositoryNamespaceHandler.java | 4 - ...eactiveCassandraRepositoriesRegistrar.java | 8 - ...andraRepositoryConfigurationExtension.java | 16 -- .../query/AbstractCassandraQuery.java | 3 - .../query/AbstractReactiveCassandraQuery.java | 8 - .../repository/query/CassandraParameters.java | 12 - .../CassandraParametersParameterAccessor.java | 19 -- .../query/CassandraQueryCreator.java | 15 -- .../query/CassandraQueryExecution.java | 24 -- .../query/CassandraQueryMethod.java | 11 - .../CassandraRepositoryQuerySupport.java | 3 - .../query/ConvertingParameterAccessor.java | 48 ---- .../query/DefaultSpELExpressionEvaluator.java | 4 - .../query/DtoInstantiatingConverter.java | 4 - .../query/PartTreeCassandraQuery.java | 16 -- .../ReactiveCassandraParameterAccessor.java | 9 - .../ReactiveCassandraQueryExecution.java | 22 -- .../query/ReactiveCassandraQueryMethod.java | 9 - .../query/ReactivePartTreeCassandraQuery.java | 16 -- .../ReactiveStringBasedCassandraQuery.java | 15 -- .../query/SimpleCassandraEntityMetadata.java | 6 - .../query/StringBasedCassandraQuery.java | 15 -- .../support/CachingExpressionParser.java | 8 - .../support/CassandraRepositoryFactory.java | 16 -- .../CassandraRepositoryFactoryBean.java | 3 - .../MappingCassandraEntityInformation.java | 12 - .../ReactiveCassandraRepositoryFactory.java | 15 -- ...eactiveCassandraRepositoryFactoryBean.java | 13 - .../support/SimpleCassandraRepository.java | 45 ---- .../SimpleReactiveCassandraRepository.java | 72 ------ .../data/cassandra/util/MapBuilder.java | 42 ---- 173 files changed, 3097 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java index 71a5a16e3..b8e72f111 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java @@ -46,28 +46,16 @@ public class CassandraAuditingBeanDefinitionParser extends AbstractSingleBeanDef private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono", CassandraAuditingRegistrar.class.getClassLoader()); - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return AuditingEntityCallback.class; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId() - */ @Override protected boolean shouldGenerateId() { return true; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { 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 ed5aa4e02..1857e99d8 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 @@ -38,28 +38,16 @@ import org.springframework.util.Assert; */ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableCassandraAuditing.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName() - */ @Override protected String getAuditingHandlerBeanName() { return "cassandraAuditingHandler"; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry) - */ @Override public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) { @@ -69,10 +57,6 @@ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport super.registerBeanDefinitions(annotationMetadata, registry); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration) - */ @Override protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) { @@ -87,10 +71,6 @@ class CassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport return configureDefaultAuditHandlerAttributes(configuration, builder); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerAuditListener(org.springframework.beans.factory.config.BeanDefinition, org.springframework.beans.factory.support.BeanDefinitionRegistry) - */ @Override protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition, BeanDefinitionRegistry registry) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java index 5a1b9e69d..892198385 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java @@ -37,33 +37,21 @@ public class CassandraCqlTemplateFactoryBean implements FactoryBean private @Nullable SessionFactory sessionFactory; - /* (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ @Override public CqlTemplate getObject() { return template; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ @Override public Class getObjectType() { return CqlTemplate.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#isSingleton() - */ @Override public boolean isSingleton() { return true; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() throws Exception { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java index 16de0f1f3..4913f4d3a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java @@ -33,17 +33,11 @@ import org.w3c.dom.Element; */ class CassandraCqlTemplateParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return CassandraCqlTemplateFactoryBean.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -52,9 +46,6 @@ class CassandraCqlTemplateParser extends AbstractSingleBeanDefinitionParser { return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.TEMPLATE; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java index 266995dcc..4d6b2f13c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java @@ -45,17 +45,11 @@ import org.w3c.dom.Element; */ class CassandraMappingContextParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return CassandraMappingContext.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -65,9 +59,6 @@ class CassandraMappingContextParser extends AbstractSingleBeanDefinitionParser { return (StringUtils.hasText(id) ? id : DefaultBeanNames.CONTEXT); } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { parseMapping(element, builder); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java index cedac9efa..7624639e0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java @@ -32,17 +32,11 @@ import org.w3c.dom.Element; */ class CassandraMappingConverterParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return MappingCassandraConverter.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -51,9 +45,6 @@ class CassandraMappingConverterParser extends AbstractSingleBeanDefinitionParser return StringUtils.hasText(id) ? id : DefaultBeanNames.CONVERTER; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java index dae8c09cd..2ce939a4d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java @@ -27,10 +27,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; */ public class CassandraNamespaceHandler extends NamespaceHandlerSupport { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.NamespaceHandler#init() - */ @Override public void init() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java index 67bb63bce..69f4e5433 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java @@ -42,10 +42,6 @@ public class CassandraTemplateFactoryBean implements FactoryBean getObjectType() { return CassandraTemplate.class; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#isSingleton() - */ @Override public boolean isSingleton() { return true; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java index c3fb978a4..f320deeb5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java @@ -34,17 +34,11 @@ import org.w3c.dom.Element; */ class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.cassandra.config.xml.CassandraCqlTemplateParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return CassandraTemplateFactoryBean.class; } - /* (non-Javadoc) - * @see org.springframework.cassandra.config.xml.CassandraCqlTemplateParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -53,9 +47,6 @@ class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser { return StringUtils.hasText(id) ? id : DefaultBeanNames.DATA_TEMPLATE; } - /* (non-Javadoc) - * @see org.springframework.cassandra.config.xml.CassandraCqlTemplateParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlNamespaceHandler.java index efeb0d4dc..1d258af6a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlNamespaceHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlNamespaceHandler.java @@ -25,9 +25,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; */ public class CqlNamespaceHandler extends NamespaceHandlerSupport { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.NamespaceHandler#init() - */ @Override public void init() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java index 52c69e2d5..92abc821c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java @@ -439,10 +439,6 @@ public class CqlSessionFactoryBean return Collections.unmodifiableList(this.shutdownScripts); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { @@ -618,38 +614,22 @@ public class CqlSessionFactoryBean schemaCreator.createIndexes(ifNotExists); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ @Override public CqlSession getObject() { return this.session; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ @Override public Class getObjectType() { return CqlSession.class; } - /* - * (non-Javadoc) - * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException) - */ @Nullable @Override public DataAccessException translateExceptionIfPossible(RuntimeException e) { return EXCEPTION_TRANSLATOR.translateExceptionIfPossible(e); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.DisposableBean#destroy() - */ @Override public void destroy() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java index eb1a525b7..aebd681b7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java @@ -40,17 +40,11 @@ import org.w3c.dom.Element; */ class CqlSessionParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return ExtendedCqlSessionFactoryBean.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -60,9 +54,6 @@ class CqlSessionParser extends AbstractSingleBeanDefinitionParser { return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.SESSION; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActionSpecificationFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActionSpecificationFactoryBean.java index 311df0582..ceb5b0d63 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActionSpecificationFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActionSpecificationFactoryBean.java @@ -57,9 +57,6 @@ public class KeyspaceActionSpecificationFactoryBean implements FactoryBean getObjectType() { return Set.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#isSingleton() - */ @Override public boolean isSingleton() { return false; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActions.java index 2a3a03de6..d944d20d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActions.java @@ -43,10 +43,6 @@ public final class KeyspaceActions { return this.actions; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -62,19 +58,11 @@ public final class KeyspaceActions { return ObjectUtils.nullSafeEquals(actions, that.actions); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(actions); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "KeyspaceActions(actions=" + this.getActions() + ")"; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/PersistentEntitiesFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/PersistentEntitiesFactoryBean.java index 2df411324..0cc47c389 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/PersistentEntitiesFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/PersistentEntitiesFactoryBean.java @@ -37,19 +37,11 @@ public class PersistentEntitiesFactoryBean implements FactoryBean getObjectType() { return PersistentEntities.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 34fd03521..379bffecb 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 @@ -38,28 +38,16 @@ import org.springframework.util.Assert; */ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableReactiveCassandraAuditing.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName() - */ @Override protected String getAuditingHandlerBeanName() { return "reactiveCassandraAuditingHandler"; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry) - */ @Override public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) { @@ -69,10 +57,6 @@ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrar super.registerBeanDefinitions(annotationMetadata, registry); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration) - */ @Override protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) { @@ -87,10 +71,6 @@ class ReactiveCassandraAuditingRegistrar extends AuditingBeanDefinitionRegistrar return configureDefaultAuditHandlerAttributes(configuration, builder); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerAuditListener(org.springframework.beans.factory.config.BeanDefinition, org.springframework.beans.factory.support.BeanDefinitionRegistry) - */ @Override protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition, BeanDefinitionRegistry registry) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java index f432d9b6a..630ecb1f7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java @@ -33,17 +33,11 @@ import org.w3c.dom.Element; */ class SessionFactoryBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return SessionFactoryFactoryBean.class; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -53,9 +47,6 @@ class SessionFactoryBeanDefinitionParser extends AbstractSingleBeanDefinitionPar return StringUtils.hasText(id) ? id : DefaultBeanNames.SESSION_FACTORY; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryFactoryBean.java index de68da913..1e5a5cf88 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryFactoryBean.java @@ -115,10 +115,6 @@ public class SessionFactoryFactoryBean extends AbstractFactoryBean ListenableFuture> select(String cql, Class entityClass) { @@ -320,9 +305,6 @@ public class AsyncCassandraTemplate return select(SimpleStatement.newInstance(cql), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(java.lang.String, java.util.function.Consumer, java.lang.Class) - */ @Override public ListenableFuture select(String cql, Consumer entityConsumer, Class entityClass) throws DataAccessException { @@ -334,9 +316,6 @@ public class AsyncCassandraTemplate return select(SimpleStatement.newInstance(cql), entityConsumer, entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#selectOne(java.lang.String, java.lang.Class) - */ @Override public ListenableFuture selectOne(String cql, Class entityClass) { @@ -350,9 +329,6 @@ public class AsyncCassandraTemplate // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture execute(Statement statement) throws DataAccessException { @@ -361,9 +337,6 @@ public class AsyncCassandraTemplate return doQueryForResultSet(statement); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture> select(Statement statement, Class entityClass) { @@ -375,9 +348,6 @@ public class AsyncCassandraTemplate return doQuery(statement, (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(com.datastax.oss.driver.api.core.cql.Statement, java.util.function.Consumer, java.lang.Class) - */ @Override public ListenableFuture select(Statement statement, Consumer entityConsumer, Class entityClass) throws DataAccessException { @@ -393,18 +363,12 @@ public class AsyncCassandraTemplate }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#selectOne(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture selectOne(Statement statement, Class entityClass) { return new MappingListenableFutureAdapter<>(select(statement, entityClass), list -> list.isEmpty() ? null : list.get(0)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#slice(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture> slice(Statement statement, Class entityClass) { @@ -423,9 +387,6 @@ public class AsyncCassandraTemplate // Methods dealing with org.springframework.data.cassandra.core.query.Query // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture> select(Query query, Class entityClass) throws DataAccessException { @@ -435,9 +396,6 @@ public class AsyncCassandraTemplate return select(getStatementFactory().select(query, getRequiredPersistentEntity(entityClass)).build(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(org.springframework.data.cassandra.core.query.Query, java.util.function.Consumer, java.lang.Class) - */ @Override public ListenableFuture select(Query query, Consumer entityConsumer, Class entityClass) throws DataAccessException { @@ -450,9 +408,6 @@ public class AsyncCassandraTemplate entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#selectOne(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture selectOne(Query query, Class entityClass) throws DataAccessException { @@ -463,9 +418,6 @@ public class AsyncCassandraTemplate entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#slice(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture> slice(Query query, Class entityClass) throws DataAccessException { @@ -475,9 +427,6 @@ public class AsyncCassandraTemplate return slice(getStatementFactory().select(query, getRequiredPersistentEntity(entityClass)).build(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#update(org.springframework.data.cassandra.core.query.Query, org.springframework.data.cassandra.core.query.Update, java.lang.Class) - */ @Override public ListenableFuture update(Query query, org.springframework.data.cassandra.core.query.Update update, Class entityClass) throws DataAccessException { @@ -490,9 +439,6 @@ public class AsyncCassandraTemplate AsyncResultSet::wasApplied); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture delete(Query query, Class entityClass) throws DataAccessException { @@ -521,9 +467,6 @@ public class AsyncCassandraTemplate // Methods dealing with entities // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#count(java.lang.Class) - */ @Override public ListenableFuture count(Class entityClass) { @@ -532,9 +475,6 @@ public class AsyncCassandraTemplate return doCount(Query.empty(), entityClass, getTableName(entityClass)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#count(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture count(Query query, Class entityClass) throws DataAccessException { @@ -562,9 +502,6 @@ public class AsyncCassandraTemplate return new MappingListenableFutureAdapter<>(result, it -> it != null ? it : 0L); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#exists(java.lang.Object, java.lang.Class) - */ @Override public ListenableFuture exists(Object id, Class entityClass) { @@ -579,9 +516,6 @@ public class AsyncCassandraTemplate return doExecute(select.build(), resultSet -> resultSet.one() != null); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#exists(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public ListenableFuture exists(Query query, Class entityClass) throws DataAccessException { @@ -594,9 +528,6 @@ public class AsyncCassandraTemplate return doExecute(select.build(), resultSet -> resultSet.one() != null); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#selectOneById(java.lang.Object, java.lang.Class) - */ @Override public ListenableFuture selectOneById(Object id, Class entityClass) { @@ -612,17 +543,11 @@ public class AsyncCassandraTemplate it -> it.isEmpty() ? null : it.get(0)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#insert(java.lang.Object) - */ @Override public ListenableFuture insert(T entity) { return new MappingListenableFutureAdapter<>(insert(entity, InsertOptions.empty()), EntityWriteResult::getEntity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#insert(java.lang.Object, org.springframework.data.cassandra.core.InsertOptions) - */ @Override public ListenableFuture> insert(T entity, InsertOptions options) { @@ -672,17 +597,11 @@ public class AsyncCassandraTemplate return executeSave(entity, tableName, insert); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#update(java.lang.Object) - */ @Override public ListenableFuture update(T entity) { return new MappingListenableFutureAdapter<>(update(entity, UpdateOptions.empty()), EntityWriteResult::getEntity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#update(java.lang.Object, org.springframework.data.cassandra.core.UpdateOptions) - */ @Override public ListenableFuture> update(T entity, UpdateOptions options) { @@ -727,17 +646,11 @@ public class AsyncCassandraTemplate return executeSave(entity, tableName, update.build()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object) - */ @Override public ListenableFuture delete(T entity) { return new MappingListenableFutureAdapter<>(delete(entity, QueryOptions.empty()), writeResult -> entity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object, org.springframework.data.cassandra.core.cql.QueryOptions) - */ @Override public ListenableFuture delete(Object entity, QueryOptions options) { @@ -775,9 +688,6 @@ public class AsyncCassandraTemplate return executeDelete(entity, tableName, delete.build(), result -> {}); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#deleteById(java.lang.Object, java.lang.Class) - */ @Override public ListenableFuture deleteById(Object id, Class entityClass) { @@ -798,9 +708,6 @@ public class AsyncCassandraTemplate return future; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#truncate(java.lang.Class) - */ @Override public ListenableFuture truncate(Class entityClass) { @@ -1012,9 +919,6 @@ public class AsyncCassandraTemplate this.mapper = mapper; } - /* (non-Javadoc) - * @see org.springframework.util.concurrent.FutureAdapter#adapt(java.lang.Object) - */ @Override protected T adapt(@Nullable S adapteeResult) { return this.mapper.apply(adapteeResult); @@ -1036,28 +940,16 @@ public class AsyncCassandraTemplate this.statement = PreparedStatementDelegate.getStatementForPrepare(statement); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator#createPreparedStatement(com.datastax.oss.driver.api.core.CqlSession) - */ @Override public ListenableFuture createPreparedStatement(CqlSession session) throws DriverException { return new CassandraFutureAdapter<>(session.prepareAsync(statement), exceptionTranslator); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementBinder#bindValues(com.datastax.oss.driver.api.core.cql.PreparedStatement) - */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { return PreparedStatementDelegate.bind(statement, ps); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.CqlProvider#getCql() - */ @Override public String getCql() { return statement.getQuery(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java index ab4d25762..b179cb23f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java @@ -104,9 +104,6 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand return schemaFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#createTable(boolean, org.springframework.data.cassandra.core.cql.CqlIdentifier, java.lang.Class, java.util.Map) - */ @Override public void createTable(boolean ifNotExists, CqlIdentifier tableName, Class entityClass, Map optionsByName) { @@ -119,25 +116,16 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand getCqlOperations().execute(CreateTableCqlGenerator.toCql(createTableSpecification)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(java.lang.Class) - */ @Override public void dropTable(Class entityClass) { dropTable(getTableName(entityClass)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public void dropTable(CqlIdentifier tableName) { dropTable(DEFAULT_DROP_TABLE_IF_EXISTS, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(boolean, CqlIdentifier) - */ @Override public void dropTable(boolean ifExists, CqlIdentifier tableName) { @@ -146,9 +134,6 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand getCqlOperations().execute(dropTableCql); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropUserType(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public void dropUserType(CqlIdentifier typeName) { @@ -159,9 +144,6 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand getCqlOperations().execute(dropUserTypeCql); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getTableMetadata(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.CqlIdentifier) - */ @Override public Optional getTableMetadata(CqlIdentifier keyspace, CqlIdentifier tableName) { @@ -174,9 +156,6 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getKeyspaceMetadata() - */ @Override public KeyspaceMetadata getKeyspaceMetadata() { 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 903567b09..a16c9ef4b 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 @@ -108,9 +108,6 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return this.statementFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#execute() - */ @Override public WriteResult execute() { @@ -121,9 +118,6 @@ class CassandraBatchTemplate implements CassandraBatchOperations { throw new IllegalStateException("This Cassandra Batch was already executed"); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#withTimestamp(long) - */ @Override public CassandraBatchOperations withTimestamp(long timestamp) { @@ -134,9 +128,6 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Object[]) - */ @Override public CassandraBatchOperations insert(Object... entities) { @@ -145,17 +136,11 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return insert(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable) - */ @Override public CassandraBatchOperations insert(Iterable entities) { return insert(entities, InsertOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public CassandraBatchOperations insert(Iterable entities, WriteOptions options) { @@ -182,9 +167,6 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Object[]) - */ @Override public CassandraBatchOperations update(Object... entities) { @@ -193,17 +175,11 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return update(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable) - */ @Override public CassandraBatchOperations update(Iterable entities) { return update(entities, UpdateOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public CassandraBatchOperations update(Iterable entities, WriteOptions options) { @@ -227,9 +203,6 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#delete(java.lang.Object[]) - */ @Override public CassandraBatchOperations delete(Object... entities) { @@ -238,17 +211,11 @@ class CassandraBatchTemplate implements CassandraBatchOperations { return delete(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#delete(java.lang.Iterable) - */ @Override public CassandraBatchOperations delete(Iterable entities) { return delete(entities, DeleteOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#delete(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public CassandraBatchOperations delete(Iterable entities, WriteOptions options) { 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 274aa8d00..16f9b8916 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 @@ -185,25 +185,16 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP this.statementFactory = new StatementFactory(new QueryMapper(converter), new UpdateMapper(converter)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#batchOps(com.datastax.oss.driver.api.core.cql.BatchType) - */ @Override public CassandraBatchOperations batchOps(BatchType batchType) { return new CassandraBatchTemplate(this, batchType); } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ @Override public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { this.eventPublisher = applicationEventPublisher; } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { @@ -221,17 +212,11 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP this.entityCallbacks = entityCallbacks; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#CqlOperations() - */ @Override public CqlOperations getCqlOperations() { return this.cqlOperations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#getConverter() - */ @Override public CassandraConverter getConverter() { return this.converter; @@ -303,9 +288,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return this.statementFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#getTableName(java.lang.Class) - */ @Override public CqlIdentifier getTableName(Class entityClass) { return getEntityOperations().getTableName(entityClass); @@ -315,9 +297,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP // Methods dealing with static CQL // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#select(java.lang.String, java.lang.Class) - */ @Override public List select(String cql, Class entityClass) { @@ -326,9 +305,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return select(SimpleStatement.newInstance(cql), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#selectOne(java.lang.String, java.lang.Class) - */ @Override public T selectOne(String cql, Class entityClass) { @@ -338,9 +314,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return selectOne(SimpleStatement.newInstance(cql), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#stream(java.lang.String, java.lang.Class) - */ @Override public Stream stream(String cql, Class entityClass) throws DataAccessException { @@ -354,9 +327,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ResultSet execute(Statement statement) { @@ -365,9 +335,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQueryForResultSet(statement); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#select(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public List select(Statement statement, Class entityClass) { @@ -380,9 +347,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQuery(statement, (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#selectOne(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public T selectOne(Statement statement, Class entityClass) { @@ -390,9 +354,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return result.isEmpty() ? null : result.get(0); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#slice(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Slice slice(Statement statement, Class entityClass) { @@ -408,9 +369,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP getEffectivePageSize(statement)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#stream(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Stream stream(Statement statement, Class entityClass) throws DataAccessException { @@ -426,9 +384,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP // Methods dealing with org.springframework.data.cassandra.core.query.Query // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#select(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public List select(Query query, Class entityClass) throws DataAccessException { @@ -453,9 +408,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQuery(select.build(), (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#selectOne(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public T selectOne(Query query, Class entityClass) throws DataAccessException { @@ -464,9 +416,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return result.isEmpty() ? null : result.get(0); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#slice(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Slice slice(Query query, Class entityClass) throws DataAccessException { @@ -478,9 +427,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return slice(select.build(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#stream(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Stream stream(Query query, Class entityClass) throws DataAccessException { @@ -500,9 +446,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQueryForStream(select.build(), (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#update(org.springframework.data.cassandra.core.query.Query, org.springframework.data.cassandra.core.query.Update, java.lang.Class) - */ @Override public boolean update(Query query, org.springframework.data.cassandra.core.query.Update update, Class entityClass) throws DataAccessException { @@ -527,9 +470,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doExecute(updateStatement.build()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#delete(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public boolean delete(Query query, Class entityClass) throws DataAccessException { @@ -561,9 +501,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP // Methods dealing with entities // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#count(java.lang.Class) - */ @Override public long count(Class entityClass) { @@ -572,9 +509,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return count(Query.empty(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#count(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public long count(Query query, Class entityClass) throws DataAccessException { @@ -592,9 +526,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQueryForObject(countStatement.build(), Long.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#exists(java.lang.Object, java.lang.Class) - */ @Override public boolean exists(Object id, Class entityClass) { @@ -607,9 +538,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQueryForResultSet(select.build()).one() != null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#exists(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public boolean exists(Query query, Class entityClass) throws DataAccessException { @@ -627,9 +555,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return doQueryForResultSet(select.build()).one() != null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#selectOneById(java.lang.Object, java.lang.Class) - */ @Override public T selectOneById(Object id, Class entityClass) { @@ -645,17 +570,11 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return result.isEmpty() ? null : result.get(0); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object) - */ @Override public T insert(T entity) { return insert(entity, InsertOptions.empty()).getEntity(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, org.springframework.data.cassandra.core.InsertOptions) - */ @Override public EntityWriteResult insert(T entity, InsertOptions options) { @@ -701,17 +620,11 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return executeSave(entity, tableName, insert); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#update(java.lang.Object) - */ @Override public T update(T entity) { return update(entity, UpdateOptions.empty()).getEntity(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#update(java.lang.Object, org.springframework.data.cassandra.core.UpdateOptions) - */ @Override public EntityWriteResult update(T entity, UpdateOptions options) { @@ -757,17 +670,11 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return executeSave(entity, tableName, builder.build()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object) - */ @Override public void delete(Object entity) { delete(entity, QueryOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object, org.springframework.data.cassandra.core.cql.QueryOptions) - */ @Override public WriteResult delete(Object entity, QueryOptions options) { @@ -803,9 +710,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return executeDelete(entity, tableName, delete, result -> {}); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#deleteById(java.lang.Object, java.lang.Class) - */ @Override public boolean deleteById(Object id, Class entityClass) { @@ -827,9 +731,6 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return result; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#truncate(java.lang.Class) - */ @Override public void truncate(Class entityClass) { @@ -850,33 +751,21 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP // Fluent API entry points // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation#query(java.lang.Class) - */ @Override public ExecutableSelect query(Class domainType) { return new ExecutableSelectOperationSupport(this).query(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableInsertOperation#insert(java.lang.Class) - */ @Override public ExecutableInsert insert(Class domainType) { return new ExecutableInsertOperationSupport(this).insert(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableUpdateOperation#update(java.lang.Class) - */ @Override public ExecutableUpdate update(Class domainType) { return new ExecutableUpdateOperationSupport(this).update(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableDeleteOperation#remove(java.lang.Class) - */ @Override public ExecutableDelete delete(Class domainType) { return new ExecutableDeleteOperationSupport(this).delete(domainType); @@ -1068,28 +957,16 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP this.statement = PreparedStatementDelegate.getStatementForPrepare(statement); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.oss.driver.api.core.CqlSession) - */ @Override public PreparedStatement createPreparedStatement(CqlSession session) throws DriverException { return session.prepare(statement); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementBinder#bindValues(com.datastax.oss.driver.api.core.cql.PreparedStatement) - */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { return PreparedStatementDelegate.bind(statement, ps); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.CqlProvider#getCql() - */ @Override public String getCql() { return statement.getQuery(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/DeleteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/DeleteOptions.java index 2752b8bcd..bb8bdd62f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/DeleteOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/DeleteOptions.java @@ -100,10 +100,6 @@ public class DeleteOptions extends WriteOptions { return ifCondition; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -127,10 +123,6 @@ public class DeleteOptions extends WriteOptions { return ObjectUtils.nullSafeEquals(ifCondition, that.ifCondition); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = super.hashCode(); @@ -159,9 +151,6 @@ public class DeleteOptions extends WriteOptions { this.ifExists = deleteOptions.ifExists; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) - */ @Override public DeleteOptionsBuilder consistencyLevel(ConsistencyLevel consistencyLevel) { @@ -169,27 +158,18 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(String) - */ @Override public DeleteOptionsBuilder executionProfile(String profileName) { super.executionProfile(profileName); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(org.springframework.data.cassandra.core.cql.ExecutionProfileResolver) - */ @Override public DeleteOptionsBuilder executionProfile(ExecutionProfileResolver executionProfileResolver) { super.executionProfile(executionProfileResolver); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#fetchSize(int) - */ @Override @Deprecated public DeleteOptionsBuilder fetchSize(int fetchSize) { @@ -198,9 +178,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#keyspace() - */ @Override public DeleteOptionsBuilder keyspace(CqlIdentifier keyspace) { @@ -208,9 +185,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#pageSize(int) - */ @Override public DeleteOptionsBuilder pageSize(int pageSize) { @@ -218,9 +192,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long) - */ @Override @Deprecated public DeleteOptionsBuilder readTimeout(long readTimeout) { @@ -229,9 +200,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) - */ @Override @Deprecated public DeleteOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -240,18 +208,12 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#serialConsistencyLevel(com.datastax.oss.driver.api.core.ConsistencyLevel) - */ @Override public DeleteOptionsBuilder serialConsistencyLevel(ConsistencyLevel consistencyLevel) { super.serialConsistencyLevel(consistencyLevel); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(java.time.Duration) - */ @Override public DeleteOptionsBuilder timeout(Duration timeout) { @@ -259,9 +221,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(java.time.Duration) - */ @Override public DeleteOptionsBuilder ttl(Duration ttl) { @@ -269,9 +228,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#tracing(boolean) - */ @Override public DeleteOptionsBuilder tracing(boolean tracing) { @@ -279,9 +235,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#withTracing() - */ @Override public DeleteOptionsBuilder withTracing() { @@ -289,18 +242,12 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(int) - */ public DeleteOptionsBuilder ttl(int ttl) { super.ttl(ttl); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(long) - */ @Override public DeleteOptionsBuilder timestamp(long timestamp) { @@ -308,9 +255,6 @@ public class DeleteOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(java.time.Instant) - */ @Override public DeleteOptionsBuilder timestamp(Instant timestamp) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/EntityOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/EntityOperations.java index 8ca6b346d..d2fd9e85b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/EntityOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/EntityOperations.java @@ -246,33 +246,21 @@ class EntityOperations { return new MappedEntity<>(entity, propertyAccessor); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.Entity#getBean() - */ @Override public T getBean() { return this.propertyAccessor.getBean(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.Entity#isNew() - */ @Override public boolean isNew() { return this.entity.isNew(getBean()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.Entity#isVersionedEntity() - */ @Override public boolean isVersionedEntity() { return this.entity.hasVersionProperty(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.Entity#getVersion() - */ @Override @Nullable public Object getVersion() { @@ -304,9 +292,6 @@ class EntityOperations { this.propertyAccessor = propertyAccessor; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity#appendVersionCondition(com.datastax.oss.driver.api.querybuilder.update.Update, java.lang.Number) - */ @Override public StatementBuilder appendVersionCondition(StatementBuilder update, Number currentVersionNumber) { @@ -316,9 +301,6 @@ class EntityOperations { }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity#appendVersionCondition(com.datastax.oss.driver.api.querybuilder.delete.Delete) - */ @Override public StatementBuilder appendVersionCondition(StatementBuilder delete) { @@ -327,9 +309,6 @@ class EntityOperations { }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity#initializeVersionProperty() - */ @Override public T initializeVersionProperty() { @@ -343,9 +322,6 @@ class EntityOperations { return this.propertyAccessor.getBean(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity#incrementVersion() - */ @Override public T incrementVersion() { @@ -359,9 +335,6 @@ class EntityOperations { return this.propertyAccessor.getBean(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.MappedEntity#getVersion() - */ @Override @Nullable public Number getVersion() { @@ -371,9 +344,6 @@ class EntityOperations { return this.propertyAccessor.getProperty(versionProperty, Number.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity#getPersistentEntity() - */ @Override public CassandraPersistentEntity getPersistentEntity() { return this.entity; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupport.java index b081a7e8d..dc1a9a989 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupport.java @@ -37,9 +37,6 @@ class ExecutableDeleteOperationSupport implements ExecutableDeleteOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableDeleteOperation#remove(java.lang.Class) - */ @Override public ExecutableDelete delete(Class domainType) { @@ -66,9 +63,6 @@ class ExecutableDeleteOperationSupport implements ExecutableDeleteOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableDeleteOperation.DeleteWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public DeleteWithQuery inTable(CqlIdentifier tableName) { @@ -77,9 +71,6 @@ class ExecutableDeleteOperationSupport implements ExecutableDeleteOperation { return new ExecutableDeleteSupport(this.template, this.domainType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableDeleteOperation.DeleteWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingDelete matching(Query query) { @@ -88,9 +79,6 @@ class ExecutableDeleteOperationSupport implements ExecutableDeleteOperation { return new ExecutableDeleteSupport(this.template, this.domainType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableDeleteOperation.TerminatingDelete#all() - */ public WriteResult all() { return this.template.doDelete(this.query, this.domainType, getTableName()); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupport.java index 8af195511..eb2636b38 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupport.java @@ -36,9 +36,6 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableInsertOperation#insert(java.lang.Class) - */ @Override public ExecutableInsert insert(Class domainType) { @@ -65,9 +62,6 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableInsertOperation.InsertWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public InsertWithOptions inTable(CqlIdentifier tableName) { @@ -76,9 +70,6 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation { return new ExecutableInsertSupport<>(this.template, this.domainType, this.insertOptions, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableInsertOperation.InsertWithOptions#withOptions(org.springframework.data.cassandra.core.InsertOptions) - */ @Override public TerminatingInsert withOptions(InsertOptions insertOptions) { @@ -87,9 +78,6 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation { return new ExecutableInsertSupport<>(this.template, this.domainType, insertOptions, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableInsertOperation.TerminatingInsert#one(java.lang.Object) - */ @Override public EntityWriteResult one(T object) { 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 31e0cd323..0f7761ff9 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 @@ -42,9 +42,6 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation#query(java.lang.Class) - */ @Override public ExecutableSelect query(Class domainType) { @@ -74,9 +71,6 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.SelectWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public SelectWithProjection inTable(CqlIdentifier tableName) { @@ -85,9 +79,6 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { return new ExecutableSelectSupport<>(this.template, this.domainType, this.returnType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.SelectWithProjection#as(java.lang.Class) - */ @Override public SelectWithQuery as(Class returnType) { @@ -96,9 +87,6 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { return new ExecutableSelectSupport<>(this.template, this.domainType, returnType, this.query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.SelectWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingSelect matching(Query query) { @@ -107,25 +95,16 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { return new ExecutableSelectSupport<>(this.template, this.domainType, this.returnType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#count() - */ @Override public long count() { return this.template.doCount(this.query, this.domainType, getTableName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#exists() - */ @Override public boolean exists() { return this.template.doExists(this.query, this.domainType, getTableName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#firstValue() - */ @Override public T firstValue() { @@ -134,9 +113,6 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { return ObjectUtils.isEmpty(result) ? null : result.iterator().next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#oneValue() - */ @Override public T oneValue() { @@ -154,17 +130,11 @@ class ExecutableSelectOperationSupport implements ExecutableSelectOperation { return result.iterator().next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#all() - */ @Override public List all() { return this.template.doSelect(this.query, this.domainType, getTableName(), this.returnType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableSelectOperation.TerminatingSelect#stream() - */ @Override public Stream stream() { return this.template.doStream(this.query, this.domainType, getTableName(), this.returnType); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupport.java index b794f9aca..2468d0bfc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupport.java @@ -39,9 +39,6 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableUpdateOperation#update(java.lang.Class) - */ @Override public ExecutableUpdate update(Class domainType) { @@ -68,9 +65,6 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableUpdateOperation.UpdateWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public UpdateWithQuery inTable(CqlIdentifier tableName) { @@ -79,9 +73,6 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation { return new ExecutableUpdateSupport(this.template, this.domainType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableUpdateOperation.UpdateWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingUpdate matching(Query query) { @@ -90,9 +81,6 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation { return new ExecutableUpdateSupport(this.template, this.domainType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ExecutableUpdateOperation.TerminatingUpdate#apply(org.springframework.data.cassandra.core.query.Update) - */ @Override public WriteResult apply(Update update) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java index 09eb8ba02..32107f8b6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java @@ -98,10 +98,6 @@ public class InsertOptions extends WriteOptions { return this.insertNulls; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -126,10 +122,6 @@ public class InsertOptions extends WriteOptions { return insertNulls == that.insertNulls; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = super.hashCode(); @@ -161,9 +153,6 @@ public class InsertOptions extends WriteOptions { this.insertNulls = insertOptions.insertNulls; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) - */ @Override public InsertOptionsBuilder consistencyLevel(ConsistencyLevel consistencyLevel) { @@ -171,36 +160,24 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(String) - */ @Override public InsertOptionsBuilder executionProfile(String profileName) { super.executionProfile(profileName); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(org.springframework.data.cassandra.core.cql.ExecutionProfileResolver) - */ @Override public InsertOptionsBuilder executionProfile(ExecutionProfileResolver executionProfileResolver) { super.executionProfile(executionProfileResolver); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#fetchSize(int) - */ @Override @Deprecated public InsertOptionsBuilder fetchSize(int fetchSize) { return (InsertOptionsBuilder) super.fetchSize(fetchSize); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#keyspace() - */ @Override public InsertOptionsBuilder keyspace(CqlIdentifier keyspace) { @@ -208,17 +185,11 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#pageSize(int) - */ @Override public InsertOptionsBuilder pageSize(int pageSize) { return (InsertOptionsBuilder) super.pageSize(pageSize); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long) - */ @Override @Deprecated public InsertOptionsBuilder readTimeout(long readTimeout) { @@ -227,9 +198,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) - */ @Override @Deprecated public InsertOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -238,18 +206,12 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#serialConsistencyLevel(com.datastax.oss.driver.api.core.ConsistencyLevel) - */ @Override public InsertOptionsBuilder serialConsistencyLevel(ConsistencyLevel consistencyLevel) { super.serialConsistencyLevel(consistencyLevel); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(java.time.Duration) - */ @Override public InsertOptionsBuilder timeout(Duration timeout) { @@ -257,9 +219,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(java.time.Duration) - */ @Override public InsertOptionsBuilder ttl(Duration ttl) { @@ -267,9 +226,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#tracing(boolean) - */ @Override public InsertOptionsBuilder tracing(boolean tracing) { @@ -277,9 +233,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#withTracing() - */ @Override public InsertOptionsBuilder withTracing() { @@ -287,9 +240,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(int) - */ @Override public InsertOptionsBuilder ttl(int ttl) { @@ -297,9 +247,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(long) - */ @Override public InsertOptionsBuilder timestamp(long timestamp) { @@ -307,9 +254,6 @@ public class InsertOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(java.time.Instant) - */ @Override public InsertOptionsBuilder timestamp(Instant timestamp) { 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 9593df8ed..a98abe3b5 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 @@ -125,9 +125,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return this.statementFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#execute() - */ @Override public Mono execute() { @@ -153,9 +150,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#withTimestamp(long) - */ @Override public ReactiveCassandraBatchOperations withTimestamp(long timestamp) { @@ -165,9 +159,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#insert(java.lang.Object[]) - */ @Override public ReactiveCassandraBatchOperations insert(Object... entities) { @@ -176,25 +167,16 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return insert(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#insert(java.lang.Iterable) - */ @Override public ReactiveCassandraBatchOperations insert(Iterable entities) { return insert(entities, InsertOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#insert(reactor.core.publisher.Mono) - */ @Override public ReactiveCassandraBatchOperations insert(Mono> entities) { return insert(entities, InsertOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#insert(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations insert(Iterable entities, WriteOptions options) { @@ -208,9 +190,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#insert(reactor.core.publisher.Mono, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations insert(Mono> entities, WriteOptions options) { @@ -244,9 +223,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return insertQueries; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#update(java.lang.Object[]) - */ @Override public ReactiveCassandraBatchOperations update(Object... entities) { @@ -255,25 +231,16 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return update(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#update(java.lang.Iterable) - */ @Override public ReactiveCassandraBatchOperations update(Iterable entities) { return update(entities, UpdateOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#update(reactor.core.publisher.Mono) - */ @Override public ReactiveCassandraBatchOperations update(Mono> entities) { return update(entities, UpdateOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#update(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations update(Iterable entities, WriteOptions options) { @@ -287,9 +254,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#update(reactor.core.publisher.Mono, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations update(Mono> entities, WriteOptions options) { @@ -321,9 +285,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return updateQueries; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#delete(java.lang.Object[]) - */ @Override public ReactiveCassandraBatchOperations delete(Object... entities) { @@ -332,25 +293,16 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return delete(Arrays.asList(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#delete(java.lang.Iterable) - */ @Override public ReactiveCassandraBatchOperations delete(Iterable entities) { return delete(entities, DeleteOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#delete(reactor.core.publisher.Mono) - */ @Override public ReactiveCassandraBatchOperations delete(Mono> entities) { return delete(entities, DeleteOptions.empty()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#delete(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations delete(Iterable entities, WriteOptions options) { @@ -364,9 +316,6 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraBatchOperations#delete(reactor.core.publisher.Mono, org.springframework.data.cassandra.core.cql.WriteOptions) - */ @Override public ReactiveCassandraBatchOperations delete(Mono> entities, WriteOptions options) { 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 cf73559b8..60af6ad66 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 @@ -192,25 +192,16 @@ public class ReactiveCassandraTemplate this.statementFactory = new StatementFactory(converter); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#batchOps(com.datastax.oss.driver.api.core.cql.BatchType) - */ @Override public ReactiveCassandraBatchOperations batchOps(BatchType batchType) { return new ReactiveCassandraBatchTemplate(this, batchType); } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ @Override public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { this.eventPublisher = applicationEventPublisher; } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { @@ -228,17 +219,11 @@ public class ReactiveCassandraTemplate this.entityCallbacks = entityCallbacks; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#getReactiveCqlOperations() - */ @Override public ReactiveCqlOperations getReactiveCqlOperations() { return this.cqlOperations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#getConverter() - */ @Override public CassandraConverter getConverter() { return this.converter; @@ -319,9 +304,6 @@ public class ReactiveCassandraTemplate // Methods dealing with static CQL // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#select(java.lang.String, java.lang.Class) - */ @Override public Flux select(String cql, Class entityClass) { @@ -330,9 +312,6 @@ public class ReactiveCassandraTemplate return select(SimpleStatement.newInstance(cql), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#selectOne(java.lang.String, java.lang.Class) - */ @Override public Mono selectOne(String cql, Class entityClass) { return select(cql, entityClass).next(); @@ -342,9 +321,6 @@ public class ReactiveCassandraTemplate // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Mono execute(Statement statement) throws DataAccessException { @@ -353,9 +329,6 @@ public class ReactiveCassandraTemplate return doExecute(statement, Function.identity()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#select(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Flux select(Statement statement, Class entityClass) { @@ -368,17 +341,11 @@ public class ReactiveCassandraTemplate return doQuery(statement, (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#selectOne(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Mono selectOne(Statement statement, Class entityClass) { return select(statement, entityClass).next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#slice(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Mono> slice(Statement statement, Class entityClass) { @@ -404,9 +371,6 @@ public class ReactiveCassandraTemplate // Methods dealing with org.springframework.data.cassandra.core.query.Query // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#select(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Flux select(Query query, Class entityClass) throws DataAccessException { @@ -432,9 +396,6 @@ public class ReactiveCassandraTemplate return doQuery(select.build(), (row, rowNum) -> mapper.apply(row)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#selectOne(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Mono selectOne(Query query, Class entityClass) throws DataAccessException { @@ -444,9 +405,6 @@ public class ReactiveCassandraTemplate return select(query, entityClass).next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#slice(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Mono> slice(Query query, Class entityClass) throws DataAccessException { @@ -458,9 +416,6 @@ public class ReactiveCassandraTemplate return slice(select.build(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(org.springframework.data.cassandra.core.query.Query, org.springframework.data.cassandra.core.query.Update, java.lang.Class) - */ @Override public Mono update(Query query, org.springframework.data.cassandra.core.query.Update update, Class entityClass) throws DataAccessException { @@ -481,9 +436,6 @@ public class ReactiveCassandraTemplate return doExecuteAndFlatMap(statement.build(), ReactiveCassandraTemplate::toWriteResult); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Mono delete(Query query, Class entityClass) throws DataAccessException { @@ -510,9 +462,6 @@ public class ReactiveCassandraTemplate // Methods dealing with entities // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#count(java.lang.Class) - */ @Override public Mono count(Class entityClass) { @@ -521,9 +470,6 @@ public class ReactiveCassandraTemplate return doCount(Query.empty(), entityClass, getTableName(entityClass)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#count(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Mono count(Query query, Class entityClass) throws DataAccessException { @@ -548,9 +494,6 @@ public class ReactiveCassandraTemplate return mono.switchIfEmpty(Mono.just(0L)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#exists(java.lang.Object, java.lang.Class) - */ @Override public Mono exists(Object id, Class entityClass) { @@ -563,9 +506,6 @@ public class ReactiveCassandraTemplate return doQuery(builder.build(), (row, rowNum) -> row).hasElements(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#exists(org.springframework.data.cassandra.core.query.Query, java.lang.Class) - */ @Override public Mono exists(Query query, Class entityClass) throws DataAccessException { @@ -583,9 +523,6 @@ public class ReactiveCassandraTemplate return doQuery(builder.build(), (row, rowNum) -> row).hasElements(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#selectOneById(java.lang.Object, java.lang.Class) - */ @Override public Mono selectOneById(Object id, Class entityClass) { @@ -598,17 +535,11 @@ public class ReactiveCassandraTemplate return selectOne(builder.build(), entityClass); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(java.lang.Object) - */ @Override public Mono insert(T entity) { return insert(entity, InsertOptions.empty()).map(EntityWriteResult::getEntity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(java.lang.Object, org.springframework.data.cassandra.core.InsertOptions) - */ @Override public Mono> insert(T entity, InsertOptions options) { @@ -662,17 +593,11 @@ public class ReactiveCassandraTemplate return executeSave(entity, tableName, insert); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(java.lang.Object) - */ @Override public Mono update(T entity) { return update(entity, UpdateOptions.empty()).map(EntityWriteResult::getEntity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(java.lang.Object, org.springframework.data.cassandra.core.UpdateOptions) - */ @Override public Mono> update(T entity, UpdateOptions options) { @@ -723,17 +648,11 @@ public class ReactiveCassandraTemplate return executeSave(entity, tableName, builder.build()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(java.lang.Object) - */ @Override public Mono delete(T entity) { return delete(entity, QueryOptions.empty()).map(reactiveWriteResult -> entity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) - */ @Override public Mono delete(Object entity, QueryOptions options) { @@ -773,9 +692,6 @@ public class ReactiveCassandraTemplate return executeDelete(entity, tableName, delete, (result, sink) -> sink.next(result)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#deleteById(java.lang.Object, java.lang.Class) - */ @Override public Mono deleteById(Object id, Class entityClass) { @@ -794,9 +710,6 @@ public class ReactiveCassandraTemplate return result.doOnNext(it -> maybeEmitEvent(new AfterDeleteEvent<>(delete, entityClass, tableName))); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#truncate(java.lang.Class) - */ @Override public Mono truncate(Class entityClass) { @@ -816,33 +729,21 @@ public class ReactiveCassandraTemplate // Fluent API entry points // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveDeleteOperation#remove(java.lang.Class) - */ @Override public ReactiveDelete delete(Class domainType) { return new ReactiveDeleteOperationSupport(this).delete(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveInsertOperation#insert(java.lang.Class) - */ @Override public ReactiveInsert insert(Class domainType) { return new ReactiveInsertOperationSupport(this).insert(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation#query(java.lang.Class) - */ @Override public ReactiveSelect query(Class domainType) { return new ReactiveSelectOperationSupport(this).query(domainType); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveUpdateOperation#update(java.lang.Class) - */ @Override public ReactiveUpdate update(Class domainType) { return new ReactiveUpdateOperationSupport(this).update(domainType); @@ -1029,28 +930,16 @@ public class ReactiveCassandraTemplate this.statement = PreparedStatementDelegate.getStatementForPrepare(statement); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator#doInSession(org.springframework.data.cassandra.ReactiveSession) - */ @Override public Mono createPreparedStatement(ReactiveSession session) throws DriverException { return session.prepare(statement); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementBinder#bindValues(com.datastax.oss.driver.api.core.cql.PreparedStatement) - */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { return PreparedStatementDelegate.bind(statement, ps); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.CqlProvider#getCql() - */ @Override public String getCql() { return statement.getQuery(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupport.java index 5c5e9b057..3d5cc8c4e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupport.java @@ -39,9 +39,6 @@ class ReactiveDeleteOperationSupport implements ReactiveDeleteOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveDeleteOperation#remove(java.lang.Class) - */ @Override public ReactiveDelete delete(Class domainType) { @@ -68,9 +65,6 @@ class ReactiveDeleteOperationSupport implements ReactiveDeleteOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveDeleteOperation.DeleteWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public DeleteWithQuery inTable(CqlIdentifier tableName) { @@ -79,9 +73,6 @@ class ReactiveDeleteOperationSupport implements ReactiveDeleteOperation { return new ReactiveDeleteSupport(this.template, this.domainType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveDeleteOperation.DeleteWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingDelete matching(Query query) { @@ -90,9 +81,6 @@ class ReactiveDeleteOperationSupport implements ReactiveDeleteOperation { return new ReactiveDeleteSupport(this.template, this.domainType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveDeleteOperation.TerminatingDelete#all() - */ public Mono all() { return this.template.doDelete(this.query, this.domainType, getTableName()); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupport.java index d6acc4598..aa05a099b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupport.java @@ -36,9 +36,6 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveInsertOperation#insert(java.lang.Class) - */ @Override public ReactiveInsert insert(Class domainType) { @@ -65,9 +62,6 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveInsertOperation.InsertWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public InsertWithOptions inTable(CqlIdentifier tableName) { @@ -76,9 +70,6 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation { return new ReactiveInsertSupport<>(this.template, this.domainType, this.insertOptions, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveInsertOperation.InsertWithOptions#withOptions(org.springframework.data.cassandra.core.InsertOptions) - */ @Override public TerminatingInsert withOptions(InsertOptions insertOptions) { @@ -87,9 +78,6 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation { return new ReactiveInsertSupport<>(this.template, this.domainType, insertOptions, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveInsertOperation.TerminatingInsert#one(java.lang.Object) - */ @Override public Mono> one(T object) { 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 a1d5a9986..cc7804d7f 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 @@ -41,9 +41,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation#query(java.lang.Class) - */ @Override public ReactiveSelect query(Class domainType) { @@ -73,9 +70,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.SelectWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public SelectWithProjection inTable(CqlIdentifier tableName) { @@ -84,9 +78,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { return new ReactiveSelectSupport<>(this.template, this.domainType, this.returnType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.SelectWithProjection#as(java.lang.Class) - */ @Override public SelectWithQuery as(Class returnType) { @@ -95,9 +86,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { return new ReactiveSelectSupport<>(this.template, this.domainType, returnType, this.query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.SelectWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingSelect matching(Query query) { @@ -106,33 +94,21 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { return new ReactiveSelectSupport<>(this.template, this.domainType, this.returnType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#count() - */ @Override public Mono count() { return this.template.doCount(this.query, this.domainType, getTableName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#exists() - */ @Override public Mono exists() { return this.template.doExists(this.query, this.domainType, getTableName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#first() - */ @Override public Mono first() { return this.template.doSelect(this.query.limit(1), this.domainType, getTableName(), this.returnType).next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#one() - */ @Override public Mono one() { @@ -155,9 +131,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation { }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#all() - */ @Override public Flux all() { return this.template.doSelect(this.query, this.domainType, getTableName(), this.returnType); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupport.java index c5e52fbff..8921b20b8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupport.java @@ -41,9 +41,6 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation { this.template = template; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveUpdateOperation#update(java.lang.Class) - */ @Override public ReactiveUpdate update(Class domainType) { @@ -70,9 +67,6 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation { this.tableName = tableName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveUpdateOperation.UpdateWithTable#inTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public UpdateWithQuery inTable(CqlIdentifier tableName) { @@ -81,9 +75,6 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation { return new ReactiveUpdateSupport(this.template, this.domainType, this.query, tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.cassandra.core.query.Query) - */ @Override public TerminatingUpdate matching(Query query) { @@ -92,9 +83,6 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation { return new ReactiveUpdateSupport(this.template, this.domainType, query, this.tableName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.cassandra.core.query.Update) - */ @Override public Mono apply(Update update) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java index f9a0282b4..242a45a4d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java @@ -103,10 +103,6 @@ public class UpdateOptions extends WriteOptions { return ifCondition; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -131,10 +127,6 @@ public class UpdateOptions extends WriteOptions { return ObjectUtils.nullSafeEquals(ifCondition, that.ifCondition); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = super.hashCode(); @@ -166,9 +158,6 @@ public class UpdateOptions extends WriteOptions { this.ifCondition = updateOptions.ifCondition; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) - */ @Override public UpdateOptionsBuilder consistencyLevel(ConsistencyLevel consistencyLevel) { @@ -176,27 +165,18 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(String) - */ @Override public UpdateOptionsBuilder executionProfile(String profileName) { super.executionProfile(profileName); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(org.springframework.data.cassandra.core.cql.ExecutionProfileResolver) - */ @Override public UpdateOptionsBuilder executionProfile(ExecutionProfileResolver executionProfileResolver) { super.executionProfile(executionProfileResolver); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#fetchSize(int) - */ @Override @Deprecated public UpdateOptionsBuilder fetchSize(int fetchSize) { @@ -205,9 +185,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#keyspace() - */ @Override public UpdateOptionsBuilder keyspace(CqlIdentifier keyspace) { @@ -215,9 +192,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#pageSize(int) - */ @Override public UpdateOptionsBuilder pageSize(int pageSize) { @@ -225,9 +199,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long) - */ @Override @Deprecated public UpdateOptionsBuilder readTimeout(long readTimeout) { @@ -236,9 +207,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) - */ @Override @Deprecated public UpdateOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -247,18 +215,12 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#serialConsistencyLevel(com.datastax.oss.driver.api.core.ConsistencyLevel) - */ @Override public UpdateOptionsBuilder serialConsistencyLevel(ConsistencyLevel consistencyLevel) { super.serialConsistencyLevel(consistencyLevel); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#readTimeout(java.time.Duration) - */ @Override public UpdateOptionsBuilder timeout(Duration timeout) { @@ -266,9 +228,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(java.time.Duration) - */ @Override public UpdateOptionsBuilder ttl(Duration ttl) { @@ -276,9 +235,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#tracing(boolean) - */ @Override public UpdateOptionsBuilder tracing(boolean tracing) { @@ -286,9 +242,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#withTracing() - */ @Override public UpdateOptionsBuilder withTracing() { @@ -296,18 +249,12 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(int) - */ public UpdateOptionsBuilder ttl(int ttl) { super.ttl(ttl); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(long) - */ @Override public UpdateOptionsBuilder timestamp(long timestamp) { @@ -315,9 +262,6 @@ public class UpdateOptions extends WriteOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#timestamp(java.time.Instant) - */ @Override public UpdateOptionsBuilder timestamp(Instant timestamp) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java index 5f115f096..e30b124bb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AbstractCassandraConverter.java @@ -77,17 +77,11 @@ public abstract class AbstractCassandraConverter implements CassandraConverter, this.conversions = conversions; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraConverter#getCustomConversions() - */ @Override public CustomConversions getCustomConversions() { return this.conversions; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { initializeConverters(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java index a0f4d410d..7f3e3069c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java @@ -63,9 +63,6 @@ public interface CassandraConverter */ CodecRegistry getCodecRegistry(); - /* (non-Javadoc) - * @see org.springframework.data.convert.EntityConverter#getMappingContext() - */ @Override CassandraMappingContext getMappingContext(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java index d32d511d0..6137612ae 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java @@ -52,18 +52,10 @@ class DefaultCassandraColumnType extends DefaultColumnType implements CassandraC this.dataType = Lazy.of(dataType); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraColumnType#getDataType() - */ public DataType getDataType() { return dataType.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.DefaultColumnType#toString() - */ @Override public String toString() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java index 117bd8398..af56e9003 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java @@ -46,75 +46,43 @@ class DefaultColumnType implements ColumnType { return parameters; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#getType() - */ @Override public Class getType() { return typeInformation.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#isCollectionLike() - */ @Override public boolean isCollectionLike() { return typeInformation.isCollectionLike(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#isList() - */ @Override public boolean isList() { return List.class.isAssignableFrom(typeInformation.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#isSet() - */ @Override public boolean isSet() { return Set.class.isAssignableFrom(typeInformation.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#isMap() - */ @Override public boolean isMap() { return typeInformation.isMap(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#getComponentType() - */ @Nullable @Override public ColumnType getComponentType() { return !parameters.isEmpty() ? parameters.get(0) : null; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnType#getMapValueType() - */ @Nullable @Override public ColumnType getMapValueType() { return parameters.size() > 1 ? parameters.get(1) : null; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java index 663ea3269..87670f0e8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java @@ -163,10 +163,6 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { return AnnotatedElementUtils.hasAnnotation(type, Frozen.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnTypeResolver#resolve(org.springframework.data.util.TypeInformation) - */ @Override public CassandraColumnType resolve(TypeInformation typeInformation) { return resolve(typeInformation, FrozenIndicator.NOT_FROZEN); @@ -206,10 +202,6 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnTypeResolver#resolve(org.springframework.data.cassandra.core.mapping.CassandraType) - */ @Override public CassandraColumnType resolve(CassandraType annotation) { @@ -257,10 +249,6 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.ColumnTypeResolver#resolve(java.lang.Object) - */ @Override public ColumnType resolve(@Nullable Object value) { @@ -485,10 +473,6 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { super(type, Lazy.empty(), parameters); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.DefaultCassandraColumnType#getDataType() - */ @Override public DataType getDataType() { throw new MappingException(String.format("Cannot resolve DataType for %s", getType().getName())); 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 d4ee1c46d..349aca839 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 @@ -173,18 +173,12 @@ public class MappingCassandraConverter extends AbstractCassandraConverter return mappingContext; } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.spELContext = new SpELContext(this.spELContext, applicationContext); this.projectionFactory.setBeanFactory(applicationContext); } - /* (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; @@ -246,17 +240,11 @@ public class MappingCassandraConverter extends AbstractCassandraConverter return this.userTypeResolver != null ? this.userTypeResolver : getMappingContext().getUserTypeResolver(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraConverter#getMappingContext() - */ @Override public CassandraMappingContext getMappingContext() { return this.mappingContext; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraConverter#getColumnTypeResolver() - */ @Override public ColumnTypeResolver getColumnTypeResolver() { return this.cassandraTypeResolver; @@ -412,9 +400,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter return doReadTupleValue(context, tupleValue, typeHint); } - /* (non-Javadoc) - * @see org.springframework.data.convert.EntityReader#read(java.lang.Class, S) - */ @Override public R read(Class type, Object row) { @@ -566,9 +551,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter } } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraConverter#convertToColumnType(java.lang.Object) - */ @Override public Object convertToColumnType(Object obj) { return convertToColumnType(obj, ClassTypeInformation.from(obj.getClass())); @@ -1270,10 +1252,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter this.context = context; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter) - */ @Override protected T potentiallyConvertSpelValue(Object object, Parameter parameter) { return (T) context.convert(object, parameter.getType()); @@ -1423,10 +1401,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter this.parent = parent; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.ParameterValueProvider#getParameterValue(org.springframework.data.mapping.PreferredConstructor.Parameter) - */ @Nullable @SuppressWarnings("unchecked") public T getParameterValue(Parameter parameter) { 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 8626ca4c3..3c16dd0f9 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 @@ -596,26 +596,16 @@ public class QueryMapper { } } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.QueryMapper.Field#with(org.springframework.data.cassandra.core.query.ColumnName) - */ @Override public MetadataBackedField with(ColumnName name) { return new MetadataBackedField(name, entity, mappingContext, property); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.QueryMapper.Field#getProperty() - */ @Override public Optional getProperty() { return this.optionalProperty; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey() - */ @Override public ColumnName getMappedKey() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java index a8db9ebfe..6c91c588f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java @@ -51,9 +51,6 @@ public class RowValueProvider implements CassandraValueProvider { this.evaluator = evaluator; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty) - */ @Nullable @Override @SuppressWarnings("unchecked") @@ -65,9 +62,6 @@ public class RowValueProvider implements CassandraValueProvider { : (T) this.reader.get(property.getRequiredColumnName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) - */ @Override public boolean hasProperty(CassandraPersistentProperty property) { @@ -76,9 +70,6 @@ public class RowValueProvider implements CassandraValueProvider { return this.reader.contains(property.getRequiredColumnName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#getSource() - */ @Override public Object getSource() { return this.reader.getRow(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java index 3c64dcc29..109a4285c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java @@ -54,9 +54,6 @@ public class TupleValueProvider implements CassandraValueProvider { this.evaluator = evaluator; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty) - */ @Nullable @Override public T getPropertyValue(CassandraPersistentProperty property) { @@ -73,17 +70,11 @@ public class TupleValueProvider implements CassandraValueProvider { return tupleValue.get(ordinal, codecRegistry.codecFor(elementType)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) - */ @Override public boolean hasProperty(CassandraPersistentProperty property) { return this.tupleValue.getType().getComponentTypes().size() >= property.getRequiredOrdinal(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#getSource() - */ @Override public Object getSource() { return this.tupleValue; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java index 1337afed6..791ce1b19 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java @@ -49,9 +49,6 @@ public class UdtValueProvider implements CassandraValueProvider { this.evaluator = evaluator; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty) - */ @Nullable public T getPropertyValue(CassandraPersistentProperty property) { @@ -64,17 +61,11 @@ public class UdtValueProvider implements CassandraValueProvider { return (T) this.udtValue.getObject(property.getRequiredColumnName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) - */ @Override public boolean hasProperty(CassandraPersistentProperty property) { return this.udtValue.getType().contains(property.getRequiredColumnName()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#getSource() - */ @Override public Object getSource() { return this.udtValue; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java index d1915bb3a..5530f8bf3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java @@ -40,9 +40,6 @@ public class ArgumentPreparedStatementBinder implements PreparedStatementBinder this.args = args; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementBinder#bindValues(com.datastax.driver.core.PreparedStatement) - */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { return args != null ? ps.bind(args) : ps.bind(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java index f40ded36f..d2847c3b3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java @@ -118,10 +118,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera // Methods dealing with a plain com.datastax.oss.driver.api.core.CqlSession // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncSessionCallback) - */ @Override public ListenableFuture execute(AsyncSessionCallback action) throws DataAccessException { @@ -138,10 +134,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera // Methods dealing with static CQL // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String) - */ @Override public ListenableFuture execute(String cql) throws DataAccessException { @@ -150,10 +142,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return new MappingListenableFutureAdapter<>(queryForResultSet(cql), AsyncResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor) - */ @Override public ListenableFuture query(String cql, AsyncResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -176,10 +164,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -189,55 +173,31 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper) throws DataAccessException { return query(cql, newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String) - */ @Override public ListenableFuture>> queryForList(String cql) throws DataAccessException { return query(cql, newAsyncResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class) - */ @Override public ListenableFuture> queryForList(String cql, Class elementType) throws DataAccessException { return query(cql, newAsyncResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(java.lang.String) - */ @Override public ListenableFuture> queryForMap(String cql) throws DataAccessException { return queryForObject(cql, newColumnMapRowMapper()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class) - */ @Override public ListenableFuture queryForObject(String cql, Class requiredType) throws DataAccessException { return queryForObject(cql, newSingleColumnRowMapper(requiredType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -247,10 +207,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(java.lang.String) - */ @Override public ListenableFuture queryForResultSet(String cql) throws DataAccessException { return query(cql, AsyncCqlTemplate::toResultSet); @@ -260,10 +216,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ListenableFuture execute(Statement statement) throws DataAccessException { @@ -272,10 +224,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return new MappingListenableFutureAdapter<>(queryForResultSet(statement), AsyncResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor) - */ @Override public ListenableFuture query(Statement statement, AsyncResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -299,10 +247,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public ListenableFuture query(Statement statement, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -313,58 +257,34 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture> query(Statement statement, RowMapper rowMapper) throws DataAccessException { return query(statement, newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ListenableFuture>> queryForList(Statement statement) throws DataAccessException { return query(statement, newAsyncResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture> queryForList(Statement statement, Class elementType) throws DataAccessException { return query(statement, newAsyncResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ListenableFuture> queryForMap(Statement statement) throws DataAccessException { return queryForObject(statement, newColumnMapRowMapper()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public ListenableFuture queryForObject(Statement statement, Class requiredType) throws DataAccessException { return queryForObject(statement, newSingleColumnRowMapper(requiredType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -375,10 +295,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ListenableFuture queryForResultSet(Statement statement) throws DataAccessException { return query(statement, AsyncCqlTemplate::toResultSet); @@ -388,10 +304,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera // Methods dealing with com.datastax.driver.core.PreparedStatement // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator) - */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator) throws DataAccessException { @@ -400,19 +312,11 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera AsyncResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, java.lang.Object[]) - */ @Override public ListenableFuture execute(String cql, Object... args) throws DataAccessException { return execute(cql, newPreparedStatementBinder(args)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.@Nullablender) - */ @Override public ListenableFuture execute(String cql, @Nullable PreparedStatementBinder psb) throws DataAccessException { @@ -421,19 +325,11 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera query(newAsyncPreparedStatementCreator(cql), psb, AsyncCqlTemplate::toResultSet), AsyncResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) - */ @Override public ListenableFuture execute(String cql, PreparedStatementCallback action) throws DataAccessException { return execute(newAsyncPreparedStatementCreator(cql), action); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) - */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator, PreparedStatementCallback action) throws DataAccessException { @@ -464,10 +360,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor) - */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, AsyncResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -475,10 +367,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return query(preparedStatementCreator, null, resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -489,10 +377,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, RowMapper rowMapper) throws DataAccessException { @@ -500,10 +384,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return query(preparedStatementCreator, null, newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor) - */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, AsyncResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -543,10 +423,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -557,30 +433,18 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { return query(preparedStatementCreator, psb, newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor, java.lang.Object[]) - */ @Override public ListenableFuture query(String cql, AsyncResultSetExtractor resultSetExtractor, Object... args) throws DataAccessException { return query(newAsyncPreparedStatementCreator(cql), newPreparedStatementBinder(args), resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler, java.lang.Object[]) - */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) throws DataAccessException { @@ -592,10 +456,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -603,10 +463,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor) - */ @Override public ListenableFuture query(String cql, @Nullable PreparedStatementBinder psb, AsyncResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -614,10 +470,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return query(newAsyncPreparedStatementCreator(cql), psb, resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public ListenableFuture query(String cql, @Nullable PreparedStatementBinder psb, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -629,10 +481,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public ListenableFuture> query(String cql, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -640,10 +488,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return query(newAsyncPreparedStatementCreator(cql), psb, newAsyncResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Object[]) - */ @Override public ListenableFuture>> queryForList(String cql, Object... args) throws DataAccessException { @@ -652,10 +496,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera newAsyncResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public ListenableFuture> queryForList(String cql, Class elementType, Object... args) throws DataAccessException { @@ -664,19 +504,11 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera newAsyncResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) - */ @Override public ListenableFuture> queryForMap(String cql, Object... args) throws DataAccessException { return queryForObject(cql, newColumnMapRowMapper(), args); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public ListenableFuture queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { @@ -684,10 +516,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera return queryForObject(cql, newSingleColumnRowMapper(requiredType), args); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -699,10 +527,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) - */ @Override public ListenableFuture queryForResultSet(String cql, Object... args) throws DataAccessException { return query(cql, AsyncCqlTemplate::toResultSet, args); @@ -838,9 +662,6 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera this.rowCallbackHandler = rowCallbackHandler; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) - */ @Override @Nullable public ListenableFuture extractData(AsyncResultSet resultSet) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java index 7481f8236..9b2af6d15 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java @@ -56,9 +56,6 @@ public class AsyncRowMapperResultSetExtractor implements AsyncResultSetExtrac this.rowMapper = rowMapper; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) - */ @Override public ListenableFuture> extractData(AsyncResultSet resultSet) throws DriverException, DataAccessException { return AsyncResultStream.from(resultSet).map(rowMapper).collect(Collectors.toList()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java index 300648acd..a14b26451 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java @@ -70,9 +70,6 @@ public class CachedPreparedStatementCreator implements PreparedStatementCreator return this.cql; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.oss.driver.api.core.CqlSession) - */ @Override public PreparedStatement createPreparedStatement(CqlSession session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java index be17bf1ae..9b3b11797 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java @@ -58,9 +58,6 @@ public class CassandraExceptionTranslator implements CqlExceptionTranslator { private static final Set RESOURCE_FAILURE_TYPES = new HashSet<>( Arrays.asList("ReadFailureException", "WriteFailureException", "FunctionExecutionException")); - /* (non-Javadoc) - * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException) - */ @Override @Nullable public DataAccessException translateExceptionIfPossible(RuntimeException exception) { @@ -72,9 +69,6 @@ public class CassandraExceptionTranslator implements CqlExceptionTranslator { return translate(null, null, exception); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.cql.CQLExceptionTranslator#translate(java.lang.String, java.lang.String, com.datastax.oss.driver.api.core.DriverException) - */ @Override public DataAccessException translate(@Nullable String task, @Nullable String cql, RuntimeException exception) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java index c2584183a..f5d5fe8ee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java @@ -43,9 +43,6 @@ import com.datastax.oss.driver.api.core.cql.Row; */ public class ColumnMapRowMapper implements RowMapper> { - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.RowMapper#mapRow(com.datastax.oss.driver.api.core.cql.Row, int) - */ @Override public Map mapRow(Row rs, int rowNum) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java index bd3fda17d..36021f643 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java @@ -251,10 +251,6 @@ public final class CqlIdentifier implements Comparable, Serializa return identifier.equals(that.identifier); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = identifier.hashCode(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java index a265fe49e..b88edb343 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java @@ -121,10 +121,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { // Methods dealing with a plain com.datastax.oss.driver.api.core.CqlSession // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.SessionCallback) - */ @Override public T execute(SessionCallback action) throws DataAccessException { @@ -141,10 +137,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { // Methods dealing with static CQL // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String) - */ @Override public boolean execute(String cql) throws DataAccessException { @@ -153,10 +145,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return queryForResultSet(cql).wasApplied(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor) - */ @Override @Nullable public T query(String cql, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -179,86 +167,50 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { query(cql, newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public List query(String cql, RowMapper rowMapper) throws DataAccessException { // noinspection ConstantConditions return query(cql, newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String) - */ @Override public List> queryForList(String cql) throws DataAccessException { // noinspection ConstantConditions return query(cql, newResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Class) - */ @Override public List queryForList(String cql, Class elementType) throws DataAccessException { // noinspection ConstantConditions return query(cql, newResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(java.lang.String) - */ @Override public Map queryForMap(String cql) throws DataAccessException { return queryForObject(cql, newColumnMapRowMapper()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, java.lang.Class) - */ @Override public T queryForObject(String cql, Class requiredType) throws DataAccessException { return queryForObject(cql, newSingleColumnRowMapper(requiredType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public T queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { return DataAccessUtils.requiredSingleResult(query(cql, newResultSetExtractor(rowMapper))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(java.lang.String) - */ @Override public ResultSet queryForResultSet(String cql) throws DataAccessException { // noinspection ConstantConditions return query(cql, rs -> rs); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(java.lang.String) - */ @Override public Iterable queryForRows(String cql) throws DataAccessException { return () -> queryForResultSet(cql).iterator(); @@ -268,10 +220,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public boolean execute(Statement statement) throws DataAccessException { @@ -280,10 +228,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return queryForResultSet(statement).wasApplied(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.ResultSetExtractor) - */ @Override public T query(Statement statement, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -301,96 +245,56 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public void query(Statement statement, RowCallbackHandler rowCallbackHandler) throws DataAccessException { query(statement, newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public List query(Statement statement, RowMapper rowMapper) throws DataAccessException { // noinspection ConstantConditions return query(statement, newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForStream(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Stream queryForStream(Statement statement, RowMapper rowMapper) throws DataAccessException { // noinspection ConstantConditions return query(statement, newStreamExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public List> queryForList(Statement statement) throws DataAccessException { // noinspection ConstantConditions return query(statement, newResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public List queryForList(Statement statement, Class elementType) throws DataAccessException { // noinspection ConstantConditions return query(statement, newResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Map queryForMap(Statement statement) throws DataAccessException { return queryForObject(statement, newColumnMapRowMapper()); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public T queryForObject(Statement statement, Class requiredType) throws DataAccessException { return queryForObject(statement, newSingleColumnRowMapper(requiredType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public T queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { return DataAccessUtils.requiredSingleResult(query(statement, newResultSetExtractor(rowMapper))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public ResultSet queryForResultSet(Statement statement) throws DataAccessException { // noinspection ConstantConditions return query(statement, rs -> rs); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Iterable queryForRows(Statement statement) throws DataAccessException { return () -> queryForResultSet(statement).iterator(); @@ -400,49 +304,29 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { // Methods dealing with com.datastax.driver.core.PreparedStatement // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, java.lang.Object[]) - */ @Override public boolean execute(String cql, Object... args) throws DataAccessException { return execute(cql, newPreparedStatementBinder(args)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder) - */ @Override public boolean execute(String cql, @Nullable PreparedStatementBinder psb) throws DataAccessException { // noinspection ConstantConditions return query(newPreparedStatementCreator(cql), psb, ResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) - */ @Nullable @Override public T execute(String cql, PreparedStatementCallback action) throws DataAccessException { return execute(newPreparedStatementCreator(cql), action); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.PreparedStatementCreator) - */ @Override public boolean execute(PreparedStatementCreator preparedStatementCreator) throws DataAccessException { // noinspection ConstantConditions return query(preparedStatementCreator, ResultSet::wasApplied); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) - */ @Override @Nullable public T execute(PreparedStatementCreator preparedStatementCreator, PreparedStatementCallback action) @@ -465,10 +349,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.ResultSetExtractor) - */ @Override public T query(PreparedStatementCreator preparedStatementCreator, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -476,10 +356,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(preparedStatementCreator, null, resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public void query(PreparedStatementCreator preparedStatementCreator, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -487,10 +363,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { query(preparedStatementCreator, null, newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public List query(PreparedStatementCreator preparedStatementCreator, RowMapper rowMapper) throws DataAccessException { @@ -498,10 +370,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(preparedStatementCreator, null, newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Stream queryForStream(PreparedStatementCreator preparedStatementCreator, RowMapper rowMapper) throws DataAccessException { @@ -509,10 +377,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(preparedStatementCreator, null, newStreamExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) - */ @Nullable @Override public T query(PreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, @@ -546,10 +410,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { } } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public void query(PreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -557,10 +417,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { query(preparedStatementCreator, psb, newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public List query(PreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -568,10 +424,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(preparedStatementCreator, psb, newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForStream(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Stream queryForStream(PreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -579,50 +431,30 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(preparedStatementCreator, psb, newStreamExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor, java.lang.Object[]) - */ @Override public T query(String cql, ResultSetExtractor resultSetExtractor, Object... args) throws DataAccessException { return query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler, java.lang.Object[]) - */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) throws DataAccessException { query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public List query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { // noinspection ConstantConditions return query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForStream(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public Stream queryForStream(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { // noinspection ConstantConditions return query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newStreamExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) - */ @Override public T query(String cql, @Nullable PreparedStatementBinder psb, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -630,20 +462,12 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(newPreparedStatementCreator(cql), psb, resultSetExtractor); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) - */ @Override public void query(String cql, @Nullable PreparedStatementBinder psb, RowCallbackHandler rowCallbackHandler) throws DataAccessException { query(newPreparedStatementCreator(cql), psb, newResultSetExtractor(rowCallbackHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public List query(String cql, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -651,10 +475,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return query(newPreparedStatementCreator(cql), psb, newResultSetExtractor(rowMapper)); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Object[]) - */ @Override public List> queryForList(String cql, Object... args) throws DataAccessException { // noinspection ConstantConditions @@ -662,10 +482,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { newResultSetExtractor(newColumnMapRowMapper())); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public List queryForList(String cql, Class elementType, Object... args) throws DataAccessException { // noinspection ConstantConditions @@ -673,66 +489,38 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { newResultSetExtractor(newSingleColumnRowMapper(elementType))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(java.lang.String, java.lang.Object[]) - */ @Override public Map queryForMap(String cql, Object... args) throws DataAccessException { return queryForObject(cql, newColumnMapRowMapper(), args); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public T queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { return queryForObject(cql, newSingleColumnRowMapper(requiredType), args); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public T queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { return DataAccessUtils.requiredSingleResult( query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newResultSetExtractor(rowMapper, 1))); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) - */ @Override public ResultSet queryForResultSet(String cql, Object... args) throws DataAccessException { // noinspection ConstantConditions return query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), rs -> rs); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(java.lang.String, java.lang.Object[]) - */ @Override public Iterable queryForRows(String cql, Object... args) throws DataAccessException { return () -> queryForResultSet(cql, args).iterator(); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#describeRing() - */ @Override public List describeRing() throws DataAccessException { return (List) describeRing(RingMemberHostMapper.INSTANCE); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlOperations#describeRing(org.springframework.data.cassandra.core.cql.HostMapper) - */ @Override public Collection describeRing(HostMapper hostMapper) throws DataAccessException { @@ -849,9 +637,6 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { this.rowCallbackHandler = rowCallbackHandler; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) - */ @Override @Nullable public Object extractData(ResultSet resultSet) { @@ -886,38 +671,22 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { this.counter = counter; } - /* - * (non-Javadoc) - * @see java.util.Spliterator#tryAdvance(java.util.function.Consumer) - */ @Override public boolean tryAdvance(Consumer action) { return this.delegate.tryAdvance(row -> action.accept(this.rowMapper.mapRow(row, this.counter.incrementAndGet()))); } - /* - * (non-Javadoc) - * @see java.util.Spliterator#trySplit() - */ @Override @Nullable public Spliterator trySplit() { return new ResultSetSpliterator<>(delegate.trySplit(), this.rowMapper, this.counter); } - /* - * (non-Javadoc) - * @see java.util.Spliterator#estimateSize() - */ @Override public long estimateSize() { return Long.MAX_VALUE; } - /* - * (non-Javadoc) - * @see java.util.Spliterator#characteristics() - */ @Override public int characteristics() { return Spliterator.ORDERED; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java index 8695fceed..f9a40396a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java @@ -90,58 +90,36 @@ class ExceptionTranslatingListenableFutureAdapter implements ListenableFuture return settableFuture; } - /* - * (non-Javadoc) - * @see org.springframework.util.concurrent.ListenableFuture#addCallback(org.springframework.util.concurrent.ListenableFutureCallback) - */ @Override public void addCallback(ListenableFutureCallback callback) { future.addCallback(callback); } - /* (non-Javadoc) - * @see org.springframework.util.concurrent.ListenableFuture#addCallback(org.springframework.util.concurrent.SuccessCallback, org.springframework.util.concurrent.FailureCallback) - */ @Override public void addCallback(SuccessCallback successCallback, FailureCallback failureCallback) { future.addCallback(successCallback, failureCallback); } - /* (non-Javadoc) - * @see java.util.concurrent.Future#cancel(boolean) - */ @Override public boolean cancel(boolean mayInterruptIfRunning) { return adaptee.cancel(mayInterruptIfRunning); } - /* (non-Javadoc) - * @see java.util.concurrent.Future#isCancelled() - */ @Override public boolean isCancelled() { return adaptee.isCancelled(); } - /* (non-Javadoc) - * @see java.util.concurrent.Future#isDone() - */ @Override public boolean isDone() { return future.isDone(); } - /* (non-Javadoc) - * @see java.util.concurrent.Future#get() - */ @Override public T get() throws InterruptedException, ExecutionException { return future.get(); } - /* (non-Javadoc) - * @see java.util.concurrent.Future#get(long, java.util.concurrent.TimeUnit) - */ @Override public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { return future.get(timeout, unit); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java index 4084766d5..74c8d06a4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java @@ -107,10 +107,6 @@ public final class KeyspaceIdentifier implements Comparable return toCql(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { return identifier.hashCode(); @@ -139,9 +135,6 @@ public final class KeyspaceIdentifier implements Comparable return this.identifier.equals(other.identifier); } - /* (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ @Override public int compareTo(KeyspaceIdentifier that) { return this.identifier.compareTo(that.identifier); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java index 3a9ca777b..b765daca2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java @@ -170,10 +170,6 @@ public class QueryOptions { return keyspace; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -214,10 +210,6 @@ public class QueryOptions { return ObjectUtils.nullSafeEquals(keyspace, options.keyspace); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(consistencyLevel); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java index 66a82ec76..594257565 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java @@ -294,9 +294,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // Methods dealing with a plain org.springframework.data.cassandra.core.cql.ReactiveSession // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactiveSessionCallback) - */ @Override public Flux execute(ReactiveSessionCallback action) throws DataAccessException { @@ -309,9 +306,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // Methods dealing with static CQL // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String) - */ @Override public Mono execute(String cql) throws DataAccessException { @@ -320,9 +314,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return queryForResultSet(cql).map(ReactiveResultSet::wasApplied); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) - */ @Override public Flux query(String cql, ReactiveResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -332,58 +323,37 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return query(SimpleStatement.newInstance(cql), resultSetExtractor); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Flux query(String cql, RowMapper rowMapper) throws DataAccessException { return query(cql, new ReactiveRowMapperResultSetExtractor<>(rowMapper)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Mono queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { return query(cql, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list))) .next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class) - */ @Override public Mono queryForObject(String cql, Class requiredType) throws DataAccessException { return queryForObject(cql, getSingleColumnRowMapper(requiredType)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(java.lang.String) - */ @Override public Mono> queryForMap(String cql) throws DataAccessException { return queryForObject(cql, getColumnMapRowMapper()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class) - */ @Override public Flux queryForFlux(String cql, Class elementType) throws DataAccessException { return query(cql, getSingleColumnRowMapper(elementType)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String) - */ @Override public Flux> queryForFlux(String cql) throws DataAccessException { return query(cql, getColumnMapRowMapper()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(java.lang.String) - */ @Override public Mono queryForResultSet(String cql) throws DataAccessException { @@ -392,18 +362,12 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return queryForResultSet(SimpleStatement.newInstance(cql)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForRows(java.lang.String) - */ @Override public Flux queryForRows(String cql) throws DataAccessException { return queryForResultSet(cql).flatMapMany(ReactiveResultSet::rows) .onErrorMap(translateException("QueryForRows", cql)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.reactivestreams.Publisher) - */ @Override public Flux execute(Publisher statementPublisher) throws DataAccessException { @@ -416,9 +380,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // Methods dealing with com.datastax.oss.driver.api.core.cql.Statement // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Mono execute(Statement statement) throws DataAccessException { @@ -427,9 +388,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return queryForResultSet(statement).map(ReactiveResultSet::wasApplied); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) - */ @Override public Flux query(Statement statement, ReactiveResultSetExtractor rse) throws DataAccessException { @@ -446,58 +404,37 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re }).onErrorMap(translateException("Query", toCql(statement))); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Flux query(Statement statement, RowMapper rowMapper) throws DataAccessException { return query(statement, new ReactiveRowMapperResultSetExtractor<>(rowMapper)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Mono queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { return query(statement, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list))) .next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Mono queryForObject(Statement statement, Class requiredType) throws DataAccessException { return queryForObject(statement, getSingleColumnRowMapper(requiredType)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Mono> queryForMap(Statement statement) throws DataAccessException { return queryForObject(statement, getColumnMapRowMapper()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Flux queryForFlux(Statement statement, Class elementType) throws DataAccessException { return query(statement, getSingleColumnRowMapper(elementType)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Flux> queryForFlux(Statement statement) throws DataAccessException { return query(statement, getColumnMapRowMapper()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Mono queryForResultSet(Statement statement) throws DataAccessException { @@ -523,9 +460,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // Methods dealing with com.datastax.oss.driver.api.core.cql.PreparedStatement // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCallback) - */ @Override public Flux execute(ReactivePreparedStatementCreator psc, ReactivePreparedStatementCallback action) throws DataAccessException { @@ -541,9 +475,6 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re }).onErrorMap(translateException("ReactivePreparedStatementCallback", toCql(psc))); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCallback) - */ @Override public Flux execute(String cql, ReactivePreparedStatementCallback action) throws DataAccessException { return execute(newReactivePreparedStatementCreator(cql), action); @@ -580,52 +511,34 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re }).flatMap(rse::extractData)).onErrorMap(translateException("Query", toCql(psc))); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) - */ @Override public Flux query(ReactivePreparedStatementCreator psc, ReactiveResultSetExtractor rse) throws DataAccessException { return query(psc, null, rse); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) - */ @Override public Flux query(String cql, @Nullable PreparedStatementBinder psb, ReactiveResultSetExtractor rse) throws DataAccessException { return query(newReactivePreparedStatementCreator(cql), psb, rse); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor, java.lang.Object[]) - */ @Override public Flux query(String cql, ReactiveResultSetExtractor rse, Object... args) throws DataAccessException { return query(newReactivePreparedStatementCreator(cql), newArgPreparedStatementBinder(args), rse); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Flux query(ReactivePreparedStatementCreator psc, RowMapper rowMapper) throws DataAccessException { return query(psc, null, new ReactiveRowMapperResultSetExtractor<>(rowMapper)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Flux query(String cql, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { return query(cql, psb, new ReactiveRowMapperResultSetExtractor<>(rowMapper)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) - */ @Override public Flux query(ReactivePreparedStatementCreator psc, @Nullable PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -633,58 +546,37 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return query(psc, psb, new ReactiveRowMapperResultSetExtractor<>(rowMapper)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public Flux query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { return query(cql, newArgPreparedStatementBinder(args), rowMapper); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) - */ @Override public Mono queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { return query(cql, rowMapper, args).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list))) .next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public Mono queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { return queryForObject(cql, getSingleColumnRowMapper(requiredType), args); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) - */ @Override public Mono> queryForMap(String cql, Object... args) throws DataAccessException { return queryForObject(cql, getColumnMapRowMapper(), args); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class, java.lang.Object[]) - */ @Override public Flux queryForFlux(String cql, Class elementType, Object... args) throws DataAccessException { return query(cql, getSingleColumnRowMapper(elementType), args); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Object[]) - */ @Override public Flux> queryForFlux(String cql, Object... args) throws DataAccessException { return query(cql, getColumnMapRowMapper(), args); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) - */ @Override public Mono queryForResultSet(String cql, Object... args) throws DataAccessException { @@ -693,42 +585,27 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re return query(newReactivePreparedStatementCreator(cql), newArgPreparedStatementBinder(args), Mono::just).next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForRows(java.lang.String, java.lang.Object[]) - */ @Override public Flux queryForRows(String cql, Object... args) throws DataAccessException { return queryForResultSet(cql, args).flatMapMany(ReactiveResultSet::rows) .onErrorMap(translateException("QueryForRows", cql)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator) - */ @Override public Mono execute(ReactivePreparedStatementCreator psc) throws DataAccessException { return query(psc, resultSet -> Mono.just(resultSet.wasApplied())).last(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder) - */ @Override public Mono execute(String cql, @Nullable PreparedStatementBinder psb) throws DataAccessException { return query(newReactivePreparedStatementCreator(cql), psb, resultSet -> Mono.just(resultSet.wasApplied())).next(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, java.lang.Object[]) - */ @Override public Mono execute(String cql, Object... args) throws DataAccessException { return execute(cql, newArgPreparedStatementBinder(args)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.reactivestreams.Publisher) - */ @Override public Flux execute(String cql, Publisher args) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java index 5031889a5..73d009373 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java @@ -53,9 +53,6 @@ public class ReactiveRowMapperResultSetExtractor implements ReactiveResultSet this.rowMapper = rowMapper; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor#extractData(org.springframework.data.cassandra.core.cql.ReactiveResultSet) - */ @Override public Publisher extractData(ReactiveResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java index 7a42156e0..65d571507 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java @@ -34,9 +34,6 @@ public enum RingMemberHostMapper implements HostMapper { INSTANCE; - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.HostMapper#mapHosts(java.util.Iterable) - */ @Override public Collection mapHosts(Iterable hosts) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java index 4fff59a99..27df17a7c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java @@ -69,9 +69,6 @@ public class RowMapperResultSetExtractor implements ResultSetExtractor extractData(ResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java index 88c503ec2..7b9b79209 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java @@ -59,17 +59,11 @@ public class SimplePreparedStatementCreator implements PreparedStatementCreator, this.statement = statement; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.oss.driver.api.core.CqlSession) - */ @Override public PreparedStatement createPreparedStatement(CqlSession session) throws DriverException { return session.prepare(this.statement); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cqlProvider#getCql() - */ public String getCql() { return this.statement.getQuery(); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java index de048ec74..9e87d1856 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java @@ -102,10 +102,6 @@ public class WriteOptions extends QueryOptions { return this.timestamp; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -130,10 +126,6 @@ public class WriteOptions extends QueryOptions { return ObjectUtils.nullSafeEquals(timestamp, that.timestamp); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = super.hashCode(); @@ -165,9 +157,6 @@ public class WriteOptions extends QueryOptions { this.timestamp = writeOptions.timestamp; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.oss.driver.api.core.ConsistencyLevel) - */ @Override public WriteOptionsBuilder consistencyLevel(ConsistencyLevel consistencyLevel) { @@ -175,27 +164,18 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(String) - */ @Override public WriteOptionsBuilder executionProfile(String profileName) { super.executionProfile(profileName); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#executionProfile(org.springframework.data.cassandra.core.cql.ExecutionProfileResolver) - */ @Override public WriteOptionsBuilder executionProfile(ExecutionProfileResolver executionProfileResolver) { super.executionProfile(executionProfileResolver); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#fetchSize(int) - */ @Override @Deprecated public WriteOptionsBuilder fetchSize(int pageSize) { @@ -204,9 +184,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#keyspace() - */ @Override public WriteOptionsBuilder keyspace(CqlIdentifier keyspace) { @@ -214,9 +191,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#pageSize(int) - */ @Override public WriteOptionsBuilder pageSize(int pageSize) { @@ -224,9 +198,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long) - */ @Override @Deprecated public WriteOptionsBuilder readTimeout(long readTimeout) { @@ -235,9 +206,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) - */ @Override @Deprecated public WriteOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -246,18 +214,12 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#serialConsistencyLevel(com.datastax.oss.driver.api.core.ConsistencyLevel) - */ @Override public WriteOptionsBuilder serialConsistencyLevel(ConsistencyLevel consistencyLevel) { super.serialConsistencyLevel(consistencyLevel); return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(java.time.Duration) - */ @Override public WriteOptionsBuilder timeout(Duration timeout) { @@ -265,9 +227,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#tracing(boolean) - */ @Override public WriteOptionsBuilder tracing(boolean tracing) { @@ -275,9 +234,6 @@ public class WriteOptions extends QueryOptions { return this; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#withTracing() - */ @Override public WriteOptionsBuilder withTracing() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java index 4b1bc031d..9fa0e495e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java @@ -45,9 +45,6 @@ public class ResultSetToArrayConverter implements Converter this.rowConverter = rowConverter; } - /* (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object[] convert(ResultSet resultSet) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java index be6501883..7ce4f88aa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java @@ -30,17 +30,11 @@ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigDecimalConverter INSTANCE = new ResultSetToBigDecimalConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected BigDecimal doConvertSingleValue(Object object) { return CONVERTER.convert(object, BigDecimal.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return BigDecimal.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java index 14ce6354f..7de61da65 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java @@ -30,17 +30,11 @@ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigIntegerConverter INSTANCE = new ResultSetToBigIntegerConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected BigInteger doConvertSingleValue(Object object) { return CONVERTER.convert(object, BigInteger.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return BigInteger.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java index d2e54c873..d9ff9c629 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java @@ -28,17 +28,11 @@ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToBooleanConverter INSTANCE = new ResultSetToBooleanConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Boolean doConvertSingleValue(Object object) { return CONVERTER.convert(object, Boolean.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Boolean.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java index 9996b5c60..0c371a4c9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java @@ -30,9 +30,6 @@ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter getType() { return ByteBuffer.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java index 4b2803825..d89374c08 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java @@ -30,17 +30,11 @@ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToDateConverter INSTANCE = new ResultSetToDateConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Date doConvertSingleValue(Object object) { return CONVERTER.convert(object, Date.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Date.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java index 73b310973..0c1c3089a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java @@ -28,17 +28,11 @@ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTyp public static final ResultSetToDoubleConverter INSTANCE = new ResultSetToDoubleConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Double doConvertSingleValue(Object object) { return CONVERTER.convert(object, Double.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Double.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java index adb52ff60..20e004f1a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java @@ -28,17 +28,11 @@ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedType public static final ResultSetToFloatConverter INSTANCE = new ResultSetToFloatConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Float doConvertSingleValue(Object object) { return CONVERTER.convert(object, Float.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Float.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java index 1936fab32..145487aca 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java @@ -30,17 +30,11 @@ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFix public static final ResultSetToInetAddressConverter INSTANCE = new ResultSetToInetAddressConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected InetAddress doConvertSingleValue(Object object) { return CONVERTER.convert(object, InetAddress.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return InetAddress.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java index 9f79ab57c..f87a3ad74 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java @@ -28,17 +28,11 @@ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToIntegerConverter INSTANCE = new ResultSetToIntegerConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Integer doConvertSingleValue(Object object) { return CONVERTER.convert(object, Integer.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Integer.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java index b067b6edc..4c4a0877c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java @@ -53,9 +53,6 @@ public class ResultSetToListConverter implements Converter> convert(ResultSet resultSet) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java index 5fa82a94c..13760db40 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java @@ -34,17 +34,11 @@ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter public static final ResultSetToListOfStringConverter INSTANCE = new ResultSetToListOfStringConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected List doConvertSingleValue(Object object) { return Collections.singletonList(object.toString()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map) - */ @Override protected List doConvertSingleRow(Map row) { return row.values().stream().map(value -> value == null ? null : value.toString()).collect(Collectors.toList()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java index 2328c4879..04f484942 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java @@ -28,17 +28,11 @@ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToLongConverter INSTANCE = new ResultSetToLongConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected Long doConvertSingleValue(Object object) { return CONVERTER.convert(object, Long.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return Long.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java index 182565e58..891c080e4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java @@ -31,17 +31,11 @@ public class ResultSetToStringConverter extends AbstractResultSetConverter row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java index d21d34441..14387e9e0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java @@ -30,17 +30,11 @@ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToUuidConverter INSTANCE = new ResultSetToUuidConverter(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) - */ @Override protected UUID doConvertSingleValue(Object object) { return CONVERTER.convert(object, UUID.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() - */ @Override protected Class getType() { return UUID.class; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java index c56f88ce7..983a390cf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java @@ -30,9 +30,6 @@ public enum RowToArrayConverter implements Converter { INSTANCE; - /* (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object[] convert(Row row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java index 9c05f4a17..53ceef4fe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java @@ -37,9 +37,6 @@ public enum RowToListConverter implements Converter> { INSTANCE; - /* (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public List convert(Row row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java index 257b034cd..38f15f68d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java @@ -37,9 +37,6 @@ public enum RowToMapConverter implements Converter> { INSTANCE; - /* (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Map convert(Row row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java index ec986587f..b4ed6a7e4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java @@ -32,9 +32,6 @@ public class AddColumnCqlGenerator extends ColumnChangeCqlGenerator getKeyspace() { return this.session.getKeyspace(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#isClosed() - */ @Override public boolean isClosed() { return this.session.isClosed(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#getContext() - */ @Override public DriverContext getContext() { return this.session.getContext(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String) - */ @Override public Mono execute(String query) { @@ -132,9 +117,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { return execute(SimpleStatement.newInstance(query)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String, java.lang.Object[]) - */ @Override public Mono execute(String query, Object... values) { @@ -143,9 +125,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { return execute(SimpleStatement.newInstance(query, values)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String, java.util.Map) - */ @Override public Mono execute(String query, Map values) { @@ -154,9 +133,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { return execute(SimpleStatement.newInstance(query, values)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#execute(com.datastax.oss.driver.api.core.cql.Statement) - */ @Override public Mono execute(Statement statement) { @@ -172,9 +148,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { }).map(DefaultReactiveResultSet::new); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#prepare(java.lang.String) - */ @Override public Mono prepare(String query) { @@ -183,9 +156,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { return prepare(SimpleStatement.newInstance(query)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#prepare(com.datastax.oss.driver.api.core.cql.SimpleStatement) - */ @Override public Mono prepare(SimpleStatement statement) { @@ -231,9 +201,6 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { return String.format("Unknown: %s", statement); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveSession#close() - */ @Override public void close() { this.session.close(); @@ -257,17 +224,11 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { this.wasApplied = wasApplied; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#rows() - */ @Override public Flux rows() { return getRows(Mono.just(this.resultSet)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#availableRows() - */ @Override public Flux availableRows() { return toRows(this.resultSet); @@ -312,33 +273,21 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#getColumnDefinitions() - */ @Override public ColumnDefinitions getColumnDefinitions() { return this.resultSet.getColumnDefinitions(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#wasApplied() - */ @Override public boolean wasApplied() { return this.wasApplied; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#getExecutionInfo() - */ @Override public ExecutionInfo getExecutionInfo() { return this.resultSet.getExecutionInfo(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.ReactiveResultSet#getAllExecutionInfo() - */ @Override public List getAllExecutionInfo() { return Collections.singletonList(getExecutionInfo()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java index 3c8ae5271..f50e055da 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java @@ -46,9 +46,6 @@ public class DefaultSessionFactory implements SessionFactory { this.session = session; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.session.SessionFactory#getSession() - */ @Override public CqlSession getSession() { return session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java index 622ca98db..bcc504dd5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java @@ -118,9 +118,6 @@ public abstract class AbstractRoutingSessionFactory implements SessionFactory, I this.sessionFactoryLookup = (sessionFactoryLookup != null ? sessionFactoryLookup : new MapSessionFactoryLookup()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.session.SessionFactory#getSession() - */ @Override public CqlSession getSession() { return determineTargetSessionFactory().getSession(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java index 2f3096e17..f036f51c7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java @@ -61,17 +61,11 @@ public class BeanFactorySessionFactoryLookup implements SessionFactoryLookup, Be this.beanFactory = beanFactory; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) - */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java index 67aabbcd7..ac319b59a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java @@ -102,9 +102,6 @@ public class MapSessionFactoryLookup implements SessionFactoryLookup { this.sessionFactories.put(sessionFactoryName, sessionFactory); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) - */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java index 30073b550..64eafd6b6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java @@ -41,9 +41,6 @@ public class SingleSessionFactoryLookup implements SessionFactoryLookup { this.sessionFactory = sessionFactory; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) - */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { return sessionFactory; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java index defe9a538..8e7c2166e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java @@ -120,9 +120,6 @@ public class CachedPreparedStatementCreator implements PreparedStatementCreator return this.cache; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.oss.driver.api.core.CqlSession) - */ @Override public PreparedStatement createPreparedStatement(CqlSession session) throws DriverException { return getCache().getPreparedStatement(session, this.statement); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java index 7044b97a9..b736e627a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java @@ -81,9 +81,6 @@ public class MapPreparedStatementCache implements PreparedStatementCache { return this.cache; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.support.PreparedStatementCache#getPreparedStatement(com.datastax.oss.driver.api.core.CqlSession, com.datastax.oss.driver.api.core.cql.SimpleStatement, java.util.function.Supplier) - */ @Override public PreparedStatement getPreparedStatement(CqlSession session, SimpleStatement statement, Supplier preparer) { @@ -109,10 +106,6 @@ public class MapPreparedStatementCache implements PreparedStatementCache { this.cql = cql; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -131,10 +124,6 @@ public class MapPreparedStatementCache implements PreparedStatementCache { return ObjectUtils.nullSafeEquals(cql, cacheKey.cql); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(sessionName); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java index 808ef6d8f..7da616a84 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java @@ -124,31 +124,19 @@ public class BasicCassandraPersistentEntity extends BasicPersistentEntity association) { throw new UnsupportedCassandraOperationException("Cassandra does not support associations"); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#doWithAssociations(org.springframework.data.mapping.AssociationHandler) - */ @Override public void doWithAssociations(AssociationHandler handler) {} - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity#isCompositePrimaryKey() - */ @Override public boolean isCompositePrimaryKey() { return isAnnotationPresent(PrimaryKeyClass.class); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify() - */ @Override public void verify() throws MappingException { @@ -161,9 +149,6 @@ public class BasicCassandraPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity entity) throws MappingException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java index d83a5d5be..28d325ea3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java @@ -82,9 +82,6 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP super(property, owner, simpleTypeHolder); } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext context) { @@ -96,17 +93,11 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP this.spelContext.setRootObject(context); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.AbstractPersistentProperty#getOwner() - */ @Override public CassandraPersistentEntity getOwner() { return (CassandraPersistentEntity) super.getOwner(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getColumnName() - */ @Override public CqlIdentifier getColumnName() { @@ -119,18 +110,12 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return this.columnName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getOrdinal() - */ @Nullable @Override public Integer getOrdinal() { return null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getPrimaryKeyOrdering() - */ @Nullable @Override public Ordering getPrimaryKeyOrdering() { @@ -140,17 +125,11 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return annotation != null ? annotation.ordering() : null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isCompositePrimaryKey() - */ @Override public boolean isCompositePrimaryKey() { return AnnotatedElementUtils.findMergedAnnotation(getType(), PrimaryKeyClass.class) != null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isClusterKeyColumn() - */ @Override public boolean isClusterKeyColumn() { @@ -159,9 +138,6 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return annotation != null && PrimaryKeyType.CLUSTERED.equals(annotation.type()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPartitionKeyColumn() - */ @Override public boolean isPartitionKeyColumn() { @@ -170,17 +146,11 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return annotation != null && PrimaryKeyType.PARTITIONED.equals(annotation.type()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPrimaryKeyColumn() - */ @Override public boolean isPrimaryKeyColumn() { return isAnnotationPresent(PrimaryKeyColumn.class); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isStaticColumn() - */ @Override public boolean isStaticColumn() { @@ -272,9 +242,6 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return name != null ? IdentifierFactory.create(name, forceQuote) : null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#setColumnName(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public void setColumnName(CqlIdentifier columnName) { @@ -300,9 +267,6 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP return this.namingStrategy; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#setForceQuote(boolean) - */ @Override public void setForceQuote(boolean forceQuote) { @@ -315,33 +279,21 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.AbstractPersistentProperty#getAssociation() - */ @Override public Association getAssociation() { return null; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation() - */ @Override protected Association createAssociation() { return new Association<>(this, this); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isMapLike() - */ @Override public boolean isMapLike() { return ClassUtils.isAssignable(Map.class, getType()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#findAnnotatedType(java.lang.Class) - */ @Override public AnnotatedType findAnnotatedType(Class annotationType) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntity.java index 9d95fad04..a771aab03 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntity.java @@ -41,9 +41,6 @@ public class BasicCassandraPersistentTupleEntity extends BasicCassandraPersis super(information, CassandraPersistentTupleMetadataVerifier.INSTANCE, TuplePropertyComparator.INSTANCE); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify() - */ @Override public void verify() throws MappingException { @@ -52,9 +49,6 @@ public class BasicCassandraPersistentTupleEntity extends BasicCassandraPersis CassandraPersistentTupleMetadataVerifier.INSTANCE.verify(this); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#isTupleType() - */ @Override public boolean isTupleType() { return true; @@ -70,9 +64,6 @@ public class BasicCassandraPersistentTupleEntity extends BasicCassandraPersis INSTANCE; - /* (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ @Override public int compare(CassandraPersistentProperty propertyOne, CassandraPersistentProperty propertyTwo) { return Integer.compare(propertyOne.getRequiredOrdinal(), propertyTwo.getRequiredOrdinal()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java index 0e72c19c9..fceadb276 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java @@ -78,83 +78,53 @@ public class BasicCassandraPersistentTupleProperty extends BasicCassandraPersist return ordinal; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getColumnName() - */ @Override public CqlIdentifier getColumnName() { return null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentProperty#getOrdinal() - */ @Nullable @Override public Integer getOrdinal() { return this.ordinal; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getPrimaryKeyOrdering() - */ @Nullable @Override public Ordering getPrimaryKeyOrdering() { return null; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isClusterKeyColumn() - */ @Override public boolean isClusterKeyColumn() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isCompositePrimaryKey() - */ @Override public boolean isCompositePrimaryKey() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPartitionKeyColumn() - */ @Override public boolean isPartitionKeyColumn() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPrimaryKeyColumn() - */ @Override public boolean isPrimaryKeyColumn() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isStaticColumn() - */ @Override public boolean isStaticColumn() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isEmbedded() - */ @Override public boolean isEmbedded() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#setColumnName(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Override public void setColumnName(CqlIdentifier columnName) { throw new UnsupportedOperationException("Cannot set a column name on a property representing a tuple element"); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java index 4320fbccb..76f1ec627 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java @@ -81,50 +81,32 @@ public class BasicMapId implements MapId { return new BasicMapId(id); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.MapId#with(java.lang.String, java.io.Object) - */ @Override public BasicMapId with(String name, @Nullable Object value) { put(name, value); return this; } - /* (non-Javadoc) - * @see java.util.Map#clear() - */ @Override public void clear() { map.clear(); } - /* (non-Javadoc) - * @see java.util.Map#containsKey(java.lang.Object) - */ @Override public boolean containsKey(Object name) { return map.containsKey(name); } - /* (non-Javadoc) - * @see java.util.Map#containsValue(java.lang.Object) - */ @Override public boolean containsValue(Object value) { return map.containsValue(value); } - /* (non-Javadoc) - * @see java.util.Map#entrySet() - */ @Override public Set> entrySet() { return map.entrySet(); } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object that) { if (this == that) { @@ -139,81 +121,51 @@ public class BasicMapId implements MapId { return map.equals(that); } - /* (non-Javadoc) - * @see java.util.Map#get(java.lang.Object) - */ @Override public Object get(Object name) { return map.get(name); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return map.hashCode(); } - /* (non-Javadoc) - * @see java.util.Map#isEmpty() - */ @Override public boolean isEmpty() { return map.isEmpty(); } - /* (non-Javadoc) - * @see java.util.Map#keySet() - */ @Override public Set keySet() { return map.keySet(); } - /* (non-Javadoc) - * @see java.util.Map#put(java.lang.Object, java.lang.Object) - */ @Override public Object put(String name, Object value) { return map.put(name, value); } - /* (non-Javadoc) - * @see java.util.Map#putAll(java.util.Map) - */ @Override public void putAll(Map source) { map.putAll(source); } - /* (non-Javadoc) - * @see java.util.Map#remove(java.lang.Object) - */ @Override public Object remove(Object name) { return map.remove(name); } - /* (non-Javadoc) - * @see java.util.Map#size() - */ @Override public int size() { return map.size(); } - /* (non-Javadoc) - * @see java.util.Map#values() - */ @Override public Collection values() { return map.values(); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java index f3f481fc2..384b51bd0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java @@ -50,58 +50,37 @@ public class CachingCassandraPersistentProperty extends BasicCassandraPersistent isStaticColumn = super.isStaticColumn(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getPrimaryKeyOrdering() - */ @Nullable @Override public Ordering getPrimaryKeyOrdering() { return primaryKeyOrdering; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isCompositePrimaryKey() - */ @Override public boolean isCompositePrimaryKey() { return isCompositePrimaryKey; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isClusterKeyColumn() - */ @Override public boolean isClusterKeyColumn() { return isClusterKeyColumn; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPartitionKeyColumn() - */ @Override public boolean isPartitionKeyColumn() { return isPartitionKeyColumn; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPrimaryKeyColumn() - */ @Override public boolean isPrimaryKeyColumn() { return isPrimaryKeyColumn; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentProperty#isStaticColumn() - */ @Override public boolean isStaticColumn() { return isStaticColumn; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentProperty#isEmbedded() - */ @Override public boolean isEmbedded() { return isEmbedded; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java index 4411d140f..f1212935b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java @@ -108,9 +108,6 @@ public class CassandraMappingContext setSimpleTypeHolder(customConversions.getSimpleTypeHolder()); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#initialize() - */ @Override public void initialize() { @@ -167,17 +164,11 @@ public class CassandraMappingContext } } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ public void setBeanClassLoader(ClassLoader beanClassLoader) { this.beanClassLoader = beanClassLoader; } @@ -326,9 +317,6 @@ public class CassandraMappingContext return this.verifier; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#addPersistentEntity(org.springframework.data.util.TypeInformation) - */ @Override protected Optional> addPersistentEntity(TypeInformation typeInformation) { @@ -358,18 +346,12 @@ public class CassandraMappingContext return optional; } - /* (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#shouldCreatePersistentEntityFor(org.springframework.data.util.TypeInformation) - */ @Override protected boolean shouldCreatePersistentEntityFor(TypeInformation typeInfo) { return !this.customConversions.hasCustomWriteTarget(typeInfo.getType()) && super.shouldCreatePersistentEntityFor(typeInfo); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation) - */ @Override protected BasicCassandraPersistentEntity createPersistentEntity(TypeInformation typeInformation) { @@ -393,9 +375,6 @@ public class CassandraMappingContext return AnnotatedElementUtils.hasAnnotation(typeInformation.getType(), UserDefinedType.class); } - /* (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentProperty(org.springframework.data.mapping.model.Property, org.springframework.data.mapping.model.MutablePersistentEntity, org.springframework.data.mapping.model.SimpleTypeHolder) - */ @Override protected CassandraPersistentProperty createPersistentProperty(Property property, BasicCassandraPersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java index 7a14269c6..9db449d2e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java @@ -42,9 +42,6 @@ public enum CassandraPersistentPropertyComparator implements Comparator entity) throws MappingException { if (entity.getType().isInterface() || !entity.isAnnotationPresent(Tuple.class)) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java index 77b92ea29..fb3741a4b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparator.java @@ -38,9 +38,6 @@ public enum CassandraPrimaryKeyColumnAnnotationComparator implements Comparator< */ INSTANCE; - /* (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ @Override public int compare(PrimaryKeyColumn left, PrimaryKeyColumn right) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java index a348b58aa..ed572ccfa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java @@ -41,9 +41,6 @@ public class CassandraUserTypePersistentEntity extends BasicCassandraPersiste super(typeInformation, verifier); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#determineTableName() - */ @Override protected CqlIdentifier determineTableName() { @@ -56,9 +53,6 @@ public class CassandraUserTypePersistentEntity extends BasicCassandraPersiste return IdentifierFactory.create(getNamingStrategy().getUserDefinedTypeName(this), false); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#isUserDefinedType() - */ @Override public boolean isUserDefinedType() { return true; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java index e725fe89d..34cb076e1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java @@ -56,17 +56,11 @@ public class CodecRegistryTupleTypeFactory implements TupleTypeFactory { @Deprecated public CodecRegistryTupleTypeFactory(ProtocolVersion protocolVersion, CodecRegistry codecRegistry) {} - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.TupleTypeFactory#create(com.datastax.oss.driver.api.core.type.DataType[]) - */ @Override public TupleType create(DataType... types) { return SimpleTupleTypeFactory.DEFAULT.create(types); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.TupleTypeFactory#create(java.util.List) - */ @Override public TupleType create(List types) { return SimpleTupleTypeFactory.DEFAULT.create(types); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java index 60849eee8..f1d102e8a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java @@ -58,10 +58,6 @@ public class CompositeCassandraPersistentEntityMetadataVerifier implements Cassa this.verifiers = verifiers; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity) - */ @Override public void verify(CassandraPersistentEntity entity) throws MappingException { verifiers.forEach(verifier -> verifier.verify(entity)); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java index 386f9ce17..a665db3dd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EntityMapping.java @@ -113,9 +113,6 @@ public class EntityMapping { this.tableName = tableName; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -134,9 +131,6 @@ public class EntityMapping { && ObjectUtils.nullSafeEquals(this.getTableName(), that.getTableName()); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -149,9 +143,6 @@ public class EntityMapping { return hashValue; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format( diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java index 468bcb0fb..bcf5cc47f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java @@ -31,10 +31,6 @@ import org.springframework.data.mapping.MappingException; */ public class PrimaryKeyClassEntityMetadataVerifier implements CassandraPersistentEntityMetadataVerifier { - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity) - */ @Override public void verify(CassandraPersistentEntity entity) throws MappingException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java index 4d3b4cd8f..bbaaa8cfd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PropertyMapping.java @@ -88,10 +88,6 @@ public class PropertyMapping { return this.propertyName; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -116,10 +112,6 @@ public class PropertyMapping { return ObjectUtils.nullSafeEquals(propertyName, that.propertyName); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(columnName); @@ -128,10 +120,6 @@ public class PropertyMapping { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("{ @type = %1$s, propertyName = %2$s, columnName = %3$s, forceQuote = %4$s }", diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleTupleTypeFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleTupleTypeFactory.java index dc46ee095..11f849934 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleTupleTypeFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleTupleTypeFactory.java @@ -38,17 +38,11 @@ public enum SimpleTupleTypeFactory implements TupleTypeFactory { */ DEFAULT; - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.TupleTypeFactory#create(com.datastax.oss.driver.api.core.type.DataType[]) - */ @Override public TupleType create(DataType... types) { return create(Arrays.asList(types)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.TupleTypeFactory#create(java.util.List) - */ @Override public TupleType create(List types) { return new DefaultTupleType(types); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java index 435c19d84..57db0c2ea 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java @@ -84,9 +84,6 @@ public class SimpleUserTypeResolver implements UserTypeResolver { this.keyspaceName = keyspaceName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.UserTypeResolver#resolveType(org.springframework.data.cassandra.core.cql.CqlIdentifier) - */ @Nullable @Override public UserDefinedType resolveType(CqlIdentifier typeName) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java index a63bf8a39..30684c3ca 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/VerifierMappingExceptions.java @@ -90,9 +90,6 @@ public class VerifierMappingExceptions extends MappingException { return exceptions.stream().map(Throwable::getMessage).collect(Collectors.toList()); } - /* (non-Javadoc) - * @see java.lang.Throwable#getMessage() - */ @Override public String getMessage() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractCassandraEventListener.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractCassandraEventListener.java index cc1d2a2af..1785f3fda 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractCassandraEventListener.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/event/AbstractCassandraEventListener.java @@ -44,9 +44,6 @@ public abstract class AbstractCassandraEventListener implements ApplicationLi this.domainClass = typeArgument == null ? Object.class : typeArgument; } - /* (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ @SuppressWarnings({ "unchecked" }) @Override public void onApplicationEvent(CassandraMappingEvent event) { 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 ab8ba1a88..bf074e1a8 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 @@ -47,19 +47,11 @@ public class AuditingEntityCallback implements BeforeConvertCallback, Or this.auditingHandlerFactory = auditingHandlerFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.event.BeforeConvertCallback#onBeforeConvert(java.lang.Object, com.datastax.oss.driver.api.core.CqlIdentifier) - */ @Override public Object onBeforeConvert(Object entity, CqlIdentifier tableName) { return auditingHandlerFactory.getObject().markAudited(entity); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return 100; 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 1789290a9..4c28fed0a 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 @@ -54,10 +54,6 @@ public class CassandraMappingEvent extends ApplicationEvent { return tableName; } - /* - * (non-Javadoc) - * @see java.util.EventObject#getSource() - */ @SuppressWarnings({ "unchecked" }) @Override public T getSource() { 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 44afd6bd0..52ad03359 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 @@ -48,19 +48,11 @@ public class ReactiveAuditingEntityCallback implements ReactiveBeforeConvertCall this.auditingHandlerFactory = auditingHandlerFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.core.mapping.event.ReactiveBeforeConvertCallback#onBeforeConvert(java.lang.Object, com.datastax.oss.driver.api.core.CqlIdentifier) - */ @Override public Mono onBeforeConvert(Object entity, CqlIdentifier tableName) { return auditingHandlerFactory.getObject().markAudited(entity); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return 100; 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 64673b58e..c44175211 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 @@ -195,9 +195,6 @@ public class CassandraPageRequest extends PageRequest { return (getPagingState() != null && this.nextAllowed); } - /* (non-Javadoc) - * @see org.springframework.data.domain.PageRequest#next() - */ @Override public CassandraPageRequest next() { @@ -220,9 +217,6 @@ public class CassandraPageRequest extends PageRequest { return new CassandraPageRequest(this.getPageNumber(), this.getPageSize(), sort, getPagingState(), this.nextAllowed); } - /* (non-Javadoc) - * @see org.springframework.data.domain.PageRequest#previous() - */ @Override public PageRequest previous() { @@ -231,9 +225,6 @@ public class CassandraPageRequest extends PageRequest { return super.previous(); } - /* (non-Javadoc) - * @see org.springframework.data.domain.PageRequest#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -256,9 +247,6 @@ public class CassandraPageRequest extends PageRequest { return (pagingState != null ? pagingState.equals(that.pagingState) : that.pagingState == null); } - /* (non-Javadoc) - * @see org.springframework.data.domain.PageRequest#hashCode() - */ @Override public int hashCode() { @@ -270,9 +258,6 @@ public class CassandraPageRequest extends PageRequest { return result; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Cassandra page request [number: %d, size %d, sort: %s, paging state: %s]", getPageNumber(), diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java index 5d8c87cc8..9bdbc00b3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java @@ -81,9 +81,6 @@ public abstract class ColumnName { */ public abstract String toCql(); - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Criteria#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -100,9 +97,6 @@ public abstract class ColumnName { return toCql().equals(that.toCql()); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { int hashValue = 17; @@ -123,33 +117,21 @@ public abstract class ColumnName { this.columnName = columnName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#getColumnName() - */ @Override public Optional getColumnName() { return Optional.of(columnName); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#getCqlIdentifier() - */ @Override public Optional getCqlIdentifier() { return Optional.empty(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#toCql() - */ @Override public String toCql() { return this.columnName; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return this.columnName; @@ -169,33 +151,21 @@ public abstract class ColumnName { this.cqlIdentifier = cqlIdentifier; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#getColumnName() - */ @Override public Optional getColumnName() { return Optional.empty(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#getCqlIdentifier() - */ @Override public Optional getCqlIdentifier() { return Optional.of(this.cqlIdentifier); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.ColumnName#toCql() - */ @Override public String toCql() { return this.cqlIdentifier.toString(); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return this.cqlIdentifier.toString(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java index d97717380..cc56b0d74 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java @@ -198,9 +198,6 @@ public class Columns implements Iterable { return new Columns(result); } - /* (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return this.columns.keySet().iterator(); @@ -217,10 +214,6 @@ public class Columns implements Iterable { return Optional.ofNullable(this.columns.get(columnName)); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object object) { @@ -237,10 +230,6 @@ public class Columns implements Iterable { return this.columns.equals(that.columns); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = 17; @@ -248,10 +237,6 @@ public class Columns implements Iterable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -376,19 +361,12 @@ public class Columns implements Iterable { return columnName.toCql(); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return getAlias().map(cqlIdentifier -> String.format("%s AS %s", getExpression(), cqlIdentifier)) .orElseGet(this::getExpression); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -404,10 +382,6 @@ public class Columns implements Iterable { return ObjectUtils.nullSafeEquals(alias, that.alias); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(columnName); @@ -477,9 +451,6 @@ public class Columns implements Iterable { return params; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Columns.Column#toString() - */ @Override public String toString() { @@ -490,10 +461,6 @@ public class Columns implements Iterable { .orElseGet(() -> String.format("%s(%s)", getExpression(), parameters)); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -512,10 +479,6 @@ public class Columns implements Iterable { return ObjectUtils.nullSafeEquals(alias, that.alias); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(expression); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java index e7203de24..77a17f697 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Criteria.java @@ -275,10 +275,6 @@ public class Criteria implements CriteriaDefinition { return predicate; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -303,9 +299,6 @@ public class Criteria implements CriteriaDefinition { return keyEqual && criteriaEqual; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { int result = 17; @@ -314,10 +307,6 @@ public class Criteria implements CriteriaDefinition { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return SerializationUtils.serializeToCqlSafely(this); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java index 3ad96dcd4..aef61f7e4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/CriteriaDefinition.java @@ -97,10 +97,6 @@ public interface CriteriaDefinition { return mappingFunction.apply(this.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -121,10 +117,6 @@ public interface CriteriaDefinition { return ObjectUtils.nullSafeEquals(value, predicate.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(operator); @@ -198,10 +190,6 @@ public interface CriteriaDefinition { this.operator = operator; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return this.operator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/DefaultFilter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/DefaultFilter.java index 7010b1e3b..dd71893cf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/DefaultFilter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/DefaultFilter.java @@ -34,17 +34,11 @@ class DefaultFilter implements Filter { this.criteriaDefinitions = (Iterable) criteriaDefinitions; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Filter#getCriteriaDefinitions() - */ @Override public Iterable getCriteriaDefinitions() { return criteriaDefinitions; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return StreamSupport.stream(this.spliterator(), false) // diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Filter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Filter.java index 83d22a5a4..cb60dbdfe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Filter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Filter.java @@ -62,9 +62,6 @@ public interface Filter extends Streamable { return new DefaultFilter(criteriaDefinitions); } - /* (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override default Iterator iterator() { return getCriteriaDefinitions().iterator(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java index 8964e6063..ac1791bfe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Query.java @@ -135,9 +135,6 @@ public class Query implements Filter { this.allowFiltering); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Filter#getCriteriaDefinitions() - */ @Override public Iterable getCriteriaDefinitions() { return Collections.unmodifiableCollection(criteriaDefinitions); @@ -298,10 +295,6 @@ public class Query implements Filter { return this.allowFiltering; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -336,10 +329,6 @@ public class Query implements Filter { && allowFilteringEqual; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public int hashCode() { int result = 17; @@ -353,10 +342,6 @@ public class Query implements Filter { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java index 717dfa119..d7bd5456b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Update.java @@ -228,10 +228,6 @@ public class Update { return new Update(map); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return StringUtils.collectionToDelimitedString(updateOperations.values(), ", "); @@ -330,17 +326,11 @@ public class Update { this.columnName = columnName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#prepend(java.lang.Object) - */ @Override public Update prepend(Object value) { return prependAll(Collections.singletonList(value)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#prependAll(java.lang.Object[]) - */ @Override public Update prependAll(Object... values) { @@ -349,9 +339,6 @@ public class Update { return prependAll(Arrays.asList(values)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#prependAll(java.lang.Iterable) - */ @Override public Update prependAll(Iterable values) { @@ -360,17 +347,11 @@ public class Update { return add(new AddToOp(columnName, values, Mode.PREPEND)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#append(java.lang.Object) - */ @Override public Update append(Object value) { return appendAll(Collections.singletonList(value)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#appendAll(java.lang.Object[]) - */ @Override public Update appendAll(Object... values) { @@ -379,9 +360,6 @@ public class Update { return appendAll(Arrays.asList(values)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#appendAll(java.lang.Iterable) - */ @Override public Update appendAll(Iterable values) { @@ -390,9 +368,6 @@ public class Update { return add(new AddToOp(columnName, values, Mode.APPEND)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#entry(java.lang.Object, java.lang.Object) - */ @Override public Update entry(Object key, Object value) { @@ -402,9 +377,6 @@ public class Update { return addAll(Collections.singletonMap(key, value)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.AddToBuilder#addAll(java.util.Map) - */ @Override public Update addAll(Map map) { @@ -468,17 +440,11 @@ public class Update { this.columnName = columnName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.RemoveFromBuilder#mapValue(java.lang.Object) - */ @Override public Update value(Object value) { return add(new RemoveOp(columnName, value)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.RemoveFromBuilder#mapValues(java.lang.Iterable) - */ @Override public Update values(Iterable values) { @@ -541,17 +507,11 @@ public class Update { this.columnName = columnName; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.SetBuilder#atIndex(int) - */ @Override public SetValueBuilder atIndex(int index) { return value -> add(new SetAtIndexOp(this.columnName, index, value)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.query.Update.SetBuilder#atKey(java.lang.Object) - */ @Override public SetValueBuilder atKey(Object key) { return value -> add(new SetAtKeyOp(this.columnName, key, value)); @@ -609,10 +569,6 @@ public class Update { return this.mode; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -643,10 +599,6 @@ public class Update { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s = %s + %s", getColumnName(), getColumnName(), serializeToCqlSafely(value)); @@ -670,10 +622,6 @@ public class Update { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s = %s", getColumnName(), serializeToCqlSafely(value)); @@ -700,10 +648,6 @@ public class Update { return index; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s[%d] = %s", getColumnName(), index, serializeToCqlSafely(getValue())); @@ -737,10 +681,6 @@ public class Update { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s[%s] = %s", getColumnName(), serializeToCqlSafely(key), serializeToCqlSafely(getValue())); @@ -763,10 +703,6 @@ public class Update { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s = %s %s %d", getColumnName(), getColumnName(), value.doubleValue() > 0 ? "+" : "-", @@ -794,10 +730,6 @@ public class Update { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s = %s - %s", getColumnName(), getColumnName(), serializeToCqlSafely(getValue())); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java index 70ddb3268..ee0bfedcb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java @@ -42,15 +42,9 @@ import org.springframework.data.repository.NoRepositoryBean; @NoRepositoryBean public interface CassandraRepository extends CrudRepository { - /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable) - */ @Override List saveAll(Iterable entites); - /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll() - */ @Override List findAll(); 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 ad17c971e..d5eff5995 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 @@ -57,10 +57,6 @@ public class CassandraRepositoryBean extends CdiRepositoryBean { this.cassandraOperationsBean = operations; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class) - */ @Override protected T create(CreationalContext creationalContext, Class repositoryType) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoriesRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoriesRegistrar.java index 6c9e6249e..c3e205275 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoriesRegistrar.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoriesRegistrar.java @@ -29,17 +29,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi */ public class CassandraRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport { - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableCassandraRepositories.class; } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension() - */ @Override protected RepositoryConfigurationExtension getExtension() { return new CassandraRepositoryConfigurationExtension(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java index 70e15e4c2..4bdec341f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java @@ -45,33 +45,21 @@ public class CassandraRepositoryConfigurationExtension extends RepositoryConfigu private static final String CASSANDRA_TEMPLATE_REF = "cassandra-template-ref"; - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName() - */ @Override public String getModuleName() { return "Cassandra"; } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix() - */ @Override protected String getModulePrefix() { return "cassandra"; } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName() - */ @Override public String getRepositoryFactoryBeanClassName() { return CassandraRepositoryFactoryBean.class.getName(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) { @@ -84,9 +72,6 @@ public class CassandraRepositoryConfigurationExtension extends RepositoryConfigu builder.addPropertyReference("cassandraTemplate", cassandraTemplateRef); } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) { @@ -97,26 +82,16 @@ public class CassandraRepositoryConfigurationExtension extends RepositoryConfigu } } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations() - */ @Override protected Collection> getIdentifyingAnnotations() { return Collections.singleton(Table.class); } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes() - */ @Override protected Collection> getIdentifyingTypes() { return Collections.singleton(CassandraRepository.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) { return !metadata.isReactiveRepository(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryNamespaceHandler.java index 96c89b3aa..a656fb606 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryNamespaceHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryNamespaceHandler.java @@ -26,10 +26,6 @@ import org.springframework.data.repository.config.RepositoryBeanDefinitionParser */ class CassandraRepositoryNamespaceHandler extends CassandraNamespaceHandler { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.NamespaceHandler#init() - */ @Override public void init() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrar.java index 381423ea2..8c2dbe477 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrar.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrar.java @@ -30,19 +30,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi */ class ReactiveCassandraRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableReactiveCassandraRepositories.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension() - */ @Override protected RepositoryConfigurationExtension getExtension() { return new ReactiveCassandraRepositoryConfigurationExtension(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoryConfigurationExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoryConfigurationExtension.java index 330d6abe7..bb22a505c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoryConfigurationExtension.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoryConfigurationExtension.java @@ -34,25 +34,16 @@ import org.springframework.util.StringUtils; */ public class ReactiveCassandraRepositoryConfigurationExtension extends CassandraRepositoryConfigurationExtension { - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.config.CassandraRepositoryConfigurationExtension#getModuleName() - */ @Override public String getModuleName() { return "Reactive Cassandra"; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.config.CassandraRepositoryConfigurationExtension#getRepositoryFactoryClassName() - */ @Override public String getRepositoryFactoryBeanClassName() { return ReactiveCassandraRepositoryFactoryBean.class.getName(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.config.CassandraRepositoryConfigurationExtension#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) { @@ -63,18 +54,11 @@ public class ReactiveCassandraRepositoryConfigurationExtension extends Cassandra } } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.config.CassandraRepositoryConfigurationExtension#getIdentifyingTypes() - */ @Override protected Collection> getIdentifyingTypes() { return Collections.singleton(ReactiveCassandraRepository.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata) - */ protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) { return metadata.isReactiveRepository(); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java index a15cc17e1..feeb43552 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java @@ -83,9 +83,6 @@ public abstract class AbstractCassandraQuery extends CassandraRepositoryQuerySup return this.operations; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[]) - */ @Nullable @Override public Object execute(Object[] parameters) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java index 0c62ee7a7..4a4a08468 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java @@ -65,19 +65,11 @@ public abstract class AbstractReactiveCassandraQuery extends CassandraRepository this.operations = operations; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod() - */ @Override public ReactiveCassandraQueryMethod getQueryMethod() { return (ReactiveCassandraQueryMethod) super.getQueryMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[]) - */ @Override public Object execute(Object[] parameters) { return Flux.defer(() -> executeLater(parameters)); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java index c059171e4..042e25c02 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameters.java @@ -63,17 +63,11 @@ public class CassandraParameters extends Parameters parameters) { return new CassandraParameters(parameters, queryOptionsIndex); @@ -114,9 +108,6 @@ public class CassandraParameters extends Parameters getType() { return this.parameterType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java index 5116b3e3d..bcbbda199 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java @@ -46,10 +46,6 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc super(method.getParameters(), values); } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getDataType(int) - */ @Override public DataType getDataType(int index) { @@ -59,41 +55,26 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc : CassandraSimpleTypeHolder.getDataTypeFor(getParameterType(index))); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int) - */ @Nullable public CassandraType findCassandraType(int index) { return getParameters().getParameter(index).getCassandraType(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getParameterType(int) - */ @Override public Class getParameterType(int index) { return getParameters().getParameter(index).getType(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParametersParameterAccessor#getParameters() - */ @Override public CassandraParameters getParameters() { return (CassandraParameters) super.getParameters(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getValues() - */ @Override public Object[] getValues() { return super.getValues(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getQueryOptions() - */ @Nullable @Override public QueryOptions getQueryOptions() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java index f34379d24..81f55e3f2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java @@ -95,9 +95,6 @@ class CassandraQueryCreator extends AbstractQueryCreator { return this.queryBuilder; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator) - */ @Override protected Filter create(Part part, Iterator iterator) { @@ -118,9 +115,6 @@ class CassandraQueryCreator extends AbstractQueryCreator { return (Filter) filterOrCriteria; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator) - */ @Override protected Filter and(Part part, Filter base, Iterator iterator) { @@ -131,20 +125,11 @@ class CassandraQueryCreator extends AbstractQueryCreator { return create(part, iterator); } - /* - * Cassandra does not support OR queries. - * - * (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object) - */ @Override protected Filter or(Filter base, Filter criteria) { throw new InvalidDataAccessApiUsageException("Cassandra does not support an OR operator"); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort) - */ @Override protected Query complete(Filter criteria, Sort sort) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java index f1b10fc07..2cfcf1834 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java @@ -63,9 +63,6 @@ interface CassandraQueryExecution { this.resultProcessing = resultProcessing; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Object execute(Statement statement, Class type) { return operations.stream(statement, type).map(resultProcessing::convert); @@ -88,9 +85,6 @@ interface CassandraQueryExecution { private final Pageable pageable; - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Object execute(Statement statement, Class type) { @@ -126,9 +120,6 @@ interface CassandraQueryExecution { this.operations = operations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Object execute(Statement statement, Class type) { return operations.select(statement, type); @@ -150,9 +141,6 @@ interface CassandraQueryExecution { this.limiting = limiting; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public Object execute(Statement statement, Class type) { @@ -185,9 +173,6 @@ interface CassandraQueryExecution { this.operations = operations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Object execute(Statement statement, Class type) { @@ -223,9 +208,6 @@ interface CassandraQueryExecution { this.operations = operations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Object execute(Statement statement, Class type) { return operations.execute(statement); @@ -247,9 +229,6 @@ interface CassandraQueryExecution { this.converter = converter; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Nullable @Override public Object execute(Statement statement, Class type) { @@ -279,9 +258,6 @@ interface CassandraQueryExecution { this.instantiators = instantiators; } - /* (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(@Nullable Object source) { 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 08ad1a501..5367a5157 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 @@ -94,10 +94,6 @@ public class CassandraQueryMethod extends QueryMethod { } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getEntityInformation() - */ @Override @SuppressWarnings("unchecked") public CassandraEntityMetadata getEntityInformation() { @@ -127,18 +123,11 @@ public class CassandraQueryMethod extends QueryMethod { return this.entityMetadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getParameters() - */ @Override public CassandraParameters getParameters() { return (CassandraParameters) super.getParameters(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#createParameters(java.lang.reflect.Method) - */ @Override protected CassandraParameters createParameters(Method method) { return new CassandraParameters(method); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraRepositoryQuerySupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraRepositoryQuerySupport.java index e559d97a9..e61ab05fb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraRepositoryQuerySupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraRepositoryQuerySupport.java @@ -81,9 +81,6 @@ public abstract class CassandraRepositoryQuerySupport implements RepositoryQuery this.queryStatementCreator = new QueryStatementCreator(queryMethod, mappingContext); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod() - */ @Override public CassandraQueryMethod getQueryMethod() { return this.queryMethod; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java index 18e265f0a..b21729f3c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java @@ -49,90 +49,57 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { this.delegate = delegate; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getPageable() - */ @Override public Pageable getPageable() { return this.delegate.getPageable(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getSort() - */ @Override public Sort getSort() { return this.delegate.getSort(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection() - */ @Nullable @Override public Class findDynamicProjection() { return this.delegate.findDynamicProjection(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int) - */ @Override public Object getBindableValue(int index) { return potentiallyConvert(index, this.delegate.getBindableValue(index), null); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int) - */ @Override public CassandraType findCassandraType(int index) { return this.delegate.findCassandraType(index); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getDataType(int) - */ @Override public DataType getDataType(int index) { return this.delegate.getDataType(index); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getParameterType(int) - */ @Override public Class getParameterType(int index) { return this.delegate.getParameterType(index); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getQueryOptions() - */ @Nullable @Override public QueryOptions getQueryOptions() { return this.delegate.getQueryOptions(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue() - */ @Override public boolean hasBindableNullValue() { return this.delegate.hasBindableNullValue(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#iterator() - */ public Iterator iterator() { return new ConvertingIterator(this.delegate.iterator()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getValues() - */ @Override public Object[] getValues() { return this.delegate.getValues(); @@ -184,34 +151,19 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ public boolean hasNext() { return this.delegate.hasNext(); } - /* - * (non-Javadoc) - * @see java.util.Iterator#next() - */ @Nullable public Object next() { return potentiallyConvert(this.index++, this.delegate.next(), null); } - /* - * (non-Javadoc) - * @see java.util.Iterator#remove() - */ public void remove() { this.delegate.remove(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator#nextConverted(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) - */ @Nullable @Override public Object nextConverted(CassandraPersistentProperty property) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DefaultSpELExpressionEvaluator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DefaultSpELExpressionEvaluator.java index 0f5f67677..034c78bc3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DefaultSpELExpressionEvaluator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DefaultSpELExpressionEvaluator.java @@ -45,10 +45,6 @@ class DefaultSpELExpressionEvaluator implements SpELExpressionEvaluator { return NoOpExpressionEvaluator.INSTANCE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELExpressionEvaluator#evaluate(java.lang.String) - */ @Override @SuppressWarnings("unchecked") public T evaluate(String expression) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java index b35f2de4e..731d55391 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/DtoInstantiatingConverter.java @@ -64,10 +64,6 @@ class DtoInstantiatingConverter implements Converter { this.instantiator = instantiator.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType)); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(Object source) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java index 33ed91d0a..5563e3985 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java @@ -89,10 +89,6 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { return this.tree; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#createQuery(org.springframework.data.cassandra.repository.query.CassandraParameterAccessor, boolean) - */ @Override protected SimpleStatement createQuery(CassandraParameterAccessor parameterAccessor) { @@ -112,33 +108,21 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { getQueryMethod().getResultProcessor()); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return getTree().isCountProjection(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return getTree().isExistsProjection(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isLimiting() - */ @Override protected boolean isLimiting() { return getTree().isLimiting(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isModifyingQuery() - */ @Override protected boolean isModifyingQuery() { return getTree().isDelete(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraParameterAccessor.java index b2ba2e225..ce1e4388a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraParameterAccessor.java @@ -60,18 +60,12 @@ class ReactiveCassandraParameterAccessor extends CassandraParametersParameterAcc } } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParametersParameterAccessor#getValue(int) - */ @SuppressWarnings({ "unchecked", "ConstantConditions" }) @Override protected T getValue(int index) { return (subscriptions.get(index) != null ? (T) subscriptions.get(index).block() : super.getValue(index)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraParametersParameterAccessor#getValues() - */ @Override public Object[] getValues() { @@ -84,9 +78,6 @@ class ReactiveCassandraParameterAccessor extends CassandraParametersParameterAcc return result; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParametersParameterAccessor#getBindableValue(int) - */ public Object getBindableValue(int index) { return getValue(getParameters().getBindableParameter(index).getIndex()); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java index 21b23a234..a4bd9d3b6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java @@ -69,9 +69,6 @@ interface ReactiveCassandraQueryExecution { this.pageable = pageable; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Publisher execute(Statement statement, Class type) { @@ -110,10 +107,6 @@ interface ReactiveCassandraQueryExecution { this.operations = operations; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ReactiveCassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Publisher execute(Statement statement, Class type) { return operations.select(statement, type); @@ -135,10 +128,6 @@ interface ReactiveCassandraQueryExecution { this.limiting = limiting; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ReactiveCassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Publisher execute(Statement statement, Class type) { @@ -173,9 +162,6 @@ interface ReactiveCassandraQueryExecution { this.operations = operations; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ReactiveCassandraQueryExecution#execute(com.datastax.oss.driver.api.core.cql.Statement, java.lang.Class) - */ @Override public Publisher execute(Statement statement, Class type) { @@ -220,10 +206,6 @@ interface ReactiveCassandraQueryExecution { this.converter = converter; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ReactiveCassandraQueryExecution#execute(java.lang.String, java.lang.Class) - */ @Override public Publisher execute(Statement statement, Class type) { return (Publisher) converter.convert(delegate.execute(statement, type)); @@ -249,10 +231,6 @@ interface ReactiveCassandraQueryExecution { this.instantiators = instantiators; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(Object source) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java index 438355ca1..c84291027 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryMethod.java @@ -54,20 +54,11 @@ public class ReactiveCassandraQueryMethod extends CassandraQueryMethod { && ReactiveWrappers.isMultiValueType(metadata.getReturnType(method).getType())) || super.isCollectionQuery()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isCollectionQuery() - */ @Override public boolean isCollectionQuery() { return isCollectionQuery.get(); } - /* - * All reactive query methods are streaming queries. - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isStreamQuery() - */ @Override public boolean isStreamQuery() { return true; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java index 93d3594ea..a74e3dd55 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java @@ -91,10 +91,6 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue return this.tree; } - /* - * (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#createQuery(org.springframework.data.cassandra.repository.query.CassandraParameterAccessor, boolean) - */ @Override protected Mono createQuery(CassandraParameterAccessor parameterAccessor) { @@ -117,33 +113,21 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue }); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return getTree().isCountProjection(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return getTree().isExistsProjection(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isLimiting() - */ @Override protected boolean isLimiting() { return getTree().isLimiting(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isModifyingQuery() - */ @Override protected boolean isModifyingQuery() { return getTree().isDelete(); 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 49a78920c..c33fdaec0 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 @@ -120,9 +120,6 @@ public class ReactiveStringBasedCassandraQuery extends AbstractReactiveCassandra return this.stringBasedQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#createQuery(org.springframework.data.cassandra.repository.query.CassandraParameterAccessor) - */ @Override public Mono createQuery(CassandraParameterAccessor parameterAccessor) { @@ -134,33 +131,21 @@ public class ReactiveStringBasedCassandraQuery extends AbstractReactiveCassandra return spelEvaluator.map(it -> getQueryStatementCreator().select(query, parameterAccessor, it)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return this.isCountQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return this.isExistsQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractReactiveCassandraQuery#isLimiting() - */ @Override protected boolean isLimiting() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isModifyingQuery() - */ @Override protected boolean isModifyingQuery() { return false; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java index 3609c03b3..64e2da664 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/SimpleCassandraEntityMetadata.java @@ -48,17 +48,11 @@ class SimpleCassandraEntityMetadata implements CassandraEntityMetadata { this.entity = entity; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraEntityMetadata#getTableName() - */ @Override public CqlIdentifier getTableName() { return entity.getTableName(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.EntityMetadata#getJavaType() - */ @Override public Class getJavaType() { return type; 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 1b069a2c5..2cf81f8b7 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 @@ -111,9 +111,6 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery { return this.stringBasedQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#createQuery(org.springframework.data.cassandra.repository.query.CassandraParameterAccessor) - */ @Override public SimpleStatement createQuery(CassandraParameterAccessor parameterAccessor) { @@ -126,33 +123,21 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery { new DefaultSpELExpressionEvaluator(expressionParser, evaluationContext)); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return this.isCountQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return this.isExistsQuery; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isLimiting() - */ @Override protected boolean isLimiting() { return false; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#isModifyingQuery() - */ @Override protected boolean isModifyingQuery() { return false; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CachingExpressionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CachingExpressionParser.java index 3f92ee15e..7b7243092 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CachingExpressionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CachingExpressionParser.java @@ -39,19 +39,11 @@ class CachingExpressionParser implements ExpressionParser { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.expression.ExpressionParser#parseExpression(java.lang.String) - */ @Override public Expression parseExpression(String expressionString) throws ParseException { return cache.computeIfAbsent(expressionString, delegate::parseExpression); } - /* - * (non-Javadoc) - * @see org.springframework.expression.ExpressionParser#parseExpression(java.lang.String, org.springframework.expression.ParserContext) - */ @Override public Expression parseExpression(String expressionString, ParserContext context) throws ParseException { throw new UnsupportedOperationException("Parsing using ParserContext is not supported"); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java index a1913e20c..e84d6122e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java @@ -77,17 +77,11 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { return this.operations.getConverter().getProjectionFactory(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return SimpleCassandraRepository.class; } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { @@ -96,9 +90,6 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { return getTargetRepositoryViaReflection(information, entityInformation, operations); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public CassandraEntityInformation getEntityInformation(Class domainClass) { @@ -108,10 +99,6 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { return new MappingCassandraEntityInformation<>((CassandraPersistentEntity) entity, operations.getConverter()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(Key, EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(@Nullable Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { @@ -138,9 +125,6 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { this.mappingContext = mappingContext; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries) - */ @Override public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) { 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 8a286cf54..1668dee2c 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 @@ -66,9 +66,6 @@ public class CassandraRepositoryFactoryBean, S, ID> setMappingContext(cassandraTemplate.getConverter().getMappingContext()); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java index c32de29da..ddab6d987 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java @@ -54,9 +54,6 @@ public class MappingCassandraEntityInformation extends PersistentEntityIn this.converter = converter; } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#getId(java.lang.Object) - */ @SuppressWarnings("unchecked") @Override @Nullable @@ -70,9 +67,6 @@ public class MappingCassandraEntityInformation extends PersistentEntityIn : (ID) converter.getId(entity, entityMetadata); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#getIdType() - */ @SuppressWarnings("unchecked") @Override public Class getIdType() { @@ -84,17 +78,11 @@ public class MappingCassandraEntityInformation extends PersistentEntityIn return (Class) MapId.class; } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraEntityInformation#getIdAttribute() - */ @Override public String getIdAttribute() { return this.entityMetadata.getRequiredIdProperty().getName(); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.CassandraEntityMetadata#getTableName() - */ @Override public CqlIdentifier getTableName() { return this.entityMetadata.getTableName(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java index db9fb8b41..2af20fcac 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java @@ -76,17 +76,11 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor return this.operations.getConverter().getProjectionFactory(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return SimpleReactiveCassandraRepository.class; } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { @@ -95,9 +89,6 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor return getTargetRepositoryViaReflection(information, entityInformation, operations); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(@Nullable Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { @@ -105,9 +96,6 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor (ReactiveQueryMethodEvaluationContextProvider) evaluationContextProvider, mappingContext)); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ @SuppressWarnings("unchecked") public CassandraEntityInformation getEntityInformation(Class domainClass) { @@ -141,9 +129,6 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor this.mappingContext = mappingContext; } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries) - */ @Override public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) { 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 147cf6628..4b7dadf14 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 @@ -62,9 +62,6 @@ public class ReactiveCassandraRepositoryFactoryBean, this.operations = operations; } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext) - */ @Override protected void setMappingContext(MappingContext mappingContext) { @@ -73,9 +70,6 @@ public class ReactiveCassandraRepositoryFactoryBean, this.mappingContextConfigured = true; } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory() - */ @Override protected final RepositoryFactorySupport createRepositoryFactory() { @@ -84,10 +78,6 @@ public class ReactiveCassandraRepositoryFactoryBean, return getFactoryInstance(operations); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createDefaultQueryMethodEvaluationContextProvider(ListableBeanFactory) - */ @Override protected Optional createDefaultQueryMethodEvaluationContextProvider( ListableBeanFactory beanFactory) { @@ -104,9 +94,6 @@ public class ReactiveCassandraRepositoryFactoryBean, return new ReactiveCassandraRepositoryFactory(operations); } - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java index ea44ebac5..9b65118b0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java @@ -76,9 +76,6 @@ public class SimpleCassandraRepository implements CassandraRepository S save(S entity) { @@ -96,9 +93,6 @@ public class SimpleCassandraRepository implements CassandraRepository List saveAll(Iterable entities) { @@ -113,9 +107,6 @@ public class SimpleCassandraRepository implements CassandraRepository findById(ID id) { @@ -128,9 +119,6 @@ public class SimpleCassandraRepository implements CassandraRepository implements CassandraRepository findAll() { return this.operations.select(Query.empty(), this.entityInformation.getJavaType()); } - /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) - */ @Override public List findAllById(Iterable ids) { @@ -162,17 +144,11 @@ public class SimpleCassandraRepository implements CassandraRepository implements CassandraRepository implements CassandraRepository ids) { @@ -207,9 +177,6 @@ public class SimpleCassandraRepository implements CassandraRepository entities) { @@ -218,9 +185,6 @@ public class SimpleCassandraRepository implements CassandraRepository implements CassandraRepository findAll(Pageable pageable) { @@ -241,9 +202,6 @@ public class SimpleCassandraRepository implements CassandraRepository S insert(S entity) { @@ -252,9 +210,6 @@ public class SimpleCassandraRepository implements CassandraRepository List insert(Iterable entities) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java index 2e02c8abf..e5bc15ae8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java @@ -75,9 +75,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand // Methods from ReactiveCrudRepository // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(S) - */ @Override public Mono save(S entity) { @@ -95,9 +92,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.insert(entity, INSERT_NULLS).map(EntityWriteResult::getEntity); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Iterable) - */ @Override public Flux saveAll(Iterable entities) { @@ -106,9 +100,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return saveAll(Flux.fromIterable(entities)); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(org.reactivestreams.Publisher) - */ @Override public Flux saveAll(Publisher entityStream) { @@ -117,10 +108,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Flux.from(entityStream).flatMap(this::save); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object) - */ @Override public Mono findById(ID id) { @@ -129,10 +116,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.selectOneById(id, this.entityInformation.getJavaType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(org.reactivestreams.Publisher) - */ @Override public Mono findById(Publisher publisher) { @@ -141,10 +124,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Mono.from(publisher).flatMap(this::findById); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object) - */ @Override public Mono existsById(ID id) { @@ -153,10 +132,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.exists(id, this.entityInformation.getJavaType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(org.reactivestreams.Publisher) - */ @Override public Mono existsById(Publisher publisher) { @@ -165,19 +140,11 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Mono.from(publisher).flatMap(this::existsById); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll() - */ @Override public Flux findAll() { return this.operations.select(Query.empty(), this.entityInformation.getJavaType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable) - */ @Override public Flux findAllById(Iterable ids) { @@ -194,10 +161,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.select(createIdsInCollectionQuery(ids), this.entityInformation.getJavaType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher) - */ @Override public Flux findAllById(Publisher idStream) { @@ -206,18 +169,11 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Flux.from(idStream).flatMap(this::findById); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count() - */ @Override public Mono count() { return this.operations.count(this.entityInformation.getJavaType()); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object) - */ @Override public Mono deleteById(ID id) { @@ -226,9 +182,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.deleteById(id, this.entityInformation.getJavaType()).then(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(org.reactivestreams.Publisher) - */ @Override public Mono deleteById(Publisher publisher) { @@ -237,10 +190,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Mono.from(publisher).flatMap(this::deleteById).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object) - */ @Override public Mono delete(T entity) { @@ -249,9 +198,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.delete(entity).then(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAllById(java.lang.Iterable) - */ @Override public Mono deleteAllById(Iterable ids) { @@ -268,9 +214,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.delete(createIdsInCollectionQuery(ids), this.entityInformation.getJavaType()).then(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable) - */ @Override public Mono deleteAll(Iterable entities) { @@ -279,9 +222,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Flux.fromIterable(entities).flatMap(this.operations::delete).then(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher) - */ @Override public Mono deleteAll(Publisher entityStream) { @@ -290,9 +230,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Flux.from(entityStream).flatMap(this.operations::delete).then(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll() - */ @Override public Mono deleteAll() { return this.operations.truncate(this.entityInformation.getJavaType()); @@ -302,9 +239,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand // Methods from ReactiveCrudRepository // ------------------------------------------------------------------------- - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Object) - */ @Override public Mono insert(S entity) { @@ -313,9 +247,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return this.operations.insert(entity); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(java.lang.Iterable) - */ @Override public Flux insert(Iterable entities) { @@ -324,9 +255,6 @@ public class SimpleReactiveCassandraRepository implements ReactiveCassand return Flux.fromIterable(entities).flatMap(this.operations::insert); } - /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.ReactiveCassandraRepository#insert(org.reactivestreams.Publisher) - */ @Override public Flux insert(Publisher entityStream) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/MapBuilder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/MapBuilder.java index ac1e32562..3ae0fdb6a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/MapBuilder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/MapBuilder.java @@ -96,115 +96,73 @@ public class MapBuilder implements Map { return new LinkedHashMap<>(map); } - /* (non-Javadoc) - * @see java.util.Map#size() - */ @Override public int size() { return map.size(); } - /* (non-Javadoc) - * @see java.util.Map#isEmpty() - */ @Override public boolean isEmpty() { return map.isEmpty(); } - /* (non-Javadoc) - * @see java.util.Map#containsKey(java.lang.Object) - */ @Override public boolean containsKey(Object key) { return map.containsKey(key); } - /* (non-Javadoc) - * @see java.util.Map#containsValue(java.lang.Object) - */ @Override public boolean containsValue(Object value) { return map.containsValue(value); } - /* (non-Javadoc) - * @see java.util.Map#get(java.lang.Object) - */ @Override @Nullable public V get(Object key) { return map.get(key); } - /* (non-Javadoc) - * @see java.util.Map#put(java.lang.Object, java.lang.Object) - */ @Override public V put(K key, V value) { return map.put(key, value); } - /* (non-Javadoc) - * @see java.util.Map#remove(java.lang.Object) - */ @Override @Nullable public V remove(Object key) { return map.remove(key); } - /* (non-Javadoc) - * @see java.util.Map#putAll(java.util.Map) - */ @Override public void putAll(Map m) { map.putAll(m); } - /* (non-Javadoc) - * @see java.util.Map#clear() - */ @Override public void clear() { map.clear(); } - /* (non-Javadoc) - * @see java.util.Map#keySet() - */ @Override public Set keySet() { return map.keySet(); } - /* (non-Javadoc) - * @see java.util.Map#values() - */ @Override public Collection values() { return map.values(); } - /* (non-Javadoc) - * @see java.util.Map#entrySet() - */ @Override public Set> entrySet() { return map.entrySet(); } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { return map.equals(o); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return map.hashCode();