Remove Eclipse Non-Javadoc comments.

Closes #1204

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) {
 

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<? extends Annotation> 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) {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java

@@ -37,33 +37,21 @@ public class CassandraCqlTemplateFactoryBean implements FactoryBean<CqlTemplate>
 
 	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<CqlTemplate> 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 {
 

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) {
 

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);

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) {
 

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() {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java

@@ -42,10 +42,6 @@ public class CassandraTemplateFactoryBean implements FactoryBean<CassandraTempla
 
 	protected @Nullable CassandraConverter converter;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
 
@@ -58,10 +54,6 @@ public class CassandraTemplateFactoryBean implements FactoryBean<CassandraTempla
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public CassandraTemplate getObject() throws Exception {
 
@@ -72,19 +64,11 @@ public class CassandraTemplateFactoryBean implements FactoryBean<CassandraTempla
 		return new CassandraTemplate(sessionFactory, converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<CassandraTemplate> getObjectType() {
 		return CassandraTemplate.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-	 */
 	@Override
 	public boolean isSingleton() {
 		return true;

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) {
 

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() {
 

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<? extends CqlSession> 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() {
 

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) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActionSpecificationFactoryBean.java

@@ -57,9 +57,6 @@ public class KeyspaceActionSpecificationFactoryBean implements FactoryBean<Keysp
 
 	private @Nullable KeyspaceActions actions;
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
@@ -103,25 +100,16 @@ public class KeyspaceActionSpecificationFactoryBean implements FactoryBean<Keysp
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public KeyspaceActions getObject() {
 		return actions;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<?> getObjectType() {
 		return Set.class;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-	 */
 	@Override
 	public boolean isSingleton() {
 		return false;

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() + ")";

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/PersistentEntitiesFactoryBean.java

@@ -37,19 +37,11 @@ public class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEnti
 		this.converter = converter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public PersistentEntities getObject() {
 		return PersistentEntities.of(converter.getMappingContext());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<?> getObjectType() {
 		return PersistentEntities.class;

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<? extends Annotation> 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) {

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) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryFactoryBean.java

@@ -115,10 +115,6 @@ public class SessionFactoryFactoryBean extends AbstractFactoryBean<SessionFactor
 		this.session = session;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cassandra.config.CassandraCqlSessionFactoryBean#afterPropertiesSet()
-	 */
 	@Override
 	@SuppressWarnings("all")
 	public void afterPropertiesSet() throws Exception {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java

@@ -190,17 +190,11 @@ public class AsyncCassandraTemplate
 		this.statementFactory = new StatementFactory(converter);
 	}
 
-	/* (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 {
 
@@ -218,17 +212,11 @@ public class AsyncCassandraTemplate
 		this.entityCallbacks = entityCallbacks;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#getAsyncCqlOperations()
-	 */
 	@Override
 	public AsyncCqlOperations getAsyncCqlOperations() {
 		return this.cqlOperations;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#getConverter()
-	 */
 	@Override
 	public CassandraConverter getConverter() {
 		return this.converter;
@@ -309,9 +297,6 @@ public class AsyncCassandraTemplate
 	// Methods dealing with static CQL
 	// -------------------------------------------------------------------------
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#select(java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <T> ListenableFuture<List<T>> select(String cql, Class<T> 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 <T> ListenableFuture<Void> select(String cql, Consumer<T> entityConsumer, Class<T> 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 <T> ListenableFuture<T> selectOne(String cql, Class<T> 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<AsyncResultSet> 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 <T> ListenableFuture<List<T>> select(Statement<?> statement, Class<T> 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 <T> ListenableFuture<Void> select(Statement<?> statement, Consumer<T> entityConsumer, Class<T> 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 <T> ListenableFuture<T> selectOne(Statement<?> statement, Class<T> 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 <T> ListenableFuture<Slice<T>> slice(Statement<?> statement, Class<T> 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 <T> ListenableFuture<List<T>> select(Query query, Class<T> 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 <T> ListenableFuture<Void> select(Query query, Consumer<T> entityConsumer, Class<T> 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 <T> ListenableFuture<T> selectOne(Query query, Class<T> 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 <T> ListenableFuture<Slice<T>> slice(Query query, Class<T> 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<Boolean> 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<Boolean> 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<Long> 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<Long> 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<Boolean> 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<Boolean> 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 <T> ListenableFuture<T> selectOneById(Object id, Class<T> 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 <T> ListenableFuture<T> 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 <T> ListenableFuture<EntityWriteResult<T>> 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 <T> ListenableFuture<T> 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 <T> ListenableFuture<EntityWriteResult<T>> 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 <T> ListenableFuture<T> 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<WriteResult> 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<Boolean> 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<Void> 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<PreparedStatement> 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();

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<String, Object> 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<TableMetadata> 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() {
 

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) {
 

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 <T> List<T> select(String cql, Class<T> 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> T selectOne(String cql, Class<T> 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 <T> Stream<T> stream(String cql, Class<T> 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 <T> List<T> select(Statement<?> statement, Class<T> 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> T selectOne(Statement<?> statement, Class<T> 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 <T> Slice<T> slice(Statement<?> statement, Class<T> 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 <T> Stream<T> stream(Statement<?> statement, Class<T> 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 <T> List<T> select(Query query, Class<T> 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> T selectOne(Query query, Class<T> 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 <T> Slice<T> slice(Query query, Class<T> 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 <T> Stream<T> stream(Query query, Class<T> 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> T selectOneById(Object id, Class<T> 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> 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 <T> EntityWriteResult<T> 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> 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 <T> EntityWriteResult<T> 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 <T> ExecutableSelect<T> query(Class<T> domainType) {
 		return new ExecutableSelectOperationSupport(this).query(domainType);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.ExecutableInsertOperation#insert(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableInsert<T> insert(Class<T> 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();

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) {
 

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<Update> appendVersionCondition(StatementBuilder<Update> 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<Delete> appendVersionCondition(StatementBuilder<Delete> 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;

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());
 		}

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 <T> ExecutableInsert<T> insert(Class<T> 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<T> 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<T> 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<T> one(T object) {
 

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 <T> ExecutableSelect<T> query(Class<T> 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<T> 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 <R> SelectWithQuery<R> as(Class<R> 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<T> 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<T> 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<T> stream() {
 			return this.template.doStream(this.query, this.domainType, getTableName(), this.returnType);

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) {
 

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) {
 

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<WriteResult> 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<? extends Iterable<?>> 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<? extends Iterable<?>> 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<? extends Iterable<?>> 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<? extends Iterable<?>> 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<? extends Iterable<?>> 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<? extends Iterable<?>> entities, WriteOptions options) {
 

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 <T> Flux<T> select(String cql, Class<T> 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 <T> Mono<T> selectOne(String cql, Class<T> 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<ReactiveResultSet> 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 <T> Flux<T> select(Statement<?> statement, Class<T> 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 <T> Mono<T> selectOne(Statement<?> statement, Class<T> 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 <T> Mono<Slice<T>> slice(Statement<?> statement, Class<T> 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 <T> Flux<T> select(Query query, Class<T> 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 <T> Mono<T> selectOne(Query query, Class<T> 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 <T> Mono<Slice<T>> slice(Query query, Class<T> 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<Boolean> 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<Boolean> 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<Long> 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<Long> 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<Boolean> 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<Boolean> 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 <T> Mono<T> selectOneById(Object id, Class<T> 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 <T> Mono<T> 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 <T> Mono<EntityWriteResult<T>> 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 <T> Mono<T> 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 <T> Mono<EntityWriteResult<T>> 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 <T> Mono<T> 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<WriteResult> 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<Boolean> 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<Void> 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 <T> ReactiveInsert<T> insert(Class<T> domainType) {
 		return new ReactiveInsertOperationSupport(this).insert(domainType);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.ReactiveSelectOperation#query(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveSelect<T> query(Class<T> 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<PreparedStatement> 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();

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<WriteResult> all() {
 			return this.template.doDelete(this.query, this.domainType, getTableName());
 		}

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 <T> ReactiveInsert<T> insert(Class<T> 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<T> 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<T> 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<EntityWriteResult<T>> one(T object) {
 

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 <T> ReactiveSelect<T> query(Class<T> 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<T> 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 <R> SelectWithQuery<R> as(Class<R> 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<T> 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<Long> count() {
 			return this.template.doCount(this.query, this.domainType, getTableName());
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#exists()
-		 */
 		@Override
 		public Mono<Boolean> exists() {
 			return this.template.doExists(this.query, this.domainType, getTableName());
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#first()
-		 */
 		@Override
 		public Mono<T> 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<T> one() {
 
@@ -155,9 +131,6 @@ class ReactiveSelectOperationSupport implements ReactiveSelectOperation {
 					});
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.cassandra.core.ReactiveSelectOperation.TerminatingSelect#all()
-		 */
 		@Override
 		public Flux<T> all() {
 			return this.template.doSelect(this.query, this.domainType, getTableName(), this.returnType);

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<WriteResult> apply(Update update) {
 

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) {
 

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();

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();
 

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() {
 

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() {
 

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()));

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> R read(Class<R> 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> T potentiallyConvertSpelValue(Object object, Parameter<T, CassandraPersistentProperty> 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> T getParameterValue(Parameter<T, CassandraPersistentProperty> parameter) {

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<CassandraPersistentProperty> getProperty() {
 			return this.optionalProperty;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey()
-		 */
 		@Override
 		public ColumnName getMappedKey() {
 

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();

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> 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;

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> 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;

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();

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 <T> ListenableFuture<T> execute(AsyncSessionCallback<T> 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<Boolean> 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 <T> ListenableFuture<T> query(String cql, AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(String cql, RowMapper<T> 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<List<Map<String, Object>>> 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 <T> ListenableFuture<List<T>> queryForList(String cql, Class<T> 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<Map<String, Object>> 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 <T> ListenableFuture<T> queryForObject(String cql, Class<T> 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 <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> 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<AsyncResultSet> 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<Boolean> 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 <T> ListenableFuture<T> query(Statement<?> statement, AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(Statement<?> statement, RowMapper<T> 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<List<Map<String, Object>>> 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 <T> ListenableFuture<List<T>> queryForList(Statement<?> statement, Class<T> 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<Map<String, Object>> 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 <T> ListenableFuture<T> queryForObject(Statement<?> statement, Class<T> 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 <T> ListenableFuture<T> queryForObject(Statement<?> statement, RowMapper<T> 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<AsyncResultSet> 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<Boolean> 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<Boolean> 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<Boolean> 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 <T> ListenableFuture<T> execute(String cql, PreparedStatementCallback<T> 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 <T> ListenableFuture<T> execute(AsyncPreparedStatementCreator preparedStatementCreator,
 			PreparedStatementCallback<T> 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 <T> ListenableFuture<T> query(AsyncPreparedStatementCreator preparedStatementCreator,
 			AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(AsyncPreparedStatementCreator preparedStatementCreator,
 			RowMapper<T> 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 <T> ListenableFuture<T> query(AsyncPreparedStatementCreator preparedStatementCreator,
 			@Nullable PreparedStatementBinder psb, AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(AsyncPreparedStatementCreator preparedStatementCreator,
 			@Nullable PreparedStatementBinder psb, RowMapper<T> 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 <T> ListenableFuture<T> query(String cql, AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(String cql, RowMapper<T> 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 <T> ListenableFuture<T> query(String cql, @Nullable PreparedStatementBinder psb,
 			AsyncResultSetExtractor<T> 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<Void> 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 <T> ListenableFuture<List<T>> query(String cql, @Nullable PreparedStatementBinder psb, RowMapper<T> 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<List<Map<String, Object>>> 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 <T> ListenableFuture<List<T>> queryForList(String cql, Class<T> 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<Map<String, Object>> 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 <T> ListenableFuture<T> queryForObject(String cql, Class<T> 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 <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> 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<AsyncResultSet> 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<Void> extractData(AsyncResultSet resultSet) {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java

@@ -56,9 +56,6 @@ public class AsyncRowMapperResultSetExtractor<T> implements AsyncResultSetExtrac
 		this.rowMapper = rowMapper;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet)
-	 */
 	@Override
 	public ListenableFuture<List<T>> extractData(AsyncResultSet resultSet) throws DriverException, DataAccessException {
 		return AsyncResultStream.from(resultSet).map(rowMapper).collect(Collectors.toList());

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 {
 

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<String> 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) {
 

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<Map<String, Object>> {
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.RowMapper#mapRow(com.datastax.oss.driver.api.core.cql.Row, int)
-	 */
 	@Override
 	public Map<String, Object> mapRow(Row rs, int rowNum) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java

@@ -251,10 +251,6 @@ public final class CqlIdentifier implements Comparable<CqlIdentifier>, Serializa
 		return identifier.equals(that.identifier);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public int hashCode() {
 		int result = identifier.hashCode();

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> T execute(SessionCallback<T> 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> T query(String cql, ResultSetExtractor<T> 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 <T> List<T> query(String cql, RowMapper<T> 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<Map<String, Object>> 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 <T> List<T> queryForList(String cql, Class<T> 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<String, Object> 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> T queryForObject(String cql, Class<T> 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> T queryForObject(String cql, RowMapper<T> 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<Row> 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> T query(Statement<?> statement, ResultSetExtractor<T> 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 <T> List<T> query(Statement<?> statement, RowMapper<T> 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 <T> Stream<T> queryForStream(Statement<?> statement, RowMapper<T> 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<Map<String, Object>> 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 <T> List<T> queryForList(Statement<?> statement, Class<T> 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<String, Object> 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> T queryForObject(Statement<?> statement, Class<T> 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> T queryForObject(Statement<?> statement, RowMapper<T> 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<Row> 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> T execute(String cql, PreparedStatementCallback<T> 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> T execute(PreparedStatementCreator preparedStatementCreator, PreparedStatementCallback<T> 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> T query(PreparedStatementCreator preparedStatementCreator, ResultSetExtractor<T> 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 <T> List<T> query(PreparedStatementCreator preparedStatementCreator, RowMapper<T> 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 <T> Stream<T> queryForStream(PreparedStatementCreator preparedStatementCreator, RowMapper<T> 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> 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 <T> List<T> query(PreparedStatementCreator preparedStatementCreator, @Nullable PreparedStatementBinder psb,
 			RowMapper<T> 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 <T> Stream<T> queryForStream(PreparedStatementCreator preparedStatementCreator,
 			@Nullable PreparedStatementBinder psb, RowMapper<T> 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> T query(String cql, ResultSetExtractor<T> 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 <T> List<T> query(String cql, RowMapper<T> 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 <T> Stream<T> queryForStream(String cql, RowMapper<T> 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> T query(String cql, @Nullable PreparedStatementBinder psb, ResultSetExtractor<T> 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 <T> List<T> query(String cql, @Nullable PreparedStatementBinder psb, RowMapper<T> 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<Map<String, Object>> 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 <T> List<T> queryForList(String cql, Class<T> 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<String, Object> 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> T queryForObject(String cql, Class<T> 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> T queryForObject(String cql, RowMapper<T> 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<Row> 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<RingMember> describeRing() throws DataAccessException {
 		return (List<RingMember>) describeRing(RingMemberHostMapper.INSTANCE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cqlOperations#describeRing(org.springframework.data.cassandra.core.cql.HostMapper)
-	 */
 	@Override
 	public <T> Collection<T> describeRing(HostMapper<T> 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<? super T> 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<T> 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;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java

@@ -90,58 +90,36 @@ class ExceptionTranslatingListenableFutureAdapter<T> implements ListenableFuture
 		return settableFuture;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.util.concurrent.ListenableFuture#addCallback(org.springframework.util.concurrent.ListenableFutureCallback)
-	 */
 	@Override
 	public void addCallback(ListenableFutureCallback<? super T> 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<? super T> 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);

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java

@@ -107,10 +107,6 @@ public final class KeyspaceIdentifier implements Comparable<KeyspaceIdentifier>
 		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<KeyspaceIdentifier>
 		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);

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);

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 <T> Flux<T> execute(ReactiveSessionCallback<T> 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<Boolean> 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 <T> Flux<T> query(String cql, ReactiveResultSetExtractor<T> 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 <T> Flux<T> query(String cql, RowMapper<T> 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 <T> Mono<T> queryForObject(String cql, RowMapper<T> 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 <T> Mono<T> queryForObject(String cql, Class<T> 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<Map<String, Object>> 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 <T> Flux<T> queryForFlux(String cql, Class<T> 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<Map<String, Object>> 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<ReactiveResultSet> 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<Row> 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<Boolean> execute(Publisher<String> 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<Boolean> 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 <T> Flux<T> query(Statement<?> statement, ReactiveResultSetExtractor<T> 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 <T> Flux<T> query(Statement<?> statement, RowMapper<T> 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 <T> Mono<T> queryForObject(Statement<?> statement, RowMapper<T> 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 <T> Mono<T> queryForObject(Statement<?> statement, Class<T> 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<Map<String, Object>> 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 <T> Flux<T> queryForFlux(Statement<?> statement, Class<T> 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<Map<String, Object>> 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<ReactiveResultSet> 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 <T> Flux<T> execute(ReactivePreparedStatementCreator psc, ReactivePreparedStatementCallback<T> 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 <T> Flux<T> execute(String cql, ReactivePreparedStatementCallback<T> 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 <T> Flux<T> query(ReactivePreparedStatementCreator psc, ReactiveResultSetExtractor<T> 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 <T> Flux<T> query(String cql, @Nullable PreparedStatementBinder psb, ReactiveResultSetExtractor<T> 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 <T> Flux<T> query(String cql, ReactiveResultSetExtractor<T> 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 <T> Flux<T> query(ReactivePreparedStatementCreator psc, RowMapper<T> 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 <T> Flux<T> query(String cql, @Nullable PreparedStatementBinder psb, RowMapper<T> 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 <T> Flux<T> query(ReactivePreparedStatementCreator psc, @Nullable PreparedStatementBinder psb,
 			RowMapper<T> 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 <T> Flux<T> query(String cql, RowMapper<T> 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 <T> Mono<T> queryForObject(String cql, RowMapper<T> 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 <T> Mono<T> queryForObject(String cql, Class<T> 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<Map<String, Object>> 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 <T> Flux<T> queryForFlux(String cql, Class<T> 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<Map<String, Object>> 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<ReactiveResultSet> 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<Row> 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<Boolean> 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<Boolean> 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<Boolean> 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<Boolean> execute(String cql, Publisher<Object[]> args) throws DataAccessException {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java

@@ -53,9 +53,6 @@ public class ReactiveRowMapperResultSetExtractor<T> 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<T> extractData(ReactiveResultSet resultSet) throws DriverException, DataAccessException {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java

@@ -34,9 +34,6 @@ public enum RingMemberHostMapper implements HostMapper<RingMember> {
 
 	INSTANCE;
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.HostMapper#mapHosts(java.util.Iterable)
-	 */
 	@Override
 	public Collection<RingMember> mapHosts(Iterable<Node> hosts) throws DriverException {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java

@@ -69,9 +69,6 @@ public class RowMapperResultSetExtractor<T> implements ResultSetExtractor<List<T
 		this.rowsExpected = rowsExpected;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet)
-	 */
 	@Override
 	public List<T> extractData(ResultSet resultSet) throws DriverException, DataAccessException {
 

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();
 	}

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() {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java

@@ -45,9 +45,6 @@ public class ResultSetToArrayConverter implements Converter<ResultSet, Object[]>
 		this.rowConverter = rowConverter;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	public Object[] convert(ResultSet resultSet) {
 

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;

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;

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;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java

@@ -30,9 +30,6 @@ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter<B
 
 	public static final ResultSetToByteBufferConverter INSTANCE = new ResultSetToByteBufferConverter();
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object)
-	 */
 	@Override
 	protected ByteBuffer doConvertSingleValue(Object object) {
 
@@ -44,9 +41,6 @@ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter<B
 		return (ByteBuffer) object;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType()
-	 */
 	@Override
 	protected Class<?> getType() {
 		return ByteBuffer.class;

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;

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;

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;

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;

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;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java

@@ -53,9 +53,6 @@ public class ResultSetToListConverter implements Converter<ResultSet, List<Map<S
 		this.rowConverter = rowConverter;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	public List<Map<String, Object>> convert(ResultSet resultSet) {
 

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<String> 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<String> doConvertSingleRow(Map<String, Object> row) {
 		return row.values().stream().map(value -> value == null ? null : value.toString()).collect(Collectors.toList());

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;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java

@@ -31,17 +31,11 @@ public class ResultSetToStringConverter extends AbstractResultSetConverter<Strin
 
 	public static final ResultSetToStringConverter INSTANCE = new ResultSetToStringConverter();
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object)
-	 */
 	@Override
 	protected String doConvertSingleValue(Object object) {
 		return object.toString();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map)
-	 */
 	@Override
 	protected String doConvertSingleRow(Map<String, Object> row) {
 

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;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java

@@ -30,9 +30,6 @@ public enum RowToArrayConverter implements Converter<Row, Object[]> {
 
 	INSTANCE;
 
-	/* (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	public Object[] convert(Row row) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java

@@ -37,9 +37,6 @@ public enum RowToListConverter implements Converter<Row, List<Object>> {
 
 	INSTANCE;
 
-	/* (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	public List<Object> convert(Row row) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java

@@ -37,9 +37,6 @@ public enum RowToMapConverter implements Converter<Row, Map<String, Object>> {
 
 	INSTANCE;
 
-	/* (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	public Map<String, Object> convert(Row row) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java

@@ -32,9 +32,6 @@ public class AddColumnCqlGenerator extends ColumnChangeCqlGenerator<AddColumnSpe
 		super(specification);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.ColumnChangeCqlGenerator#toCql(java.lang.StringBuilder)
-	 */
 	@Override
 	public StringBuilder toCql(StringBuilder cql) {
 		return cql.append("ADD ").append(spec().getName().asCql(true)).append(' ')

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java

@@ -49,10 +49,6 @@ public class AlterUserTypeCqlGenerator extends UserTypeNameCqlGenerator<AlterUse
 		return new AlterUserTypeCqlGenerator(specification).toCql();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.UserTypeNameCqlGenerator#toCql(java.lang.StringBuilder)
-	 */
 	@Override
 	public StringBuilder toCql(StringBuilder cql) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGenerator.java

@@ -45,9 +45,6 @@ public class CreateTableCqlGenerator extends TableOptionsCqlGenerator<TableSpeci
 		return new CreateTableCqlGenerator(specification).toCql();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.TableOptionsCqlGenerator#spec()
-	 */
 	@Override
 	protected CreateTableSpecification spec() {
 		return (CreateTableSpecification) super.spec();

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java

@@ -43,10 +43,6 @@ public class CreateUserTypeCqlGenerator extends UserTypeNameCqlGenerator<CreateU
 		return new CreateUserTypeCqlGenerator(specification).toCql();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.UserTypeNameCqlGenerator#toCql(java.lang.StringBuilder)
-	 */
 	@Override
 	public StringBuilder toCql(StringBuilder cql) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java

@@ -40,10 +40,6 @@ public class DropUserTypeCqlGenerator extends UserTypeNameCqlGenerator<DropUserT
 		return new DropUserTypeCqlGenerator(specification).toCql();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.UserTypeNameCqlGenerator#toCql(java.lang.StringBuilder)
-	 */
 	@Override
 	public StringBuilder toCql(StringBuilder cql) {
 		return cql.append("DROP TYPE").append(spec().getIfExists() ? " IF EXISTS " : " ")

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/RenameColumnCqlGenerator.java

@@ -46,10 +46,6 @@ public class RenameColumnCqlGenerator extends ColumnChangeCqlGenerator<RenameCol
 		this.keyword = keyword;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.generator.ColumnChangeCqlGenerator#toCql(java.lang.StringBuilder)
-	 */
 	public StringBuilder toCql(StringBuilder cql) {
 		return cql.append(keyword).append(' ').append(spec().getName().asCql(true)).append(" TO ")
 				.append(spec().getTargetName().asCql(true));

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java

@@ -225,10 +225,6 @@ public class ColumnSpecification {
 		return cql.append(name.asCql(true)).append(" ").append(type.asCql(true, true));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return toCql(new StringBuilder()).append(" /* ")

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java

@@ -111,9 +111,6 @@ public class CreateIndexSpecification extends IndexNameSpecification<CreateIndex
 		return this;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.IndexDescriptor#getTableName()
-	 */
 	@Override
 	public CqlIdentifier getTableName() {
 		return this.tableName;
@@ -144,9 +141,6 @@ public class CreateIndexSpecification extends IndexNameSpecification<CreateIndex
 		return this;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.IndexDescriptor#getColumnName()
-	 */
 	@Override
 	public CqlIdentifier getColumnName() {
 		return this.columnName;
@@ -177,9 +171,6 @@ public class CreateIndexSpecification extends IndexNameSpecification<CreateIndex
 		return this.ifNotExists;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.IndexDescriptor#isCustom()
-	 */
 	@Override
 	public boolean isCustom() {
 		return this.custom;
@@ -198,9 +189,6 @@ public class CreateIndexSpecification extends IndexNameSpecification<CreateIndex
 		return this;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.IndexDescriptor#getUsing()
-	 */
 	@Override
 	@Nullable
 	public String getUsing() {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateKeyspaceSpecification.java

@@ -136,34 +136,21 @@ public class CreateKeyspaceSpecification extends KeyspaceOptionsSpecification<Cr
 		return with(KeyspaceOption.REPLICATION, builder.build());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOptionsSpecification#with(org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption)
-	 */
 	@Override
 	public CreateKeyspaceSpecification with(KeyspaceOption option) {
 		return super.with(option);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOptionsSpecification#with(org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption, java.lang.Object)
-	 */
 	@Override
 	public CreateKeyspaceSpecification with(KeyspaceOption option, Object value) {
 		return super.with(option, value);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOptionsSpecification#with(java.lang.String, java.lang.Object, boolean, boolean)
-	 */
 	@Override
 	public CreateKeyspaceSpecification with(String name, @Nullable Object value, boolean escape, boolean quote) {
 		return super.with(name, value, escape, quote);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -183,10 +170,6 @@ public class CreateKeyspaceSpecification extends KeyspaceOptionsSpecification<Cr
 		return ifNotExists == that.ifNotExists;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public int hashCode() {
 		int result = super.hashCode();

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java

@@ -80,28 +80,16 @@ public class CreateTableSpecification extends TableSpecification<CreateTableSpec
 		return this.ifNotExists;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.TableOptionsSpecification#with(org.springframework.data.cassandra.core.cql.keyspace.TableOption)
-	 */
 	@Override
 	public CreateTableSpecification with(TableOption option) {
 		return (CreateTableSpecification) super.with(option);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.TableOptionsSpecification#with(org.springframework.data.cassandra.core.cql.keyspace.TableOption, java.lang.Object)
-	 */
 	@Override
 	public CreateTableSpecification with(TableOption option, Object value) {
 		return (CreateTableSpecification) super.with(option, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.TableOptionsSpecification#with(java.lang.String, java.lang.Object, boolean, boolean)
-	 */
 	@Override
 	public CreateTableSpecification with(String name, @Nullable Object value, boolean escape, boolean quote) {
 		return (CreateTableSpecification) super.with(name, value, escape, quote);

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DataCenterReplication.java

@@ -57,10 +57,6 @@ public class DataCenterReplication {
 		return replicationFactor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "DataCenterReplication(dataCenter=" + this.getDataCenter() + ", replicationFactor="

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultOption.java

@@ -98,51 +98,30 @@ public class DefaultOption implements Option {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#getType()
-	 */
 	public Class<?> getType() {
 		return type;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#getName()
-	 */
 	public String getName() {
 		return name;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#takesValue()
-	 */
 	public boolean takesValue() {
 		return type != Void.class;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#requiresValue()
-	 */
 	public boolean requiresValue() {
 		return this.requiresValue;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#escapesValue()
-	 */
 	public boolean escapesValue() {
 		return this.escapesValue;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#quotesValue()
-	 */
 	public boolean quotesValue() {
 		return this.quotesValue;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.cql.keyspace.Option#checkValue(java.lang.Object)
-	 */
 	public void checkValue(@Nullable Object value) {
 		if (takesValue()) {
 			if (value == null) {
@@ -179,10 +158,6 @@ public class DefaultOption implements Option {
 		return string;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "[name=" + name + ", type=" + type.getName() + ", requiresValue=" + requiresValue + ", escapesValue="

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java

@@ -90,10 +90,6 @@ public class DropKeyspaceSpecification extends KeyspaceActionSpecification {
 		return ifExists;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -113,10 +109,6 @@ public class DropKeyspaceSpecification extends KeyspaceActionSpecification {
 		return ifExists == that.ifExists;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public int hashCode() {
 		int result = super.hashCode();

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java

@@ -72,10 +72,6 @@ public class FieldSpecification {
 		return cql.append(name.asCql(true)).append(" ").append(type.asCql(true, true));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return toCql(new StringBuilder()).toString();

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java

@@ -48,10 +48,6 @@ public abstract class KeyspaceActionSpecification {
 		return other instanceof KeyspaceActionSpecification;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -67,10 +63,6 @@ public abstract class KeyspaceActionSpecification {
 		return ObjectUtils.nullSafeEquals(name, that.name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(name);

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java

@@ -108,10 +108,6 @@ public abstract class KeyspaceOptionsSpecification<T extends KeyspaceOptionsSpec
 		return Collections.unmodifiableMap(options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -131,10 +127,6 @@ public abstract class KeyspaceOptionsSpecification<T extends KeyspaceOptionsSpec
 		return ObjectUtils.nullSafeEquals(options, that.options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public int hashCode() {
 		int result = super.hashCode();

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java

@@ -89,41 +89,26 @@ public class DefaultBridgedReactiveSession implements ReactiveSession {
 		this.session = session;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.ReactiveSession#getMetadata()
-	 */
 	@Override
 	public Metadata getMetadata() {
 		return this.session.getMetadata();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.ReactiveSession#getKeyspace()
-	 */
 	@Override
 	public Optional<CqlIdentifier> 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<ReactiveResultSet> 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<ReactiveResultSet> 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<ReactiveResultSet> execute(String query, Map<String, Object> 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<ReactiveResultSet> 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<PreparedStatement> 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<PreparedStatement> 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<Row> rows() {
 			return getRows(Mono.just(this.resultSet));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.cassandra.ReactiveResultSet#availableRows()
-		 */
 		@Override
 		public Flux<Row> 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<ExecutionInfo> getAllExecutionInfo() {
 			return Collections.singletonList(getExecutionInfo());

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;

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();