diff --git a/src/main/java/org/springframework/data/redis/FallbackExceptionTranslationStrategy.java b/src/main/java/org/springframework/data/redis/FallbackExceptionTranslationStrategy.java
index fbae06e65..e3d16f260 100644
--- a/src/main/java/org/springframework/data/redis/FallbackExceptionTranslationStrategy.java
+++ b/src/main/java/org/springframework/data/redis/FallbackExceptionTranslationStrategy.java
@@ -32,10 +32,6 @@ public class FallbackExceptionTranslationStrategy extends PassThroughExceptionTr
 		super(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.PassThroughExceptionTranslationStrategy#translate(java.lang.Exception)
-	 */
 	@Override
 	public DataAccessException translate(Exception e) {
 
diff --git a/src/main/java/org/springframework/data/redis/PassThroughExceptionTranslationStrategy.java b/src/main/java/org/springframework/data/redis/PassThroughExceptionTranslationStrategy.java
index c34d32fc8..9c2a95160 100644
--- a/src/main/java/org/springframework/data/redis/PassThroughExceptionTranslationStrategy.java
+++ b/src/main/java/org/springframework/data/redis/PassThroughExceptionTranslationStrategy.java
@@ -34,10 +34,6 @@ public class PassThroughExceptionTranslationStrategy implements ExceptionTransla
 		this.converter = converter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.ExceptionTranslationStrategy#translate(java.lang.Exception)
-	 */
 	@Nullable
 	@Override
 	public DataAccessException translate(Exception e) {
diff --git a/src/main/java/org/springframework/data/redis/cache/DefaultCacheStatisticsCollector.java b/src/main/java/org/springframework/data/redis/cache/DefaultCacheStatisticsCollector.java
index 2bfb9ead2..c7b919c67 100644
--- a/src/main/java/org/springframework/data/redis/cache/DefaultCacheStatisticsCollector.java
+++ b/src/main/java/org/springframework/data/redis/cache/DefaultCacheStatisticsCollector.java
@@ -29,73 +29,41 @@ class DefaultCacheStatisticsCollector implements CacheStatisticsCollector {
 
 	private final Map<String, MutableCacheStatistics> stats = new ConcurrentHashMap<>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incPuts(java.lang.String)
-	 */
 	@Override
 	public void incPuts(String cacheName) {
 		statsFor(cacheName).incPuts();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incGets(java.lang.String)
-	 */
 	@Override
 	public void incGets(String cacheName) {
 		statsFor(cacheName).incGets();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incHits(java.lang.String)
-	 */
 	@Override
 	public void incHits(String cacheName) {
 		statsFor(cacheName).incHits();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incMisses(java.lang.String)
-	 */
 	@Override
 	public void incMisses(String cacheName) {
 		statsFor(cacheName).incMisses();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incDeletesBy(java.lang.String, int)
-	 */
 	@Override
 	public void incDeletesBy(String cacheName, int value) {
 		statsFor(cacheName).incDeletes(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incLockTime(java.lang.String)
-	 */
 	@Override
 	public void incLockTime(String name, long durationNS) {
 		statsFor(name).incLockWaitTime(durationNS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.reset(java.lang.String)
-	 */
 	@Override
 	public void reset(String cacheName) {
 		statsFor(cacheName).reset();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.getCacheStatistics(java.lang.String)
-	 */
 	@Override
 	public CacheStatistics getCacheStatistics(String cacheName) {
 		return statsFor(cacheName).captureSnapshot();
diff --git a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
index 8afa0f8d7..53c2a2e4b 100644
--- a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
+++ b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
@@ -92,10 +92,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		this.batchStrategy = batchStrategy;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#put(java.lang.String, byte[], byte[], java.time.Duration)
-	 */
 	@Override
 	public void put(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
 
@@ -117,10 +113,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		statistics.incPuts(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#get(java.lang.String, byte[])
-	 */
 	@Override
 	public byte[] get(String name, byte[] key) {
 
@@ -140,10 +132,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#putIfAbsent(java.lang.String, byte[], byte[], java.time.Duration)
-	 */
 	@Override
 	public byte[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
 
@@ -182,10 +170,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#remove(java.lang.String, byte[])
-	 */
 	@Override
 	public void remove(String name, byte[] key) {
 
@@ -196,10 +180,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		statistics.incDeletes(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#clean(java.lang.String, byte[])
-	 */
 	@Override
 	public void clean(String name, byte[] pattern) {
 
@@ -235,28 +215,16 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsProvider#getCacheStatistics(java.lang.String)
-	 */
 	@Override
 	public CacheStatistics getCacheStatistics(String cacheName) {
 		return statistics.getCacheStatistics(cacheName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#clearStatistics(java.lang.String)
-	 */
 	@Override
 	public void clearStatistics(String name) {
 		statistics.reset(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.RedisCacheWriter#with(CacheStatisticsCollector)
-	 */
 	@Override
 	public RedisCacheWriter withStatisticsCollector(CacheStatisticsCollector cacheStatisticsCollector) {
 		return new DefaultRedisCacheWriter(connectionFactory, sleepTime, cacheStatisticsCollector, this.batchStrategy);
diff --git a/src/main/java/org/springframework/data/redis/cache/MutableCacheStatistics.java b/src/main/java/org/springframework/data/redis/cache/MutableCacheStatistics.java
index 62e7d1b7c..f137066a3 100644
--- a/src/main/java/org/springframework/data/redis/cache/MutableCacheStatistics.java
+++ b/src/main/java/org/springframework/data/redis/cache/MutableCacheStatistics.java
@@ -45,19 +45,11 @@ class MutableCacheStatistics implements CacheStatistics {
 		this.cacheName = cacheName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.data.redis.cache.CacheStatistics#getCacheName()
-	 */
 	@Override
 	public String getCacheName() {
 		return cacheName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getPuts()
-	 */
 	@Override
 	public long getPuts() {
 		return puts.sum();
@@ -67,10 +59,6 @@ class MutableCacheStatistics implements CacheStatistics {
 		puts.increment();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getRetrievals()
-	 */
 	@Override
 	public long getGets() {
 		return gets.sum();
@@ -80,10 +68,6 @@ class MutableCacheStatistics implements CacheStatistics {
 		gets.increment();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getHits()
-	 */
 	@Override
 	public long getHits() {
 		return hits.sum();
@@ -93,10 +77,6 @@ class MutableCacheStatistics implements CacheStatistics {
 		hits.increment();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getMisses()
-	 */
 	@Override
 	public long getMisses() {
 		return misses.sum();
@@ -106,10 +86,6 @@ class MutableCacheStatistics implements CacheStatistics {
 		misses.increment();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getRemovals()
-	 */
 	@Override
 	public long getDeletes() {
 		return deletes.sum();
@@ -122,10 +98,6 @@ class MutableCacheStatistics implements CacheStatistics {
 		deletes.add(x);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getLockWaitDuration(java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public long getLockWaitDuration(TimeUnit unit) {
 
@@ -134,19 +106,11 @@ class MutableCacheStatistics implements CacheStatistics {
 		return unit.convert(lockWaitTimeNs.sum(), TimeUnit.NANOSECONDS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getSince()
-	 */
 	@Override
 	public Instant getSince() {
 		return this.aliveSince;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatistics#getLastReset()
-	 */
 	@Override
 	public Instant getLastReset() {
 		return lastReset;
@@ -206,73 +170,41 @@ class MutableCacheStatistics implements CacheStatistics {
 			lastReset = Instant.from(statistics.getLastReset());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getCacheName()
-		 */
 		@Override
 		public String getCacheName() {
 			return cacheName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getPuts()
-		 */
 		@Override
 		public long getPuts() {
 			return puts;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getGets()
-		 */
 		@Override
 		public long getGets() {
 			return gets;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getHits()
-		 */
 		@Override
 		public long getHits() {
 			return hits;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getMisses()
-		 */
 		@Override
 		public long getMisses() {
 			return misses;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getPending()
-		 */
 		@Override
 		public long getPending() {
 			return pending;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getDeletes()
-		 */
 		@Override
 		public long getDeletes() {
 			return deletes;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getCacheName(java.util.concurrent.TimeUnit)
-		 */
 		@Override
 		public long getLockWaitDuration(TimeUnit unit) {
 
@@ -281,28 +213,16 @@ class MutableCacheStatistics implements CacheStatistics {
 			return unit.convert(lockWaitTimeNS, TimeUnit.NANOSECONDS);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getSince()
-		 */
 		@Override
 		public Instant getSince() {
 			return since;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getLastReset()
-		 */
 		@Override
 		public Instant getLastReset() {
 			return lastReset;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * org.springframework.data.redis.cache.CacheStatistics#getTime()
-		 */
 		@Override
 		public Instant getTime() {
 			return time;
diff --git a/src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java b/src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java
index 35434d5b8..cdb81504f 100644
--- a/src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java
+++ b/src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java
@@ -32,59 +32,27 @@ enum NoOpCacheStatisticsCollector implements CacheStatisticsCollector {
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incPuts(java.lang.String)
-	 */
 	@Override
 	public void incPuts(String cacheName) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incGets(java.lang.String)
-	 */
 	@Override
 	public void incGets(String cacheName) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incHits(java.lang.String)
-	 */
 	@Override
 	public void incHits(String cacheName) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incMisses(java.lang.String)
-	 */
 	@Override
 	public void incMisses(String cacheName) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incDeletesBy(java.lang.String)
-	 */
 	@Override
 	public void incDeletesBy(String cacheName, int value) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.incLockTime(java.lang.String)
-	 */
 	@Override
 	public void incLockTime(String name, long durationNS) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.reset(java.lang.String)
-	 */
 	@Override
 	public void reset(String cacheName) {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.cache.CacheStatisticsCollector.getCacheStatistics(java.lang.String)
-	 */
 	@Override
 	public CacheStatistics getCacheStatistics(String cacheName) {
 		return new EmptyStatistics(cacheName);
@@ -98,91 +66,51 @@ enum NoOpCacheStatisticsCollector implements CacheStatisticsCollector {
 			this.cacheName = cacheName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getCacheName()
-		 */
 		@Override
 		public String getCacheName() {
 			return cacheName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getPuts()
-		 */
 		@Override
 		public long getPuts() {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getGets()
-		 */
 		@Override
 		public long getGets() {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getHits()
-		 */
 		@Override
 		public long getHits() {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getMisses()
-		 */
 		@Override
 		public long getMisses() {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getDeletes()
-		 */
 		@Override
 		public long getDeletes() {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getLockWaitDuration(java.util.concurrent.TimeUnit)
-		 */
 		@Override
 		public long getLockWaitDuration(TimeUnit unit) {
 			return 0;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getSince()
-		 */
 		@Override
 		public Instant getSince() {
 			return Instant.EPOCH;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.cache.CacheStatistics#getLastReset()
-		 */
 		@Override
 		public Instant getLastReset() {
 			return getSince();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -197,10 +125,6 @@ enum NoOpCacheStatisticsCollector implements CacheStatisticsCollector {
 			return ObjectUtils.nullSafeEquals(cacheName, that.cacheName);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return ObjectUtils.nullSafeHashCode(cacheName);
diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCache.java b/src/main/java/org/springframework/data/redis/cache/RedisCache.java
index 355b744ee..df3ac56c1 100644
--- a/src/main/java/org/springframework/data/redis/cache/RedisCache.java
+++ b/src/main/java/org/springframework/data/redis/cache/RedisCache.java
@@ -79,10 +79,6 @@ public class RedisCache extends AbstractValueAdaptingCache {
 		this.conversionService = cacheConfig.getConversionService();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.support.AbstractValueAdaptingCache#lookup(java.lang.Object)
-	 */
 	@Override
 	protected Object lookup(Object key) {
 
@@ -95,28 +91,16 @@ public class RedisCache extends AbstractValueAdaptingCache {
 		return deserializeCacheValue(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#getName()
-	 */
 	@Override
 	public String getName() {
 		return name;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#getNativeCache()
-	 */
 	@Override
 	public RedisCacheWriter getNativeCache() {
 		return this.cacheWriter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#get(java.lang.Object, java.util.concurrent.Callable)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T get(Object key, Callable<T> valueLoader) {
@@ -149,10 +133,6 @@ public class RedisCache extends AbstractValueAdaptingCache {
 		return value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#put(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void put(Object key, @Nullable Object value) {
 
@@ -168,10 +148,6 @@ public class RedisCache extends AbstractValueAdaptingCache {
 		cacheWriter.put(name, createAndConvertCacheKey(key), serializeCacheValue(cacheValue), cacheConfig.getTtl());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#putIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
 
@@ -191,19 +167,11 @@ public class RedisCache extends AbstractValueAdaptingCache {
 		return new SimpleValueWrapper(fromStoreValue(deserializeCacheValue(result)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#evict(java.lang.Object)
-	 */
 	@Override
 	public void evict(Object key) {
 		cacheWriter.remove(name, createAndConvertCacheKey(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.Cache#clear()
-	 */
 	@Override
 	public void clear() {
 
diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java
index 0531b514b..7441c7da7 100644
--- a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java
+++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java
@@ -228,10 +228,6 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager
 		return RedisCacheManagerBuilder.fromCacheWriter(cacheWriter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.support.AbstractCacheManager#loadCaches()
-	 */
 	@Override
 	protected Collection<RedisCache> loadCaches() {
 
@@ -244,10 +240,6 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager
 		return caches;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.cache.support.AbstractCacheManager#getMissingCache(java.lang.String)
-	 */
 	@Override
 	protected RedisCache getMissingCache(String name) {
 		return allowInFlightCacheCreation ? createRedisCache(name, defaultCacheConfig) : null;
diff --git a/src/main/java/org/springframework/data/redis/connection/AbstractRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/AbstractRedisConnection.java
index c54bbd647..a1591764e 100644
--- a/src/main/java/org/springframework/data/redis/connection/AbstractRedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/AbstractRedisConnection.java
@@ -36,10 +36,6 @@ public abstract class AbstractRedisConnection implements DefaultedRedisConnectio
 	private @Nullable RedisSentinelConfiguration sentinelConfiguration;
 	private final Map<RedisNode, RedisSentinelConnection> connectionCache = new ConcurrentHashMap<>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getSentinelCommands()
-	 */
 	@Override
 	public RedisSentinelConnection getSentinelConnection() {
 
@@ -97,10 +93,6 @@ public abstract class AbstractRedisConnection implements DefaultedRedisConnectio
 		throw new UnsupportedOperationException("Sentinel is not supported by this client.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#close()
-	 */
 	@Override
 	public void close() throws DataAccessException {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java b/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java
index 93b4c02ef..8b76ca81a 100644
--- a/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java
@@ -141,19 +141,11 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 		return subCommands;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<BitFieldSubCommand> iterator() {
 		return subCommands.iterator();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -166,19 +158,11 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 		return ObjectUtils.nullSafeEquals(subCommands, that.subCommands);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(subCommands);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		final StringBuffer sb = new StringBuffer();
@@ -442,19 +426,11 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return (isZeroBased() ? "" : "#") + getValue();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return asString();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -471,10 +447,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return zeroBased == that.zeroBased;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			int result = (int) (offset ^ (offset >>> 32));
@@ -571,10 +543,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return (isSigned() ? "i" : "u") + getBits();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -591,10 +559,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return bits == that.bits;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			int result = (signed ? 1 : 0);
@@ -602,10 +566,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return result;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return asString();
@@ -621,28 +581,16 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 		BitFieldType type;
 		Offset offset;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.StringRedisConnection.BitFieldSubCommand#getType()
-		 */
 		@Override
 		public BitFieldType getType() {
 			return type;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.StringRedisConnection.BitFieldSubCommand#getOffset()
-		 */
 		@Override
 		public Offset getOffset() {
 			return offset;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -662,10 +610,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return ObjectUtils.nullSafeEquals(offset, that.offset);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 
@@ -674,10 +618,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return result;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			StringBuffer sb = new StringBuffer();
@@ -721,10 +661,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return instance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.StringRedisConnection.BitFieldSubCommand#getCommand()
-		 */
 		@Override
 		public String getCommand() {
 			return "SET";
@@ -739,10 +675,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return value;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -761,10 +693,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return true;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			int result = super.hashCode();
@@ -772,10 +700,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return result;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			StringBuffer sb = new StringBuffer();
@@ -816,10 +740,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return instance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.StringRedisConnection.BitFieldSubCommand#getCommand()
-		 */
 		@Override
 		public String getCommand() {
 			return "GET";
@@ -875,10 +795,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return instance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.StringRedisConnection.BitFieldSubCommand#getCommand()
-		 */
 		@Override
 		public String getCommand() {
 			return "INCRBY";
@@ -910,10 +826,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			SAT, FAIL, WRAP
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -930,10 +842,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return overflow == that.overflow;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 
@@ -942,10 +850,6 @@ public class BitFieldSubCommands implements Iterable<BitFieldSubCommand> {
 			return result;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			StringBuffer sb = new StringBuffer();
diff --git a/src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java b/src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java
index 476b29ad2..2ad2a5924 100644
--- a/src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java
+++ b/src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java
@@ -341,10 +341,6 @@ public class ClusterCommandExecutor implements DisposableBean {
 		this.maxRedirects = maxRedirects;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() throws Exception {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/ClusterInfo.java b/src/main/java/org/springframework/data/redis/connection/ClusterInfo.java
index 12b9a08c3..2bf7ca274 100644
--- a/src/main/java/org/springframework/data/redis/connection/ClusterInfo.java
+++ b/src/main/java/org/springframework/data/redis/connection/ClusterInfo.java
@@ -175,10 +175,6 @@ public class ClusterInfo {
 		return value == null ? null : Long.valueOf(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return this.clusterProperties.toString();
diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java
index 7feebc50a..bf76dc58a 100644
--- a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java
@@ -180,28 +180,16 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		this.byteGeoResultsToStringGeoResults = Converters.deserializingGeoResultsConverter(serializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#append(byte[], byte[])
-	 */
 	@Override
 	public Long append(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.append(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgSave()
-	 */
 	@Override
 	public void bgSave() {
 		delegate.bgSave();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgReWriteAof()
-	 */
 	@Override
 	public void bgReWriteAof() {
 		delegate.bgReWriteAof();
@@ -215,100 +203,56 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		bgReWriteAof();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bLPop(int timeout, byte[]... keys) {
 		return convertAndReturn(delegate.bLPop(timeout, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bRPop(int timeout, byte[]... keys) {
 		return convertAndReturn(delegate.bRPop(timeout, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPopLPush(int, byte[], byte[])
-	 */
 	@Override
 	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
 		return convertAndReturn(delegate.bRPopLPush(timeout, srcKey, dstKey), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#close()
-	 */
 	@Override
 	public void close() throws RedisSystemException {
 		delegate.close();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#copy(byte[], byte[], boolean)
-	 */
 	@Override
 	public Boolean copy(byte[] sourceKey, byte[] targetKey, boolean replace) {
 		return convertAndReturn(delegate.copy(sourceKey, targetKey, replace), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#dbSize()
-	 */
 	@Override
 	public Long dbSize() {
 		return convertAndReturn(delegate.dbSize(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decr(byte[])
-	 */
 	@Override
 	public Long decr(byte[] key) {
 		return convertAndReturn(delegate.decr(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decrBy(byte[], long)
-	 */
 	@Override
 	public Long decrBy(byte[] key, long value) {
 		return convertAndReturn(delegate.decrBy(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#del(byte[][])
-	 */
 	@Override
 	public Long del(byte[]... keys) {
 		return convertAndReturn(delegate.del(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#unlink(byte[][])
-	 */
 	@Override
 	public Long unlink(byte[]... keys) {
 		return convertAndReturn(delegate.unlink(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#discard()
-	 */
 	@Override
 	public void discard() {
 		try {
@@ -318,19 +262,11 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#echo(byte[])
-	 */
 	@Override
 	public byte[] echo(byte[] message) {
 		return convertAndReturn(delegate.echo(message), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#exec()
-	 */
 	@Override
 	@SuppressWarnings("rawtypes")
 	public List<Object> exec() {
@@ -347,1221 +283,685 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[])
-	 */
 	@Override
 	public Boolean exists(byte[] key) {
 		return convertAndReturn(delegate.exists(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#exists(String[])
-	 */
 	@Override
 	public Long exists(String... keys) {
 		return convertAndReturn(delegate.exists(serializeMulti(keys)), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[][])
-	 */
 	@Override
 	public Long exists(byte[]... keys) {
 		return convertAndReturn(delegate.exists(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expire(byte[], long)
-	 */
 	@Override
 	public Boolean expire(byte[] key, long seconds) {
 		return convertAndReturn(delegate.expire(key, seconds), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expireAt(byte[], long)
-	 */
 	@Override
 	public Boolean expireAt(byte[] key, long unixTime) {
 		return convertAndReturn(delegate.expireAt(key, unixTime), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushAll()
-	 */
 	@Override
 	public void flushAll() {
 		delegate.flushAll();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushDb()
-	 */
 	@Override
 	public void flushDb() {
 		delegate.flushDb();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[])
-	 */
 	@Override
 	public byte[] get(byte[] key) {
 		return convertAndReturn(delegate.get(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getDel(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] getDel(byte[] key) {
 		return convertAndReturn(delegate.getDel(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getDel(byte[])
-	 */
 	@Nullable
 	@Override
 	public String getDel(String key) {
 		return convertAndReturn(delegate.getDel(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[], org.springframework.data.redis.core.types.Expiration)
-	 */
 	@Nullable
 	@Override
 	public byte[] getEx(byte[] key, Expiration expiration) {
 		return convertAndReturn(delegate.getEx(key, expiration), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[], org.springframework.data.redis.core.types.Expiration)
-	 */
 	@Nullable
 	@Override
 	public String getEx(String key, Expiration expiration) {
 		return convertAndReturn(delegate.getEx(serialize(key), expiration), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getBit(byte[], long)
-	 */
 	@Override
 	public Boolean getBit(byte[] key, long offset) {
 		return convertAndReturn(delegate.getBit(key, offset), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(String pattern) {
 		return convertAndReturn(delegate.getConfig(pattern), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getNativeConnection()
-	 */
 	@Override
 	public Object getNativeConnection() {
 		return convertAndReturn(delegate.getNativeConnection(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getRange(byte[], long, long)
-	 */
 	@Override
 	public byte[] getRange(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.getRange(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getSet(byte[], byte[])
-	 */
 	@Override
 	public byte[] getSet(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.getSet(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#getSubscription()
-	 */
 	@Override
 	public Subscription getSubscription() {
 		return delegate.getSubscription();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hDel(byte[], byte[][])
-	 */
 	@Override
 	public Long hDel(byte[] key, byte[]... fields) {
 		return convertAndReturn(delegate.hDel(key, fields), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hExists(byte[], byte[])
-	 */
 	@Override
 	public Boolean hExists(byte[] key, byte[] field) {
 		return convertAndReturn(delegate.hExists(key, field), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGet(byte[], byte[])
-	 */
 	@Override
 	public byte[] hGet(byte[] key, byte[] field) {
 		return convertAndReturn(delegate.hGet(key, field), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGetAll(byte[])
-	 */
 	@Override
 	public Map<byte[], byte[]> hGetAll(byte[] key) {
 		return convertAndReturn(delegate.hGetAll(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], long)
-	 */
 	@Override
 	public Long hIncrBy(byte[] key, byte[] field, long delta) {
 		return convertAndReturn(delegate.hIncrBy(key, field, delta), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], double)
-	 */
 	@Override
 	public Double hIncrBy(byte[] key, byte[] field, double delta) {
 		return convertAndReturn(delegate.hIncrBy(key, field, delta), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hKeys(byte[])
-	 */
 	@Override
 	public Set<byte[]> hKeys(byte[] key) {
 		return convertAndReturn(delegate.hKeys(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hLen(byte[])
-	 */
 	@Override
 	public Long hLen(byte[] key) {
 		return convertAndReturn(delegate.hLen(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMGet(byte[], byte[][])
-	 */
 	@Override
 	public List<byte[]> hMGet(byte[] key, byte[]... fields) {
 		return convertAndReturn(delegate.hMGet(key, fields), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMSet(byte[], java.util.Map)
-	 */
 	@Override
 	public void hMSet(byte[] key, Map<byte[], byte[]> hashes) {
 		delegate.hMSet(key, hashes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSet(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSet(byte[] key, byte[] field, byte[] value) {
 		return convertAndReturn(delegate.hSet(key, field, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSetNX(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSetNX(byte[] key, byte[] field, byte[] value) {
 		return convertAndReturn(delegate.hSetNX(key, field, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hVals(byte[])
-	 */
 	@Override
 	public List<byte[]> hVals(byte[] key) {
 		return convertAndReturn(delegate.hVals(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incr(byte[])
-	 */
 	@Override
 	public Long incr(byte[] key) {
 		return convertAndReturn(delegate.incr(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], long)
-	 */
 	@Override
 	public Long incrBy(byte[] key, long value) {
 
 		return convertAndReturn(delegate.incrBy(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], double)
-	 */
 	@Override
 	public Double incrBy(byte[] key, double value) {
 		return convertAndReturn(delegate.incrBy(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info()
-	 */
 	@Override
 	public Properties info() {
 		return convertAndReturn(delegate.info(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Properties info(String section) {
 		return convertAndReturn(delegate.info(section), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return delegate.isClosed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isQueueing()
-	 */
 	@Override
 	public boolean isQueueing() {
 		return delegate.isQueueing();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#isSubscribed()
-	 */
 	@Override
 	public boolean isSubscribed() {
 		return delegate.isSubscribed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#keys(byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(byte[] pattern) {
 		return convertAndReturn(delegate.keys(pattern), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#lastSave()
-	 */
 	@Override
 	public Long lastSave() {
 		return convertAndReturn(delegate.lastSave(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lIndex(byte[], long)
-	 */
 	@Override
 	public byte[] lIndex(byte[] key, long index) {
 		return convertAndReturn(delegate.lIndex(key, index), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lInsert(byte[], org.springframework.data.redis.connection.RedisListCommands.Position, byte[], byte[])
-	 */
 	@Override
 	public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) {
 		return convertAndReturn(delegate.lInsert(key, where, pivot, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public byte[] lMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to) {
 		return convertAndReturn(delegate.lMove(sourceKey, destinationKey, from, to), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction, double)
-	 */
 	@Override
 	public byte[] bLMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to, double timeout) {
 		return convertAndReturn(delegate.bLMove(sourceKey, destinationKey, from, to, timeout),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lMove(java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public String lMove(String sourceKey, String destinationKey, Direction from, Direction to) {
 		return convertAndReturn(delegate.lMove(serialize(sourceKey), serialize(destinationKey), from, to), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bLMove(java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction, double)
-	 */
 	@Override
 	public String bLMove(String sourceKey, String destinationKey, Direction from, Direction to, double timeout) {
 		return convertAndReturn(delegate.bLMove(serialize(sourceKey), serialize(destinationKey), from, to, timeout),
 				bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lLen(byte[])
-	 */
 	@Override
 	public Long lLen(byte[] key) {
 		return convertAndReturn(delegate.lLen(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[])
-	 */
 	@Override
 	public byte[] lPop(byte[] key) {
 		return convertAndReturn(delegate.lPop(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> lPop(byte[] key, long count) {
 		return convertAndReturn(delegate.lPop(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPos(byte[], byte[], java.lang.Integer, java.lang.Integer)
-	 */
 	@Override
 	public List<Long> lPos(byte[] key, byte[] element, @Nullable Integer rank, @Nullable Integer count) {
 		return convertAndReturn(delegate.lPos(key, element, rank, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPush(byte[], byte[][])
-	 */
 	@Override
 	public Long lPush(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.lPush(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPushX(byte[], byte[])
-	 */
 	@Override
 	public Long lPushX(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.lPushX(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRange(byte[], long, long)
-	 */
 	@Override
 	public List<byte[]> lRange(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.lRange(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRem(byte[], long, byte[])
-	 */
 	@Override
 	public Long lRem(byte[] key, long count, byte[] value) {
 
 		return convertAndReturn(delegate.lRem(key, count, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lSet(byte[], long, byte[])
-	 */
 	@Override
 	public void lSet(byte[] key, long index, byte[] value) {
 		delegate.lSet(key, index, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lTrim(byte[], long, long)
-	 */
 	@Override
 	public void lTrim(byte[] key, long start, long end) {
 		delegate.lTrim(key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mGet(byte[][])
-	 */
 	@Override
 	public List<byte[]> mGet(byte[]... keys) {
 		return convertAndReturn(delegate.mGet(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSet(java.util.Map)
-	 */
 	@Override
 	public Boolean mSet(Map<byte[], byte[]> tuple) {
 		return convertAndReturn(delegate.mSet(tuple), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSetNX(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNX(Map<byte[], byte[]> tuple) {
 		return convertAndReturn(delegate.mSetNX(tuple), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#multi()
-	 */
 	@Override
 	public void multi() {
 		delegate.multi();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#persist(byte[])
-	 */
 	@Override
 	public Boolean persist(byte[] key) {
 		return convertAndReturn(delegate.persist(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#move(byte[], int)
-	 */
 	@Override
 	public Boolean move(byte[] key, int dbIndex) {
 		return convertAndReturn(delegate.move(key, dbIndex), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#ping()
-	 */
 	@Override
 	public String ping() {
 		return convertAndReturn(delegate.ping(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#pSubscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void pSubscribe(MessageListener listener, byte[]... patterns) {
 		delegate.pSubscribe(listener, patterns);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#publish(byte[], byte[])
-	 */
 	@Override
 	public Long publish(byte[] channel, byte[] message) {
 		return convertAndReturn(delegate.publish(channel, message), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#randomKey()
-	 */
 	@Override
 	public byte[] randomKey() {
 		return convertAndReturn(delegate.randomKey(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#rename(byte[], byte[])
-	 */
 	@Override
 	public void rename(byte[] oldKey, byte[] newKey) {
 		delegate.rename(oldKey, newKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#renameNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean renameNX(byte[] oldKey, byte[] newKey) {
 		return convertAndReturn(delegate.renameNX(oldKey, newKey), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void resetConfigStats() {
 		delegate.resetConfigStats();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#rewriteConfig()
-	 */
 	@Override
 	public void rewriteConfig() {
 		delegate.rewriteConfig();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[])
-	 */
 	@Override
 	public byte[] rPop(byte[] key) {
 		return convertAndReturn(delegate.rPop(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> rPop(byte[] key, long count) {
 		return convertAndReturn(delegate.rPop(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPopLPush(byte[], byte[])
-	 */
 	@Override
 	public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 		return convertAndReturn(delegate.rPopLPush(srcKey, dstKey), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPush(byte[], byte[][])
-	 */
 	@Override
 	public Long rPush(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.rPush(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPushX(byte[], byte[])
-	 */
 	@Override
 	public Long rPushX(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.rPushX(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long sAdd(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.sAdd(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#save()
-	 */
 	@Override
 	public void save() {
 		delegate.save();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sCard(byte[])
-	 */
 	@Override
 	public Long sCard(byte[] key) {
 		return convertAndReturn(delegate.sCard(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sDiff(byte[]... keys) {
 		return convertAndReturn(delegate.sDiff(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sDiffStore(byte[] destKey, byte[]... keys) {
 		return convertAndReturn(delegate.sDiffStore(destKey, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#select(int)
-	 */
 	@Override
 	public void select(int dbIndex) {
 		delegate.select(dbIndex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[])
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.set(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[], org.springframework.data.redis.core.types.Expiration, org.springframework.data.redis.connection.RedisStringCommands.SetOptions)
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value, Expiration expiration, SetOption option) {
 		return convertAndReturn(delegate.set(key, value, expiration, option), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setBit(byte[], long, boolean)
-	 */
 	@Override
 	public Boolean setBit(byte[] key, long offset, boolean value) {
 		return convertAndReturn(delegate.setBit(key, offset, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(String param, String value) {
 		delegate.setConfig(param, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean setEx(byte[] key, long seconds, byte[] value) {
 		return convertAndReturn(delegate.setEx(key, seconds, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#pSetEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean pSetEx(byte[] key, long milliseconds, byte[] value) {
 		return convertAndReturn(delegate.pSetEx(key, milliseconds, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean setNX(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.setNX(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setRange(byte[], byte[], long)
-	 */
 	@Override
 	public void setRange(byte[] key, byte[] value, long start) {
 		delegate.setRange(key, value, start);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown()
-	 */
 	@Override
 	public void shutdown() {
 		delegate.shutdown();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown(org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption)
-	 */
 	@Override
 	public void shutdown(ShutdownOption option) {
 		delegate.shutdown(option);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sInter(byte[]... keys) {
 		return convertAndReturn(delegate.sInter(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sInterStore(byte[] destKey, byte[]... keys) {
 		return convertAndReturn(delegate.sInterStore(destKey, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sIsMember(byte[], byte[])
-	 */
 	@Override
 	public Boolean sIsMember(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.sIsMember(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sIsMember(byte[], byte[]...)
-	 */
 	@Override
 	public List<Boolean> sMIsMember(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.sMIsMember(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMembers(byte[])
-	 */
 	@Override
 	public Set<byte[]> sMembers(byte[] key) {
 		return convertAndReturn(delegate.sMembers(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMove(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) {
 		return convertAndReturn(delegate.sMove(srcKey, destKey, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters, byte[])
-	 */
 	@Override
 	public Long sort(byte[] key, SortParameters params, byte[] storeKey) {
 		return convertAndReturn(delegate.sort(key, params, storeKey), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters)
-	 */
 	@Override
 	public List<byte[]> sort(byte[] key, SortParameters params) {
 		return convertAndReturn(delegate.sort(key, params), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#encoding(byte[])
-	 */
 	@Override
 	public ValueEncoding encodingOf(byte[] key) {
 		return convertAndReturn(delegate.encodingOf(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#idletime(byte[])
-	 */
 	@Override
 	public Duration idletime(byte[] key) {
 		return convertAndReturn(delegate.idletime(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#refcount(byte[])
-	 */
 	@Override
 	public Long refcount(byte[] key) {
 		return convertAndReturn(delegate.refcount(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[])
-	 */
 	@Override
 	public byte[] sPop(byte[] key) {
 		return convertAndReturn(delegate.sPop(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sPop(byte[] key, long count) {
 		return convertAndReturn(delegate.sPop(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[])
-	 */
 	@Override
 	public byte[] sRandMember(byte[] key) {
 		return convertAndReturn(delegate.sRandMember(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sRandMember(byte[] key, long count) {
 		return convertAndReturn(delegate.sRandMember(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRem(byte[], byte[][])
-	 */
 	@Override
 	public Long sRem(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.sRem(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#strLen(byte[])
-	 */
 	@Override
 	public Long strLen(byte[] key) {
 		return convertAndReturn(delegate.strLen(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[])
-	 */
 	@Override
 	public Long bitCount(byte[] key) {
 		return convertAndReturn(delegate.bitCount(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[], long, long)
-	 */
 	@Override
 	public Long bitCount(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.bitCount(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitOp(org.springframework.data.redis.connection.RedisStringCommands.BitOperation, byte[], byte[][])
-	 */
 	@Override
 	public Long bitOp(BitOperation op, byte[] destination, byte[]... keys) {
 		return convertAndReturn(delegate.bitOp(op, destination, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitPos(byte[], boolean, org.springframework.data.domain.Range)
-	 */
 	@Nullable
 	@Override
 	public Long bitPos(byte[] key, boolean bit, org.springframework.data.domain.Range<Long> range) {
 		return convertAndReturn(delegate.bitPos(key, bit, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#subscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void subscribe(MessageListener listener, byte[]... channels) {
 		delegate.subscribe(listener, channels);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sUnion(byte[]... keys) {
 		return convertAndReturn(delegate.sUnion(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sUnionStore(byte[] destKey, byte[]... keys) {
 		return convertAndReturn(delegate.sUnionStore(destKey, keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[])
-	 */
 	@Override
 	public Long ttl(byte[] key) {
 		return convertAndReturn(delegate.ttl(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long ttl(byte[] key, TimeUnit timeUnit) {
 		return convertAndReturn(delegate.ttl(key, timeUnit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#type(byte[])
-	 */
 	@Override
 	public DataType type(byte[] key) {
 		return convertAndReturn(delegate.type(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#touch(byte[][])
-	 */
 	@Override
 	public Long touch(byte[]... keys) {
 		return convertAndReturn(delegate.touch(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#unwatch()
-	 */
 	@Override
 	public void unwatch() {
 		delegate.unwatch();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#watch(byte[][])
-	 */
 	@Override
 	public void watch(byte[]... keys) {
 		delegate.watch(keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], double, byte[], org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Boolean zAdd(byte[] key, double score, byte[] value, ZAddArgs args) {
 		return convertAndReturn(delegate.zAdd(key, score, value, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], java.util.Set, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Long zAdd(byte[] key, Set<Tuple> tuples, ZAddArgs args) {
 		return convertAndReturn(delegate.zAdd(key, tuples, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCard(byte[])
-	 */
 	@Override
 	public Long zCard(byte[] key) {
 		return convertAndReturn(delegate.zCard(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], double, double)
-	 */
 	@Override
 	public Long zCount(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zCount(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zCount(byte[] key, Range range) {
 		return convertAndReturn(delegate.zCount(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zIncrBy(byte[], double, byte[])
-	 */
 	@Override
 	public Double zIncrBy(byte[] key, double increment, byte[] value) {
 		return convertAndReturn(delegate.zIncrBy(key, increment, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiff(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<byte[]> zDiff(byte[]... sets) {
 		return convertAndReturn(delegate.zDiff(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffWithScores(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zDiffWithScores(byte[]... sets) {
 		return convertAndReturn(delegate.zDiffWithScores(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffStore(byte[], byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long zDiffStore(byte[] destKey, byte[]... sets) {
 		return convertAndReturn(delegate.zDiffStore(destKey, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zDiff(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<String> zDiff(String... sets) {
 		return convertAndReturn(delegate.zDiff(serializeMulti(sets)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zDiffWithScores(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zDiffWithScores(String... sets) {
 		return convertAndReturn(delegate.zDiffWithScores(serializeMulti(sets)), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zDiffStore(java.lang.String, java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Long zDiffStore(String destKey, String... sets) {
@@ -1569,546 +969,310 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInter(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<byte[]> zInter(byte[]... sets) {
 		return convertAndReturn(delegate.zInter(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zInterWithScores(byte[]... sets) {
 		return convertAndReturn(delegate.zInterWithScores(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zInterWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 		return convertAndReturn(delegate.zInterWithScores(aggregate, weights, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zInter(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<String> zInter(String... sets) {
 		return convertAndReturn(delegate.zInter(serializeMulti(sets)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zInterWithScores(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zInterWithScores(String... sets) {
 		return convertAndReturn(delegate.zInterWithScores(serializeMulti(sets)), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zInterWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zInterWithScores(Aggregate aggregate, Weights weights, String... sets) {
 		return convertAndReturn(delegate.zInterWithScores(aggregate, weights, serializeMulti(sets)), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 		return convertAndReturn(delegate.zInterStore(destKey, aggregate, weights, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, byte[]... sets) {
 		return convertAndReturn(delegate.zInterStore(destKey, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRange(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.zRange(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScore(key, min, max, offset, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRangeByScore(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRangeByScore(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zRangeByScore(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(key, min, max, offset, count),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], double, double)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeWithScores(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.zRangeWithScores(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRevRangeByScore(key, min, max, offset, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRevRangeByScore(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zRevRangeByScore(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRevRangeByScore(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(key, min, max, offset, count),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], double, double)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRank(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.zRank(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRem(byte[], byte[][])
-	 */
 	@Override
 	public Long zRem(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.zRem(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRange(byte[], long, long)
-	 */
 	@Override
 	public Long zRemRange(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.zRemRange(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByLex(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRemRangeByLex(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, double min, double max) {
 		return convertAndReturn(delegate.zRemRangeByScore(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRemRangeByScore(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRange(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.zRevRange(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeWithScores(byte[] key, long start, long end) {
 		return convertAndReturn(delegate.zRevRangeWithScores(key, start, end), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRevRank(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.zRevRank(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScore(byte[], byte[])
-	 */
 	@Override
 	public Double zScore(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.zScore(key, value), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zMScore(byte[], byte[][])
-	 */
 	@Override
 	public List<Double> zMScore(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.zMScore(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnion(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<byte[]> zUnion(byte[]... sets) {
 		return convertAndReturn(delegate.zUnion(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zUnionWithScores(byte[]... sets) {
 		return convertAndReturn(delegate.zUnionWithScores(sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zUnionWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 		return convertAndReturn(delegate.zUnionWithScores(aggregate, weights, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zUnion(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<String> zUnion(String... sets) {
 		return convertAndReturn(delegate.zUnion(serializeMulti(sets)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zUnionWithScores(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zUnionWithScores(String... sets) {
 		return convertAndReturn(delegate.zUnionWithScores(serializeMulti(sets)), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zUnionWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zUnionWithScores(Aggregate aggregate, Weights weights, String... sets) {
 		return convertAndReturn(delegate.zUnionWithScores(aggregate, weights, serializeMulti(sets)), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 		return convertAndReturn(delegate.zUnionStore(destKey, aggregate, weights, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], byte[][])
-	 */
 	public Long zUnionStore(byte[] destKey, byte[]... sets) {
 		return convertAndReturn(delegate.zUnionStore(destKey, sets), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zLexCount(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zLexCount(String key, Range range) {
 		return delegate.zLexCount(serialize(key), range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpire(byte[], long)
-	 */
 	@Override
 	public Boolean pExpire(byte[] key, long millis) {
 		return convertAndReturn(delegate.pExpire(key, millis), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpireAt(byte[], long)
-	 */
 	@Override
 	public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {
 		return convertAndReturn(delegate.pExpireAt(key, unixTimeInMillis), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[])
-	 */
 	@Override
 	public Long pTtl(byte[] key) {
 		return convertAndReturn(delegate.pTtl(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long pTtl(byte[] key, TimeUnit timeUnit) {
 		return convertAndReturn(delegate.pTtl(key, timeUnit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#dump(byte[])
-	 */
 	@Override
 	public byte[] dump(byte[] key) {
 		return convertAndReturn(delegate.dump(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#restore(byte[], long, byte[], boolean)
-	 */
 	@Override
 	public void restore(byte[] key, long ttlInMillis, byte[] serializedValue, boolean replace) {
 		delegate.restore(key, ttlInMillis, serializedValue, replace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptFlush()
-	 */
 	@Override
 	public void scriptFlush() {
 		delegate.scriptFlush();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptKill()
-	 */
 	@Override
 	public void scriptKill() {
 		delegate.scriptKill();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptLoad(byte[])
-	 */
 	@Override
 	public String scriptLoad(byte[] script) {
 		return convertAndReturn(delegate.scriptLoad(script), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptExists(java.lang.String[])
-	 */
 	@Override
 	public List<Boolean> scriptExists(String... scriptSha1) {
 		return convertAndReturn(delegate.scriptExists(scriptSha1), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#eval(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T eval(byte[] script, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 		return convertAndReturn(delegate.eval(script, returnType, numKeys, keysAndArgs), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(java.lang.String, org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(String scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 		return convertAndReturn(delegate.evalSha(scriptSha1, returnType, numKeys, keysAndArgs),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(byte[] scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 		return convertAndReturn(delegate.evalSha(scriptSha1, returnType, numKeys, keysAndArgs),
@@ -2163,267 +1327,151 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return ret;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#append(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long append(String key, String value) {
 		return append(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bLPop(int, java.lang.String[])
-	 */
 	@Override
 	public List<String> bLPop(int timeout, String... keys) {
 		return convertAndReturn(delegate.bLPop(timeout, serializeMulti(keys)), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bRPop(int, java.lang.String[])
-	 */
 	@Override
 	public List<String> bRPop(int timeout, String... keys) {
 		return convertAndReturn(delegate.bRPop(timeout, serializeMulti(keys)), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bRPopLPush(int, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public String bRPopLPush(int timeout, String srcKey, String dstKey) {
 		return convertAndReturn(delegate.bRPopLPush(timeout, serialize(srcKey), serialize(dstKey)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#copy(java.lang.String, java.lang.String, boolean)
-	 */
 	@Override
 	public Boolean copy(String sourceKey, String targetKey, boolean replace) {
 		return copy(serialize(sourceKey), serialize(targetKey), replace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#decr(java.lang.String)
-	 */
 	@Override
 	public Long decr(String key) {
 		return decr(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#decrBy(java.lang.String, long)
-	 */
 	@Override
 	public Long decrBy(String key, long value) {
 		return decrBy(serialize(key), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#del(java.lang.String[])
-	 */
 	@Override
 	public Long del(String... keys) {
 		return del(serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#unlink(java.lang.String[])
-	 */
 	@Override
 	public Long unlink(String... keys) {
 		return unlink(serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#echo(java.lang.String)
-	 */
 	@Override
 	public String echo(String message) {
 		return convertAndReturn(delegate.echo(serialize(message)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#exists(java.lang.String)
-	 */
 	@Override
 	public Boolean exists(String key) {
 		return exists(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#expire(java.lang.String, long)
-	 */
 	@Override
 	public Boolean expire(String key, long seconds) {
 		return expire(serialize(key), seconds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#expireAt(java.lang.String, long)
-	 */
 	@Override
 	public Boolean expireAt(String key, long unixTime) {
 		return expireAt(serialize(key), unixTime);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#get(java.lang.String)
-	 */
 	@Override
 	public String get(String key) {
 		return convertAndReturn(delegate.get(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#getBit(java.lang.String, long)
-	 */
 	@Override
 	public Boolean getBit(String key, long offset) {
 		return getBit(serialize(key), offset);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#getRange(java.lang.String, long, long)
-	 */
 	@Override
 	public String getRange(String key, long start, long end) {
 		return convertAndReturn(delegate.getRange(serialize(key), start, end), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#getSet(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public String getSet(String key, String value) {
 		return convertAndReturn(delegate.getSet(serialize(key), serialize(value)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hDel(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long hDel(String key, String... fields) {
 		return hDel(serialize(key), serializeMulti(fields));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hExists(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean hExists(String key, String field) {
 		return hExists(serialize(key), serialize(field));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hGet(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public String hGet(String key, String field) {
 		return convertAndReturn(delegate.hGet(serialize(key), serialize(field)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hGetAll(java.lang.String)
-	 */
 	@Override
 	public Map<String, String> hGetAll(String key) {
 		return convertAndReturn(delegate.hGetAll(serialize(key)), byteMapToStringMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hIncrBy(java.lang.String, java.lang.String, long)
-	 */
 	@Override
 	public Long hIncrBy(String key, String field, long delta) {
 		return hIncrBy(serialize(key), serialize(field), delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hIncrBy(java.lang.String, java.lang.String, double)
-	 */
 	@Override
 	public Double hIncrBy(String key, String field, double delta) {
 		return hIncrBy(serialize(key), serialize(field), delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] hRandField(byte[] key) {
 		return convertAndReturn(delegate.hRandField(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[])
-	 */
 	@Nullable
 	@Override
 	public Entry<byte[], byte[]> hRandFieldWithValues(byte[] key) {
 		return convertAndReturn(delegate.hRandFieldWithValues(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<byte[]> hRandField(byte[] key, long count) {
 		return convertAndReturn(delegate.hRandField(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<Entry<byte[], byte[]>> hRandFieldWithValues(byte[] key, long count) {
 		return convertAndReturn(delegate.hRandFieldWithValues(key, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hRandField(java.lang.String)
-	 */
 	@Nullable
 	@Override
 	public String hRandField(String key) {
 		return convertAndReturn(delegate.hRandField(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hRandFieldWithValues(java.lang.String)
-	 */
 	@Nullable
 	@Override
 	public Entry<String, String> hRandFieldWithValues(String key) {
@@ -2431,20 +1479,12 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				(Converter<Entry<byte[], byte[]>, Entry<String, String>>) this::convertEntry);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hRandField(java.lang.String, long)
-	 */
 	@Nullable
 	@Override
 	public List<String> hRandField(String key, long count) {
 		return convertAndReturn(delegate.hRandField(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hRandFieldWithValues(java.lang.String, long)
-	 */
 	@Nullable
 	@Override
 	public List<Entry<String, String>> hRandFieldWithValues(String key, long count) {
@@ -2452,1205 +1492,677 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				new ListConverter<>(this::convertEntry));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hKeys(java.lang.String)
-	 */
 	@Override
 	public Set<String> hKeys(String key) {
 		return convertAndReturn(delegate.hKeys(serialize(key)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hLen(java.lang.String)
-	 */
 	@Override
 	public Long hLen(String key) {
 		return hLen(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hMGet(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public List<String> hMGet(String key, String... fields) {
 		return convertAndReturn(delegate.hMGet(serialize(key), serializeMulti(fields)), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hMSet(java.lang.String, java.util.Map)
-	 */
 	@Override
 	public void hMSet(String key, Map<String, String> hashes) {
 		delegate.hMSet(serialize(key), serialize(hashes));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hSet(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean hSet(String key, String field, String value) {
 		return hSet(serialize(key), serialize(field), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hSetNX(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean hSetNX(String key, String field, String value) {
 		return hSetNX(serialize(key), serialize(field), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hVals(java.lang.String)
-	 */
 	@Override
 	public List<String> hVals(String key) {
 		return convertAndReturn(delegate.hVals(serialize(key)), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#incr(java.lang.String)
-	 */
 	@Override
 	public Long incr(String key) {
 		return incr(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#incrBy(java.lang.String, long)
-	 */
 	@Override
 	public Long incrBy(String key, long value) {
 		return incrBy(serialize(key), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#incrBy(java.lang.String, double)
-	 */
 	@Override
 	public Double incrBy(String key, double value) {
 		return incrBy(serialize(key), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#keys(java.lang.String)
-	 */
 	@Override
 	public Collection<String> keys(String pattern) {
 		return convertAndReturn(delegate.keys(serialize(pattern)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lIndex(java.lang.String, long)
-	 */
 	@Override
 	public String lIndex(String key, long index) {
 		return convertAndReturn(delegate.lIndex(serialize(key), index), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lInsert(java.lang.String, org.springframework.data.redis.connection.RedisListCommands.Position, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long lInsert(String key, Position where, String pivot, String value) {
 		return lInsert(serialize(key), where, serialize(pivot), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lLen(java.lang.String)
-	 */
 	@Override
 	public Long lLen(String key) {
 		return lLen(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lPop(java.lang.String)
-	 */
 	@Override
 	public String lPop(String key) {
 		return convertAndReturn(delegate.lPop(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lPop(java.lang.String, long)
-	 */
 	@Override
 	public List<String> lPop(String key, long count) {
 		return convertAndReturn(delegate.lPop(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lPos(java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer)
-	 */
 	@Override
 	public List<Long> lPos(String key, String element, @Nullable Integer rank, @Nullable Integer count) {
 		return lPos(serialize(key), serialize(element), rank, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lPush(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long lPush(String key, String... values) {
 		return lPush(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lPushX(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long lPushX(String key, String value) {
 		return lPushX(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lRange(java.lang.String, long, long)
-	 */
 	@Override
 	public List<String> lRange(String key, long start, long end) {
 		return convertAndReturn(delegate.lRange(serialize(key), start, end), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lRem(java.lang.String, long, java.lang.String)
-	 */
 	@Override
 	public Long lRem(String key, long count, String value) {
 		return lRem(serialize(key), count, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lSet(java.lang.String, long, java.lang.String)
-	 */
 	@Override
 	public void lSet(String key, long index, String value) {
 		delegate.lSet(serialize(key), index, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#lTrim(java.lang.String, long, long)
-	 */
 	@Override
 	public void lTrim(String key, long start, long end) {
 		delegate.lTrim(serialize(key), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#mGet(java.lang.String[])
-	 */
 	@Override
 	public List<String> mGet(String... keys) {
 		return convertAndReturn(delegate.mGet(serializeMulti(keys)), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#mSetNXString(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNXString(Map<String, String> tuple) {
 		return mSetNX(serialize(tuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#mSetString(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetString(Map<String, String> tuple) {
 		return mSet(serialize(tuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#persist(java.lang.String)
-	 */
 	@Override
 	public Boolean persist(String key) {
 		return persist(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#move(java.lang.String, int)
-	 */
 	@Override
 	public Boolean move(String key, int dbIndex) {
 		return move(serialize(key), dbIndex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pSubscribe(org.springframework.data.redis.connection.MessageListener, java.lang.String[])
-	 */
 	@Override
 	public void pSubscribe(MessageListener listener, String... patterns) {
 		delegate.pSubscribe(listener, serializeMulti(patterns));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#publish(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long publish(String channel, String message) {
 		return publish(serialize(channel), serialize(message));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rename(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void rename(String oldKey, String newKey) {
 		delegate.rename(serialize(oldKey), serialize(newKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#renameNX(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean renameNX(String oldKey, String newKey) {
 		return renameNX(serialize(oldKey), serialize(newKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rPop(java.lang.String)
-	 */
 	@Override
 	public String rPop(String key) {
 		return convertAndReturn(delegate.rPop(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rPop(java.lang.String, long)
-	 */
 	@Override
 	public List<String> rPop(String key, long count) {
 		return convertAndReturn(delegate.rPop(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rPopLPush(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public String rPopLPush(String srcKey, String dstKey) {
 		return convertAndReturn(delegate.rPopLPush(serialize(srcKey), serialize(dstKey)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rPush(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long rPush(String key, String... values) {
 		return rPush(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#rPushX(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long rPushX(String key, String value) {
 		return rPushX(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sAdd(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long sAdd(String key, String... values) {
 		return sAdd(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sCard(java.lang.String)
-	 */
 	@Override
 	public Long sCard(String key) {
 		return sCard(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sDiff(java.lang.String[])
-	 */
 	@Override
 	public Set<String> sDiff(String... keys) {
 		return convertAndReturn(delegate.sDiff(serializeMulti(keys)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sDiffStore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long sDiffStore(String destKey, String... keys) {
 		return sDiffStore(serialize(destKey), serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#set(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean set(String key, String value) {
 		return set(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#set(java.lang.String, java.lang.String, org.springframework.data.redis.core.types.Expiration, org.springframework.data.redis.connection.RedisStringCommands.SetOptions)
-	 */
 	@Override
 	public Boolean set(String key, String value, Expiration expiration, SetOption option) {
 		return set(serialize(key), serialize(value), expiration, option);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#setBit(java.lang.String, long, boolean)
-	 */
 	@Override
 	public Boolean setBit(String key, long offset, boolean value) {
 		return setBit(serialize(key), offset, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#setEx(java.lang.String, long, java.lang.String)
-	 */
 	@Override
 	public Boolean setEx(String key, long seconds, String value) {
 		return setEx(serialize(key), seconds, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pSetEx(java.lang.String, long, java.lang.String)
-	 */
 	@Override
 	public Boolean pSetEx(String key, long seconds, String value) {
 		return pSetEx(serialize(key), seconds, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#setNX(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean setNX(String key, String value) {
 		return setNX(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#setRange(java.lang.String, java.lang.String, long)
-	 */
 	@Override
 	public void setRange(String key, String value, long start) {
 		delegate.setRange(serialize(key), serialize(value), start);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sInter(java.lang.String[])
-	 */
 	@Override
 	public Set<String> sInter(String... keys) {
 		return convertAndReturn(delegate.sInter(serializeMulti(keys)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sInterStore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long sInterStore(String destKey, String... keys) {
 		return sInterStore(serialize(destKey), serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sIsMember(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean sIsMember(String key, String value) {
 		return sIsMember(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sMIsMember(java.lang.String, java.lang.String...)
-	 */
 	@Override
 	public List<Boolean> sMIsMember(String key, String... values) {
 		return sMIsMember(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sMembers(java.lang.String)
-	 */
 	@Override
 	public Set<String> sMembers(String key) {
 		return convertAndReturn(delegate.sMembers(serialize(key)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sMove(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean sMove(String srcKey, String destKey, String value) {
 		return sMove(serialize(srcKey), serialize(destKey), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sort(java.lang.String, org.springframework.data.redis.connection.SortParameters, java.lang.String)
-	 */
 	@Override
 	public Long sort(String key, SortParameters params, String storeKey) {
 		return sort(serialize(key), params, serialize(storeKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sort(java.lang.String, org.springframework.data.redis.connection.SortParameters)
-	 */
 	@Override
 	public List<String> sort(String key, SortParameters params) {
 		return convertAndReturn(delegate.sort(serialize(key), params), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#encoding(java.lang.String)
-	 */
 	@Override
 	public ValueEncoding encodingOf(String key) {
 		return encodingOf(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#idletime(java.lang.String)
-	 */
 	@Override
 	public Duration idletime(String key) {
 		return idletime(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#refcount(java.lang.String)
-	 */
 	@Override
 	public Long refcount(String key) {
 		return refcount(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sPop(java.lang.String)
-	 */
 	@Override
 	public String sPop(String key) {
 		return convertAndReturn(delegate.sPop(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sPop(java.lang.String, long)
-	 */
 	@Override
 	public List<String> sPop(String key, long count) {
 		return convertAndReturn(delegate.sPop(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sRandMember(java.lang.String)
-	 */
 	@Override
 	public String sRandMember(String key) {
 		return convertAndReturn(delegate.sRandMember(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sRandMember(java.lang.String, long)
-	 */
 	@Override
 	public List<String> sRandMember(String key, long count) {
 		return convertAndReturn(delegate.sRandMember(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sRem(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long sRem(String key, String... values) {
 		return sRem(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#strLen(java.lang.String)
-	 */
 	@Override
 	public Long strLen(String key) {
 		return strLen(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitCount(java.lang.String)
-	 */
 	@Override
 	public Long bitCount(String key) {
 		return bitCount(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitCount(java.lang.String, long, long)
-	 */
 	@Override
 	public Long bitCount(String key, long start, long end) {
 		return bitCount(serialize(key), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitOp(org.springframework.data.redis.connection.RedisStringCommands.BitOperation, java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long bitOp(BitOperation op, String destination, String... keys) {
 		return bitOp(op, serialize(destination), serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitPos(java.lang.String, boolean, org.springframework.data.domain.Range)
-	 */
 	@Nullable
 	@Override
 	public Long bitPos(String key, boolean bit, org.springframework.data.domain.Range<Long> range) {
 		return bitPos(serialize(key), bit, range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#subscribe(org.springframework.data.redis.connection.MessageListener, java.lang.String[])
-	 */
 	@Override
 	public void subscribe(MessageListener listener, String... channels) {
 		delegate.subscribe(listener, serializeMulti(channels));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sUnion(java.lang.String[])
-	 */
 	@Override
 	public Set<String> sUnion(String... keys) {
 		return convertAndReturn(delegate.sUnion(serializeMulti(keys)), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sUnionStore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long sUnionStore(String destKey, String... keys) {
 		return sUnionStore(serialize(destKey), serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#ttl(java.lang.String)
-	 */
 	@Override
 	public Long ttl(String key) {
 		return ttl(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#ttl(java.lang.String, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long ttl(String key, TimeUnit timeUnit) {
 		return ttl(serialize(key), timeUnit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#type(java.lang.String)
-	 */
 	@Override
 	public DataType type(String key) {
 		return type(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#touch(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Long touch(String... keys) {
 		return touch(serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zAdd(java.lang.String, double, java.lang.String)
-	 */
 	@Override
 	public Boolean zAdd(String key, double score, String value) {
 		return zAdd(serialize(key), score, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zAdd(java.lang.String, double, java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Boolean zAdd(String key, double score, String value, ZAddArgs args) {
 		return zAdd(serialize(key), score, serialize(value), args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zAdd(java.lang.String, java.util.Set)
-	 */
 	@Override
 	public Long zAdd(String key, Set<StringTuple> tuples) {
 		return zAdd(serialize(key), stringTupleToTuple.convert(tuples));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zAdd(java.lang.String, java.util.Set, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Long zAdd(String key, Set<StringTuple> tuples, ZAddArgs args) {
 		return zAdd(serialize(key), stringTupleToTuple.convert(tuples), args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zCard(java.lang.String)
-	 */
 	@Override
 	public Long zCard(String key) {
 		return zCard(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zCount(java.lang.String, double, double)
-	 */
 	@Override
 	public Long zCount(String key, double min, double max) {
 		return zCount(serialize(key), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zLexCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zLexCount(byte[] key, Range range) {
 		return delegate.zLexCount(key, range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMin(byte[] key) {
 		return delegate.zPopMin(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(String)
-	 */
 	@Nullable
 	@Override
 	public StringTuple zPopMin(String key) {
 		return convertAndReturn(delegate.zPopMin(serialize(key)), tupleConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMinMin(byte[], count)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMin(byte[] key, long count) {
 		return delegate.zPopMin(key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(String, long)
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zPopMin(String key, long count) {
 		return convertAndReturn(delegate.zPopMin(serialize(key), count), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMin(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
 		return delegate.bZPopMin(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMin(String, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public StringTuple bZPopMin(String key, long timeout, TimeUnit unit) {
 		return convertAndReturn(delegate.bZPopMin(serialize(key), timeout, unit), tupleConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMax(byte[] key) {
 		return delegate.zPopMax(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(String)
-	 */
 	@Nullable
 	@Override
 	public StringTuple zPopMax(String key) {
 		return convertAndReturn(delegate.zPopMax(serialize(key)), tupleConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMax(byte[] key, long count) {
 		return delegate.zPopMax(key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(String, long)
-	 */
 	@Nullable
 	@Override
 	public Set<StringTuple> zPopMax(String key, long count) {
 		return convertAndReturn(delegate.zPopMax(serialize(key), count), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMax(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
 		return delegate.bZPopMax(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMax(String, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public StringTuple bZPopMax(String key, long timeout, TimeUnit unit) {
 		return convertAndReturn(delegate.bZPopMax(serialize(key), timeout, unit), tupleConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zIncrBy(java.lang.String, double, java.lang.String)
-	 */
 	@Override
 	public Double zIncrBy(String key, double increment, String value) {
 		return zIncrBy(serialize(key), increment, serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zInterStore(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, int[], java.lang.String[])
-	 */
 	@Override
 	public Long zInterStore(String destKey, Aggregate aggregate, int[] weights, String... sets) {
 		return zInterStore(serialize(destKey), aggregate, weights, serializeMulti(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zInterStore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long zInterStore(String destKey, String... sets) {
 		return zInterStore(serialize(destKey), serializeMulti(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[])
-	 */
 	@Override
 	public byte[] zRandMember(byte[] key) {
 		return delegate.zRandMember(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> zRandMember(byte[] key, long count) {
 		return delegate.zRandMember(key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[])
-	 */
 	@Override
 	public Tuple zRandMemberWithScore(byte[] key) {
 		return delegate.zRandMemberWithScore(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[], long)
-	 */
 	@Override
 	public List<Tuple> zRandMemberWithScore(byte[] key, long count) {
 		return delegate.zRandMemberWithScore(key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRandMember(java.lang.String)
-	 */
 	@Override
 	public String zRandMember(String key) {
 		return convertAndReturn(delegate.zRandMember(serialize(key)), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRandMember(java.lang.String, long)
-	 */
 	@Override
 	public List<String> zRandMember(String key, long count) {
 		return convertAndReturn(delegate.zRandMember(serialize(key), count), byteListToStringList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRandMemberWithScore(java.lang.String)
-	 */
 	@Override
 	public StringTuple zRandMemberWithScore(String key) {
 		return convertAndReturn(delegate.zRandMemberWithScore(serialize(key)), new TupleConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRandMemberWithScores(java.lang.String, long)
-	 */
 	@Override
 	public List<StringTuple> zRandMemberWithScores(String key, long count) {
 		return convertAndReturn(delegate.zRandMemberWithScore(serialize(key), count), tupleListToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRange(java.lang.String, long, long)
-	 */
 	@Override
 	public Set<String> zRange(String key, long start, long end) {
 		return convertAndReturn(delegate.zRange(serialize(key), start, end), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScore(java.lang.String, double, double, long, long)
-	 */
 	@Override
 	public Set<String> zRangeByScore(String key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScore(serialize(key), min, max, offset, count), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScore(java.lang.String, double, double)
-	 */
 	@Override
 	public Set<String> zRangeByScore(String key, double min, double max) {
 		return convertAndReturn(delegate.zRangeByScore(serialize(key), min, max), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScoreWithScores(java.lang.String, double, double, long, long)
-	 */
 	@Override
 	public Set<StringTuple> zRangeByScoreWithScores(String key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(serialize(key), min, max, offset, count),
 				tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScoreWithScores(java.lang.String, double, double)
-	 */
 	@Override
 	public Set<StringTuple> zRangeByScoreWithScores(String key, double min, double max) {
 		return convertAndReturn(delegate.zRangeByScoreWithScores(serialize(key), min, max), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeWithScores(java.lang.String, long, long)
-	 */
 	@Override
 	public Set<StringTuple> zRangeWithScores(String key, long start, long end) {
 		return convertAndReturn(delegate.zRangeWithScores(serialize(key), start, end), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRank(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long zRank(String key, String value) {
 		return zRank(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRem(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long zRem(String key, String... values) {
 		return zRem(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRemRange(java.lang.String, long, long)
-	 */
 	@Override
 	public Long zRemRange(String key, long start, long end) {
 		return zRemRange(serialize(key), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRemRange(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByLex(String key, Range range) {
 		return zRemRangeByLex(serialize(key), range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRemRangeByScore(java.lang.String, double, double)
-	 */
 	@Override
 	public Long zRemRangeByScore(String key, double min, double max) {
 		return zRemRangeByScore(serialize(key), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRange(java.lang.String, long, long)
-	 */
 	@Override
 	public Set<String> zRevRange(String key, long start, long end) {
 		return convertAndReturn(delegate.zRevRange(serialize(key), start, end), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeWithScores(java.lang.String, long, long)
-	 */
 	@Override
 	public Set<StringTuple> zRevRangeWithScores(String key, long start, long end) {
 		return convertAndReturn(delegate.zRevRangeWithScores(serialize(key), start, end), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeByScore(java.lang.String, double, double)
-	 */
 	@Override
 	public Set<String> zRevRangeByScore(String key, double min, double max) {
 		return convertAndReturn(delegate.zRevRangeByScore(serialize(key), min, max), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeByScoreWithScores(java.lang.String, double, double)
-	 */
 	@Override
 	public Set<StringTuple> zRevRangeByScoreWithScores(String key, double min, double max) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(serialize(key), min, max), tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeByScore(java.lang.String, double, double, long, long)
-	 */
 	@Override
 	public Set<String> zRevRangeByScore(String key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRevRangeByScore(serialize(key), min, max, offset, count), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeByScoreWithScores(java.lang.String, double, double, long, long)
-	 */
 	@Override
 	public Set<StringTuple> zRevRangeByScoreWithScores(String key, double min, double max, long offset, long count) {
 		return convertAndReturn(delegate.zRevRangeByScoreWithScores(serialize(key), min, max, offset, count),
 				tupleToStringTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRank(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long zRevRank(String key, String value) {
 		return zRevRank(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zScore(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Double zScore(String key, String value) {
 		return zScore(serialize(key), serialize(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zMScore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public List<Double> zMScore(String key, String... values) {
 		return zMScore(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zUnionStore(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, int[], java.lang.String[])
-	 */
 	@Override
 	public Long zUnionStore(String destKey, Aggregate aggregate, int[] weights, String... sets) {
 		return zUnionStore(serialize(destKey), aggregate, weights, serializeMulti(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zUnionStore(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long zUnionStore(String destKey, String... sets) {
 		return zUnionStore(serialize(destKey), serializeMulti(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], org.springframework.data.geo.Point, byte[])
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Point point, byte[] member) {
 
 		return convertAndReturn(delegate.geoAdd(key, point, member), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation)
-	 */
 	public Long geoAdd(byte[] key, GeoLocation<byte[]> location) {
 		return convertAndReturn(delegate.geoAdd(key, location), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoAdd(java.lang.String, org.springframework.data.geo.Point, java.lang.String)
-	 */
 	@Override
 	public Long geoAdd(String key, Point point, String member) {
 		return geoAdd(serialize(key), point, serialize(member));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoAdd(java.lang.String, org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation)
-	 */
 	@Override
 	public Long geoAdd(String key, GeoLocation<String> location) {
 
@@ -3658,28 +2170,16 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return geoAdd(key, location.getPoint(), location.getName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.util.Map)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Map<byte[], Point> memberCoordinateMap) {
 		return convertAndReturn(delegate.geoAdd(key, memberCoordinateMap), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.lang.Iterable)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Iterable<GeoLocation<byte[]>> locations) {
 		return convertAndReturn(delegate.geoAdd(key, locations), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoAdd(java.lang.String, java.util.Map)
-	 */
 	@Override
 	public Long geoAdd(String key, Map<String, Point> memberCoordinateMap) {
 
@@ -3693,10 +2193,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return geoAdd(serialize(key), byteMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoAdd(java.lang.String, java.lang.Iterable)
-	 */
 	@Override
 	public Long geoAdd(String key, Iterable<GeoLocation<String>> locations) {
 
@@ -3710,109 +2206,61 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return geoAdd(serialize(key), byteMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[])
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2) {
 		return convertAndReturn(delegate.geoDist(key, member1, member2), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoDist(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Distance geoDist(String key, String member1, String member2) {
 		return geoDist(serialize(key), serialize(member1), serialize(member2));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[], org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2, Metric metric) {
 		return convertAndReturn(delegate.geoDist(key, member1, member2, metric), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoDist(java.lang.String, java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit)
-	 */
 	@Override
 	public Distance geoDist(String key, String member1, String member2, Metric metric) {
 		return geoDist(serialize(key), serialize(member1), serialize(member2), metric);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoHash(byte[], byte[][])
-	 */
 	@Override
 	public List<String> geoHash(byte[] key, byte[]... members) {
 		return convertAndReturn(delegate.geoHash(key, members), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoHash(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public List<String> geoHash(String key, String... members) {
 		return convertAndReturn(delegate.geoHash(serialize(key), serializeMulti(members)), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoPos(byte[], byte[][])
-	 */
 	@Override
 	public List<Point> geoPos(byte[] key, byte[]... members) {
 		return convertAndReturn(delegate.geoPos(key, members), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoPos(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public List<Point> geoPos(String key, String... members) {
 		return geoPos(serialize(key), serializeMulti(members));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadius(java.lang.String, org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoRadius(String key, Circle within) {
 		return convertAndReturn(delegate.geoRadius(serialize(key), within), byteGeoResultsToStringGeoResults);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadius(java.lang.String, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoRadius(String key, Circle within, GeoRadiusCommandArgs args) {
 		return convertAndReturn(delegate.geoRadius(serialize(key), within, args), byteGeoResultsToStringGeoResults);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, double)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, double radius) {
 		return geoRadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, Distance radius) {
 
@@ -3820,10 +2268,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				byteGeoResultsToStringGeoResults);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRadiusByMember(java.lang.String, java.lang.String, org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoRadiusByMember(String key, String member, Distance radius,
 			GeoRadiusCommandArgs args) {
@@ -3832,46 +2276,26 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				byteGeoResultsToStringGeoResults);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
 		return convertAndReturn(delegate.geoRadius(key, within), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
 		return convertAndReturn(delegate.geoRadius(key, within, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
 		return geoRadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
 		return convertAndReturn(delegate.geoRadiusByMember(key, member, radius), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,
 			GeoRadiusCommandArgs args) {
@@ -3879,38 +2303,22 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return convertAndReturn(delegate.geoRadiusByMember(key, member, radius, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRemove(byte[], byte[][])
-	 */
 	@Override
 	public Long geoRemove(byte[] key, byte[]... members) {
 		return zRem(key, members);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoRemove(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long geoRemove(String key, String... members) {
 		return geoRemove(serialize(key), serializeMulti(members));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearch(byte[], byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoSearch(byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchCommandArgs args) {
 		return convertAndReturn(delegate.geoSearch(key, reference, predicate, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearchStore(byte[], byte[], byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long geoSearchStore(byte[] destKey, byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchStoreCommandArgs args) {
@@ -3918,10 +2326,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoSearch(java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<String>> geoSearch(String key, GeoReference<String> reference, GeoShape predicate,
 			GeoSearchCommandArgs args) {
@@ -3929,10 +2333,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				byteGeoResultsToStringGeoResults);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#geoSearchStore(java.lang.String, java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long geoSearchStore(String destKey, String key, GeoReference<String> reference, GeoShape predicate,
 			GeoSearchStoreCommandArgs args) {
@@ -3941,10 +2341,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#closePipeline()
-	 */
 	@Override
 	public List<Object> closePipeline() {
 
@@ -3955,91 +2351,51 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isPipelined()
-	 */
 	@Override
 	public boolean isPipelined() {
 		return delegate.isPipelined();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#openPipeline()
-	 */
 	@Override
 	public void openPipeline() {
 		delegate.openPipeline();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#execute(java.lang.String)
-	 */
 	@Override
 	public Object execute(String command) {
 		return execute(command, EMPTY_2D_BYTE_ARRAY);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisCommands#execute(java.lang.String, byte[][])
-	 */
 	@Override
 	public Object execute(String command, byte[]... args) {
 		return convertAndReturn(delegate.execute(command, args), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#execute(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Object execute(String command, String... args) {
 		return execute(command, serializeMulti(args));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pExpire(java.lang.String, long)
-	 */
 	@Override
 	public Boolean pExpire(String key, long millis) {
 		return pExpire(serialize(key), millis);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pExpireAt(java.lang.String, long)
-	 */
 	@Override
 	public Boolean pExpireAt(String key, long unixTimeInMillis) {
 		return pExpireAt(serialize(key), unixTimeInMillis);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pTtl(java.lang.String)
-	 */
 	@Override
 	public Long pTtl(String key) {
 		return pTtl(serialize(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pTtl(java.lang.String, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long pTtl(String key, TimeUnit timeUnit) {
 		return pTtl(serialize(key), timeUnit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#scriptLoad(java.lang.String)
-	 */
 	@Override
 	public String scriptLoad(String script) {
 		return scriptLoad(serialize(script));
@@ -4061,119 +2417,67 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return evalSha(scriptSha1, returnType, numKeys, serializeMulti(keysAndArgs));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#time()
-	 */
 	@Override
 	public Long time() {
 		return convertAndReturn(this.delegate.time(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#time(TimeUnit)
-	 */
 	@Override
 	public Long time(TimeUnit timeUnit) {
 		return convertAndReturn(this.delegate.time(timeUnit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 		return convertAndReturn(this.delegate.getClientList(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
-	 */
 	@Override
 	public void slaveOf(String host, int port) {
 		this.delegate.slaveOf(host, port);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 		this.delegate.slaveOfNoOne();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(ScanOptions options) {
 		return this.delegate.scan(options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Tuple> zScan(byte[] key, ScanOptions options) {
 		return this.delegate.zScan(key, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#scan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {
 		return this.delegate.sScan(key, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hscan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<byte[], byte[]>> hScan(byte[] key, ScanOptions options) {
 		return this.delegate.hScan(key, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#hStrLen(byte[], byte[])
-	 */
 	@Nullable
 	@Override
 	public Long hStrLen(byte[] key, byte[] field) {
 		return convertAndReturn(delegate.hStrLen(key, field), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setClientName(java.lang.String)
-	 */
 	@Override
 	public void setClientName(byte[] name) {
 		this.delegate.setClientName(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#setClientName(java.lang.String)
-	 */
 	@Override
 	public void setClientName(String name) {
 		setClientName(this.serializer.serialize(name));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#killClient(byte[])
-	 */
 	@Override
 	public void killClient(String host, int port) {
 		this.delegate.killClient(host, port);
@@ -4187,365 +2491,205 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return convertAndReturn(this.delegate.getClientName(), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hScan(java.lang.String, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<String, String>> hScan(String key, ScanOptions options) {
 
 		return new ConvertingCursor<>(this.delegate.hScan(this.serialize(key), options), this::convertEntry);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#hStrLen(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Long hStrLen(String key, String field) {
 		return hStrLen(serialize(key), serialize(field));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#sScan(java.lang.String, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<String> sScan(String key, ScanOptions options) {
 		return new ConvertingCursor<>(this.delegate.sScan(this.serialize(key), options), bytesToString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zScan(java.lang.String, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<StringTuple> zScan(String key, ScanOptions options) {
 		return new ConvertingCursor<>(delegate.zScan(this.serialize(key), options), new TupleConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getSentinelConnection()
-	 */
 	@Override
 	public RedisSentinelConnection getSentinelConnection() {
 		return delegate.getSentinelConnection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScore(java.lang.String, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Set<String> zRangeByScore(String key, String min, String max) {
 		return convertAndReturn(delegate.zRangeByScore(serialize(key), min, max), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByScore(java.lang.String, java.lang.String, java.lang.String, long, long)
-	 */
 	@Override
 	public Set<String> zRangeByScore(String key, String min, String max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScore(serialize(key), min, max, offset, count), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max) {
 		return convertAndReturn(delegate.zRangeByScore(key, min, max), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max, long offset, long count) {
 		return convertAndReturn(delegate.zRangeByScore(key, min, max, offset, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long pfAdd(byte[] key, byte[]... values) {
 		return convertAndReturn(delegate.pfAdd(key, values), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pfAdd(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long pfAdd(String key, String... values) {
 		return pfAdd(serialize(key), serializeMulti(values));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfCount(byte[][])
-	 */
 	@Override
 	public Long pfCount(byte[]... keys) {
 		return convertAndReturn(delegate.pfCount(keys), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pfCount(java.lang.String[])
-	 */
 	@Override
 	public Long pfCount(String... keys) {
 		return pfCount(serializeMulti(keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfMerge(byte[], byte[][])
-	 */
 	@Override
 	public void pfMerge(byte[] destinationKey, byte[]... sourceKeys) {
 		delegate.pfMerge(destinationKey, sourceKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#pfMerge(java.lang.String, java.lang.String[][])
-	 */
 	@Override
 	public void pfMerge(String destinationKey, String... sourceKeys) {
 		this.pfMerge(serialize(destinationKey), serializeMulti(sourceKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[])
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key) {
 		return convertAndReturn(delegate.zRangeByLex(key), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key, Range range) {
 		return convertAndReturn(delegate.zRangeByLex(key, range), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRangeByLex(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByLex(java.lang.String)
-	 */
 	@Override
 	public Set<String> zRangeByLex(String key) {
 		return zRangeByLex(key, Range.unbounded());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByLex(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<String> zRangeByLex(String key, Range range) {
 		return zRangeByLex(key, range, Limit.unlimited());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRangeByLex(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<String> zRangeByLex(String key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRangeByLex(serialize(key), range, limit), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByLex(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRevRangeByLex(key, range, limit), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#zRevRangeByLex(java.lang.String, org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<String> zRevRangeByLex(String key, Range range, Limit limit) {
 		return convertAndReturn(delegate.zRevRangeByLex(serialize(key), range, limit), byteSetToStringSet);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option) {
 		delegate.migrate(key, target, dbIndex, option);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption, long)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option, long timeout) {
 		delegate.migrate(key, target, dbIndex, option, timeout);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xAck(java.lang.String, java.lang.String, RecordId[])
-	 */
 	@Override
 	public Long xAck(String key, String group, RecordId... recordIds) {
 		return convertAndReturn(delegate.xAck(this.serialize(key), group, recordIds), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xAdd(StringRecord, XAddOptions)
-	 */
 	@Override
 	public RecordId xAdd(StringRecord record, XAddOptions options) {
 		return convertAndReturn(delegate.xAdd(record.serialize(serializer), options), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xClaimJustId(java.lang.String, java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<RecordId> xClaimJustId(String key, String group, String consumer, XClaimOptions options) {
 		return convertAndReturn(delegate.xClaimJustId(serialize(key), group, consumer, options),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xClaim(java.lang.String, java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<StringRecord> xClaim(String key, String group, String consumer, XClaimOptions options) {
 		return convertAndReturn(delegate.xClaim(serialize(key), group, consumer, options),
 				listByteMapRecordToStringMapRecordConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xDel(java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long xDel(String key, RecordId... recordIds) {
 		return convertAndReturn(delegate.xDel(serialize(key), recordIds), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xGroupCreate(java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String xGroupCreate(String key, ReadOffset readOffset, String group) {
 		return convertAndReturn(delegate.xGroupCreate(serialize(key), group, readOffset), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xGroupCreate(java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String, boolean)
-	 */
 	@Override
 	public String xGroupCreate(String key, ReadOffset readOffset, String group, boolean mkStream) {
 		return convertAndReturn(delegate.xGroupCreate(serialize(key), group, readOffset, mkStream),
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xGroupDelConsumer(java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean xGroupDelConsumer(String key, Consumer consumer) {
 		return convertAndReturn(delegate.xGroupDelConsumer(serialize(key), consumer), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xGroupDestroy(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Boolean xGroupDestroy(String key, String group) {
 		return convertAndReturn(delegate.xGroupDestroy(serialize(key), group), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xInfo(java.lang.String)
-	 */
 	@Override
 	public XInfoStream xInfo(String key) {
 		return convertAndReturn(delegate.xInfo(serialize(key)), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xInfoGroups(java.lang.String)
-	 */
 	@Override
 	public XInfoGroups xInfoGroups(String key) {
 		return convertAndReturn(delegate.xInfoGroups(serialize(key)), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xInfoConsumers(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public XInfoConsumers xInfoConsumers(String key, String groupName) {
 		return convertAndReturn(delegate.xInfoConsumers(serialize(key), groupName), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xLen(java.lang.String)
-	 */
 	@Override
 	public Long xLen(String key) {
 		return convertAndReturn(delegate.xLen(serialize(key)), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xPending(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary xPending(String key, String groupName) {
 		return convertAndReturn(delegate.xPending(serialize(key), groupName), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xPending(java.lang.String, java.lang.String, java.lang.String, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public PendingMessages xPending(String key, String groupName, String consumer,
 			org.springframework.data.domain.Range<String> range, Long count) {
@@ -4553,48 +2697,28 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xPending(java.lang.String, java.lang.String, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public PendingMessages xPending(String key, String groupName, org.springframework.data.domain.Range<String> range,
 			Long count) {
 		return convertAndReturn(delegate.xPending(serialize(key), groupName, range, count), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xPending(java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XPendingOptions)
-	 */
 	@Override
 	public PendingMessages xPending(String key, String groupName, XPendingOptions options) {
 		return convertAndReturn(delegate.xPending(serialize(key), groupName, options), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xRange(java.lang.String, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<StringRecord> xRange(String key, org.springframework.data.domain.Range<String> range, Limit limit) {
 		return convertAndReturn(delegate.xRange(serialize(key), range, limit), listByteMapRecordToStringMapRecordConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xReadAsString(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<StringRecord> xReadAsString(StreamReadOptions readOptions, StreamOffset<String>... streams) {
 		return convertAndReturn(delegate.xRead(readOptions, serialize(streams)),
 				listByteMapRecordToStringMapRecordConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xReadGroupAsString(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<StringRecord> xReadGroupAsString(Consumer consumer, StreamReadOptions readOptions,
 			StreamOffset<String>... streams) {
@@ -4603,10 +2727,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				listByteMapRecordToStringMapRecordConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xRevRange(java.lang.String, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<StringRecord> xRevRange(String key, org.springframework.data.domain.Range<String> range, Limit limit) {
 
@@ -4614,209 +2734,117 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 				listByteMapRecordToStringMapRecordConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xTrim(java.lang.String, long)
-	 */
 	@Override
 	public Long xTrim(String key, long count) {
 		return xTrim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#xTrim(java.lang.String, long, boolean)
-	 */
 	@Override
 	public Long xTrim(String key, long count, boolean approximateTrimming) {
 		return convertAndReturn(delegate.xTrim(serialize(key), count, approximateTrimming), Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAck(byte[], java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long xAck(byte[] key, String group, RecordId... recordIds) {
 		return delegate.xAck(key, group, recordIds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAdd(MapRecord, XAddOptions)
-	 */
 	@Override
 	public RecordId xAdd(MapRecord<byte[], byte[], byte[]> record, XAddOptions options) {
 		return delegate.xAdd(record, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaimJustId(byte[], java.lang.String, java.lag.String, org.springframework.data.redis.connection.RedisStreamCommands.XCLaimOptions)
-	 */
 	@Override
 	public List<RecordId> xClaimJustId(byte[] key, String group, String newOwner, XClaimOptions options) {
 		return delegate.xClaimJustId(key, group, newOwner, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaim(byte[], java.lang.String, java.lag.String, org.springframework.data.redis.connection.RedisStreamCommands.XCLaimOptions)
-	 */
 	@Override
 	public List<ByteRecord> xClaim(byte[] key, String group, String newOwner, XClaimOptions options) {
 		return delegate.xClaim(key, group, newOwner, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xDel(byte[], RecordId)
-	 */
 	@Override
 	public Long xDel(byte[] key, RecordId... recordIds) {
 		return delegate.xDel(key, recordIds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset) {
 		return delegate.xGroupCreate(key, groupName, readOffset);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String, boolean)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset, boolean mkStream) {
 		return delegate.xGroupCreate(key, groupName, readOffset, mkStream);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDelConsumer(byte[], org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean xGroupDelConsumer(byte[] key, Consumer consumer) {
 		return delegate.xGroupDelConsumer(key, consumer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDestroy(byte[], java.lang.String)
-	 */
 	@Override
 	public Boolean xGroupDestroy(byte[] key, String groupName) {
 		return delegate.xGroupDestroy(key, groupName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfo(byte[])
-	 */
 	@Override
 	public XInfoStream xInfo(byte[] key) {
 		return delegate.xInfo(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoGroups(byte[])
-	 */
 	@Override
 	public XInfoGroups xInfoGroups(byte[] key) {
 		return delegate.xInfoGroups(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoConsumers(byte[], java.lang.String)
-	 */
 	@Override
 	public XInfoConsumers xInfoConsumers(byte[] key, String groupName) {
 		return delegate.xInfoConsumers(key, groupName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xLen(byte[])
-	 */
 	@Override
 	public Long xLen(byte[] key) {
 		return delegate.xLen(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary xPending(byte[] key, String groupName) {
 		return delegate.xPending(key, groupName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String)
-	 */
 	@Override
 	public PendingMessages xPending(byte[] key, String groupName, XPendingOptions options) {
 		return delegate.xPending(key, groupName, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRange(byte[] key, org.springframework.data.domain.Range<String> range, Limit limit) {
 		return delegate.xRange(key, range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRead(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xRead(StreamReadOptions readOptions, StreamOffset<byte[]>... streams) {
 		return delegate.xRead(readOptions, streams);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xReadGroup(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xReadGroup(Consumer consumer, StreamReadOptions readOptions,
 			StreamOffset<byte[]>... streams) {
 		return delegate.xReadGroup(consumer, readOptions, streams);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRevRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRevRange(byte[] key, org.springframework.data.domain.Range<String> range, Limit limit) {
 		return delegate.xRevRange(key, range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count) {
 		return xTrim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long, boolean)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count, boolean approximateTrimming) {
 		return delegate.xTrim(key, count, approximateTrimming);
@@ -4882,19 +2910,11 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return convertedResults;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitfield(byte[], BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitField(byte[] key, BitFieldSubCommands subCommands) {
 		return delegate.bitField(key, subCommands);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.StringRedisConnection#bitfield(byte[], BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitfield(String key, BitFieldSubCommands operation) {
 
@@ -4905,10 +2925,6 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco
 		return results;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.DecoratedRedisConnection#getDelegate()
-	 */
 	@Override
 	public RedisConnection getDelegate() {
 		return delegate;
diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java b/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java
index 640c5bab5..d39be1774 100644
--- a/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java
+++ b/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java
@@ -42,18 +42,10 @@ public class DefaultTuple implements Tuple {
 		this.value = value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands.Tuple#getScore()
-	 */
 	public Double getScore() {
 		return score;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands.Tuple#getValue()
-	 */
 	public byte[] getValue() {
 		return value;
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultedRedisClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultedRedisClusterConnection.java
index 878f89803..4a47c87fb 100644
--- a/src/main/java/org/springframework/data/redis/connection/DefaultedRedisClusterConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/DefaultedRedisClusterConnection.java
@@ -150,10 +150,6 @@ public interface DefaultedRedisClusterConnection extends RedisClusterConnection,
 		return serverCommands().getClientList(node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#execute(String, byte[], Collection)
-	 */
 	@Nullable
 	@Override
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveHyperLogLogCommands.java
index 9d3b92806..152d95988 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveHyperLogLogCommands.java
@@ -192,9 +192,6 @@ public interface ReactiveHyperLogLogCommands {
 			return keys;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		public ByteBuffer getKey() {
 			return null;
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveListCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveListCommands.java
index 35c5cb99d..184734080 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveListCommands.java
@@ -1287,9 +1287,6 @@ public interface ReactiveListCommands {
 			return new BPopCommand(keys, timeout, direction);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		public ByteBuffer getKey() {
 			return null;
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
index 2a0ac0f78..ccc9adb3f 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
@@ -51,10 +51,6 @@ import org.springframework.util.ObjectUtils;
  */
 public interface ReactiveRedisConnection extends Closeable {
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	default void close() {
 		closeLater().block();
@@ -208,10 +204,6 @@ public interface ReactiveRedisConnection extends Closeable {
 			this.key = key;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		public ByteBuffer getKey() {
 			return key;
@@ -431,9 +423,6 @@ public interface ReactiveRedisConnection extends Closeable {
 			super(input, EMPTY_BYTE_BUFFER);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.CommandResponse#isPresent()
-		 */
 		@Override
 		public boolean isPresent() {
 			return false;
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveSetCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveSetCommands.java
index 6bbd9df8c..53308ac5a 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveSetCommands.java
@@ -662,10 +662,6 @@ public interface ReactiveSetCommands {
 			return new SInterCommand(new ArrayList<>(keys));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		@Nullable
 		public ByteBuffer getKey() {
@@ -808,10 +804,6 @@ public interface ReactiveSetCommands {
 			return new SUnionCommand(new ArrayList<>(keys));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		@Nullable
 		public ByteBuffer getKey() {
@@ -954,10 +946,6 @@ public interface ReactiveSetCommands {
 			return new SDiffCommand(new ArrayList<>(keys));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		@Nullable
 		public ByteBuffer getKey() {
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
index 63fb62b4c..0714ec348 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
@@ -466,10 +466,6 @@ public interface ReactiveStringCommands {
 			this.keyValuePairs = keyValuePairs;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		@Nullable
 		public ByteBuffer getKey() {
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveSubscription.java b/src/main/java/org/springframework/data/redis/connection/ReactiveSubscription.java
index 41696a918..8d64ba65f 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveSubscription.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveSubscription.java
@@ -175,19 +175,11 @@ public interface ReactiveSubscription {
 			this.message = message;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveSubscription.Message#getChannel()
-		 */
 		@Override
 		public C getChannel() {
 			return channel;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveSubscription.Message#getMessage()
-		 */
 		@Override
 		public M getMessage() {
 			return message;
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveZSetCommands.java
index 90e3cc904..928a2211f 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveZSetCommands.java
@@ -2128,10 +2128,6 @@ public interface ReactiveZSetCommands {
 			return new ZDiffCommand(new ArrayList<>(keys));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.Command#getKey()
-		 */
 		@Override
 		@Nullable
 		public ByteBuffer getKey() {
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java
index 8a17a3184..db2b2aa47 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java
@@ -119,10 +119,6 @@ public class RedisClusterConfiguration implements RedisConfiguration, ClusterCon
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.ClusterConfiguration#getClusterNodes()
-	 */
 	@Override
 	public Set<RedisNode> getClusterNodes() {
 		return Collections.unmodifiableSet(clusterNodes);
@@ -148,10 +144,6 @@ public class RedisClusterConfiguration implements RedisConfiguration, ClusterCon
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.ClusterConfiguration#getMaxRedirects()
-	 */
 	@Override
 	public Integer getMaxRedirects() {
 		return maxRedirects != null && maxRedirects > Integer.MIN_VALUE ? maxRedirects : null;
@@ -182,38 +174,22 @@ public class RedisClusterConfiguration implements RedisConfiguration, ClusterCon
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#setUsername(String)
-	 */
 	@Override
 	public void setUsername(@Nullable String username) {
 		this.username = username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#getUsername()
-	 */
 	@Nullable
 	@Override
 	public String getUsername() {
 		return this.username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#getPassword()
-	 */
 	@Override
 	public RedisPassword getPassword() {
 		return password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#setPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
 	@Override
 	public void setPassword(RedisPassword password) {
 
@@ -222,10 +198,6 @@ public class RedisClusterConfiguration implements RedisConfiguration, ClusterCon
 		this.password = password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -247,10 +219,6 @@ public class RedisClusterConfiguration implements RedisConfiguration, ClusterCon
 		return ObjectUtils.nullSafeEquals(password, that.password);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(clusterNodes);
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java b/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java
index ec7a00aef..5e5a0fa01 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java
@@ -150,10 +150,6 @@ public class RedisClusterNode extends RedisNode {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisNode#toString()
-	 */
 	@Override
 	public String toString() {
 		return super.toString();
@@ -277,59 +273,35 @@ public class RedisClusterNode extends RedisNode {
 			this.slotRange = SlotRange.empty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#listeningAt(java.lang.String, int)
-		 */
 		@Override
 		public RedisClusterNodeBuilder listeningAt(String host, int port) {
 			super.listeningAt(host, port);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#withName(java.lang.String)
-		 */
 		@Override
 		public RedisClusterNodeBuilder withName(String name) {
 			super.withName(name);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#withId(java.lang.String)
-		 */
 		@Override
 		public RedisClusterNodeBuilder withId(String id) {
 			super.withId(id);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#promotedAs(org.springframework.data.redis.connection.RedisNode.NodeType)
-		 */
 		@Override
 		public RedisClusterNodeBuilder promotedAs(NodeType nodeType) {
 			super.promotedAs(nodeType);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#slaveOf(java.lang.String)
-		 */
 		public RedisClusterNodeBuilder slaveOf(String masterId) {
 			super.slaveOf(masterId);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#replicaOf(java.lang.String)
-		 */
 		@Override
 		public RedisClusterNodeBuilder replicaOf(String masterId) {
 			super.replicaOf(masterId);
@@ -371,10 +343,6 @@ public class RedisClusterNode extends RedisNode {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder#build()
-		 */
 		@Override
 		public RedisClusterNode build() {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisGeoCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisGeoCommands.java
index 796a143ac..2c377199f 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisGeoCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisGeoCommands.java
@@ -743,18 +743,10 @@ public interface RedisGeoCommands {
 			this.abbreviation = abbreviation;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.geo.Metric#getMultiplier()
-		 */
 		public double getMultiplier() {
 			return multiplier;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.geo.Metric#getAbbreviation()
-		 */
 		@Override
 		public String getAbbreviation() {
 			return abbreviation;
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisPassword.java b/src/main/java/org/springframework/data/redis/connection/RedisPassword.java
index dadaed582..de9e57762 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisPassword.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisPassword.java
@@ -138,10 +138,6 @@ public class RedisPassword {
 		return Optional.empty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("%s[%s]", getClass().getSimpleName(), isPresent() ? "*****" : "<none>");
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java
index 9b9e8d0ec..3f9a96d01 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java
@@ -132,10 +132,6 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#getSentinels()
-	 */
 	public Set<RedisNode> getSentinels() {
 		return Collections.unmodifiableSet(sentinels);
 	}
@@ -151,20 +147,12 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		this.sentinels.add(sentinel);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#setMaster(org.springframework.data.redis.connection.NamedNode)
-	 */
 	public void setMaster(NamedNode master) {
 
 		Assert.notNull(master, "Sentinel master node must not be 'null'.");
 		this.master = master;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#getMaster()
-	 */
 	public NamedNode getMaster() {
 		return master;
 	}
@@ -216,19 +204,11 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#getDatabase()
-	 */
 	@Override
 	public int getDatabase() {
 		return database;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#setDatabase(int)
-	 */
 	@Override
 	public void setDatabase(int index) {
 
@@ -237,38 +217,22 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		this.database = index;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#setUsername(String)
-	 */
 	@Override
 	public void setUsername(@Nullable String username) {
 		this.dataNodeUsername = username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#getUsername()
-	 */
 	@Nullable
 	@Override
 	public String getUsername() {
 		return this.dataNodeUsername;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#getPassword()
-	 */
 	@Override
 	public RedisPassword getPassword() {
 		return dataNodePassword;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#setPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
 	@Override
 	public void setPassword(RedisPassword password) {
 
@@ -277,48 +241,29 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		this.dataNodePassword = password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#getSentinelUsername()
-	 */
 	@Nullable
 	@Override
 	public String getSentinelUsername() {
 		return this.sentinelUsername;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#setSentinelUsername(String)
- 	 */
 	@Override
 	public void setSentinelUsername(@Nullable String sentinelUsername) {
 		this.sentinelUsername = sentinelUsername;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#setSentinelPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
+	@Override
 	public void setSentinelPassword(RedisPassword sentinelPassword) {
 
 		Assert.notNull(sentinelPassword, "SentinelPassword must not be null!");
 		this.sentinelPassword = sentinelPassword;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.SentinelConfiguration#setSentinelPassword()
-	 */
 	@Override
 	public RedisPassword getSentinelPassword() {
 		return sentinelPassword;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -349,10 +294,6 @@ public class RedisSentinelConfiguration implements RedisConfiguration, SentinelC
 		return ObjectUtils.nullSafeEquals(sentinelPassword, that.sentinelPassword);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(master);
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
index 841f0964e..622ef87da 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
@@ -54,19 +54,11 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke
 		this.socket = socket;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDomainSocket#getSocket()
-	 */
 	@Override
 	public String getSocket() {
 		return socket;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDomainSocket#setSocket(java.lang.String)
-	 */
 	@Override
 	public void setSocket(String socket) {
 
@@ -74,19 +66,11 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke
 		this.socket = socket;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#getDatabase()
-	 */
 	@Override
 	public int getDatabase() {
 		return database;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#setDatabase(int)
-	 */
 	@Override
 	public void setDatabase(int index) {
 
@@ -95,38 +79,22 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke
 		this.database = index;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#setUsername(String)
-	 */
 	@Override
 	public void setUsername(@Nullable String username) {
 		this.username = username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#getUsername()
-	 */
 	@Nullable
 	@Override
 	public String getUsername() {
 		return this.username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#getPassword()
-	 */
 	@Override
 	public RedisPassword getPassword() {
 		return password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#setPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
 	@Override
 	public void setPassword(RedisPassword password) {
 
@@ -135,10 +103,6 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke
 		this.password = password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -160,10 +124,6 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke
 		return ObjectUtils.nullSafeEquals(password, that.password);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(socket);
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java
index 022e41b6d..87276013f 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java
@@ -72,54 +72,30 @@ public class RedisStandaloneConfiguration
 		this.port = port;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithHostAndPort#getHostName()
-	 */
 	@Override
 	public String getHostName() {
 		return hostName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithHostAndPort#getPort()
-	 */
 	@Override
 	public int getPort() {
 		return port;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithHostAndPort#setHostName(java.lang.String)
-	 */
 	@Override
 	public void setHostName(String hostName) {
 		this.hostName = hostName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithHostAndPort#setPort(int)
-	 */
 	public void setPort(int port) {
 		this.port = port;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#getDatabase()
-	 */
 	@Override
 	public int getDatabase() {
 		return database;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#setDatabase(int)
-	 */
 	@Override
 	public void setDatabase(int index) {
 
@@ -128,38 +104,22 @@ public class RedisStandaloneConfiguration
 		this.database = index;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#setUsername(String)
-	 */
 	@Override
 	public void setUsername(@Nullable String username) {
 		this.username = username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#getUsername()
-	 */
 	@Nullable
 	@Override
 	public String getUsername() {
 		return this.username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#getPassword()
-	 */
 	@Override
 	public RedisPassword getPassword() {
 		return password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#setPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
 	@Override
 	public void setPassword(RedisPassword password) {
 
@@ -168,10 +128,6 @@ public class RedisStandaloneConfiguration
 		this.password = password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -196,10 +152,6 @@ public class RedisStandaloneConfiguration
 		return ObjectUtils.nullSafeEquals(password, that.password);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(hostName);
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java
index a2c9bde31..64b826e9c 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java
@@ -111,19 +111,11 @@ public class RedisStaticMasterReplicaConfiguration implements RedisConfiguration
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#getDatabase()
-	 */
 	@Override
 	public int getDatabase() {
 		return database;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex#setDatabase(int)
-	 */
 	@Override
 	public void setDatabase(int index) {
 
@@ -133,38 +125,22 @@ public class RedisStaticMasterReplicaConfiguration implements RedisConfiguration
 		this.nodes.forEach(it -> it.setDatabase(database));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#setUsername(String)
-	 */
 	@Override
 	public void setUsername(@Nullable String username) {
 		this.username = username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithAuthentication#getUsername()
-	 */
 	@Nullable
 	@Override
 	public String getUsername() {
 		return this.username;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#getPassword()
-	 */
 	@Override
 	public RedisPassword getPassword() {
 		return password;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.WithPassword#setPassword(org.springframework.data.redis.connection.RedisPassword)
-	 */
 	@Override
 	public void setPassword(RedisPassword password) {
 
@@ -174,19 +150,11 @@ public class RedisStaticMasterReplicaConfiguration implements RedisConfiguration
 		this.nodes.forEach(it -> it.setPassword(password));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConfiguration.StaticMasterReplicaConfiguration#getNodes()
-	 */
 	@Override
 	public List<RedisStandaloneConfiguration> getNodes() {
 		return Collections.unmodifiableList(nodes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -208,10 +176,6 @@ public class RedisStaticMasterReplicaConfiguration implements RedisConfiguration
 		return ObjectUtils.nullSafeEquals(password, that.password);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(nodes);
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java
index 541e7dc81..a078becb8 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java
@@ -169,10 +169,6 @@ public interface RedisZSetCommands {
 			return Collections.unmodifiableList(weights);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
 		public boolean equals(Object o) {
 
@@ -188,10 +184,6 @@ public interface RedisZSetCommands {
 			return ObjectUtils.nullSafeEquals(this.weights, that.weights);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return ObjectUtils.nullSafeHashCode(weights);
diff --git a/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java b/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java
index 23c608556..bd015a875 100644
--- a/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java
+++ b/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java
@@ -34,29 +34,17 @@ class SentinelMasterId implements NamedNode {
 		this.name = name;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.NamedNode#getName()
-	 */
 	@NonNull
 	@Override
 	public String getName() {
 		return name;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return getName();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -69,10 +57,6 @@ class SentinelMasterId implements NamedNode {
 		return ObjectUtils.nullSafeEquals(name, that.name);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(name);
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/Converters.java b/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
index 604fcbc49..d5b934d22 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/Converters.java
@@ -494,10 +494,6 @@ abstract public class Converters {
 				this.metric = ObjectUtils.nullSafeEquals(Metrics.NEUTRAL, metric) ? DistanceUnit.METERS : metric;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-			 */
 			@Override
 			public Distance convert(Double source) {
 				return new Distance(source, metric);
@@ -519,10 +515,6 @@ abstract public class Converters {
 			this.serializer = serializer;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-		 */
 		@Override
 		public GeoResults<GeoLocation<V>> convert(GeoResults<GeoLocation<byte[]>> source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/ListConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/ListConverter.java
index 853f259d0..1a859992a 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/ListConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/ListConverter.java
@@ -40,10 +40,6 @@ public class ListConverter<S, T> implements Converter<List<S>, List<T>> {
 		this.itemConverter = itemConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public List<T> convert(List<S> source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/LongToBooleanConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/LongToBooleanConverter.java
index 8acccc631..ddeecf255 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/LongToBooleanConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/LongToBooleanConverter.java
@@ -27,10 +27,6 @@ public class LongToBooleanConverter implements Converter<Long, Boolean> {
 
 	public static final LongToBooleanConverter INSTANCE = new LongToBooleanConverter();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public Boolean convert(Long result) {
 		return result == 1;
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/MapConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/MapConverter.java
index a93491973..2d99af208 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/MapConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/MapConverter.java
@@ -42,10 +42,6 @@ public class MapConverter<S, T> implements Converter<Map<S, S>, Map<T, T>> {
 		this.itemConverter = itemConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public Map<T, T> convert(Map<S, S> source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/MapToPropertiesConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/MapToPropertiesConverter.java
index 74c5d4d06..397566fd1 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/MapToPropertiesConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/MapToPropertiesConverter.java
@@ -28,10 +28,6 @@ public enum MapToPropertiesConverter implements Converter<Map<?, ?>, Properties>
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public Properties convert(Map<?, ?> source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/SetConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/SetConverter.java
index ff2506983..a00f6660c 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/SetConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/SetConverter.java
@@ -43,10 +43,6 @@ public class SetConverter<S, T> implements Converter<Set<S>, Set<T>> {
 		this.itemConverter = itemConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public Set<T> convert(Set<S> source) {
 		return source.stream().map(itemConverter::convert).collect(Collectors.toCollection(LinkedHashSet::new));
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/StringToDataTypeConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/StringToDataTypeConverter.java
index 2a0332451..0c3098e8b 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/StringToDataTypeConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/StringToDataTypeConverter.java
@@ -26,10 +26,6 @@ import org.springframework.data.redis.connection.DataType;
  */
 public class StringToDataTypeConverter implements Converter<String, DataType> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public DataType convert(String source) {
 		return DataType.fromCode(source);
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/StringToPropertiesConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/StringToPropertiesConverter.java
index 7da5d7968..399e2e877 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/StringToPropertiesConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/StringToPropertiesConverter.java
@@ -29,10 +29,6 @@ import org.springframework.data.redis.RedisSystemException;
  */
 public class StringToPropertiesConverter implements Converter<String, Properties> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public Properties convert(String source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/StringToRedisClientInfoConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/StringToRedisClientInfoConverter.java
index 7da91f26d..721c75cc6 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/StringToRedisClientInfoConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/StringToRedisClientInfoConverter.java
@@ -37,10 +37,6 @@ public class StringToRedisClientInfoConverter implements Converter<String[], Lis
 
 	public static final StringToRedisClientInfoConverter INSTANCE = new StringToRedisClientInfoConverter();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public List<RedisClientInfo> convert(String[] lines) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/convert/TransactionResultConverter.java b/src/main/java/org/springframework/data/redis/connection/convert/TransactionResultConverter.java
index 0b912d52f..1ef64abc5 100644
--- a/src/main/java/org/springframework/data/redis/connection/convert/TransactionResultConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/convert/TransactionResultConverter.java
@@ -45,10 +45,6 @@ public class TransactionResultConverter<T> implements Converter<List<Object>, Li
 		this.exceptionConverter = exceptionConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(Object)
-	 */
 	@Override
 	public List<Object> convert(List<Object> execResults) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/DefaultJedisClientConfiguration.java b/src/main/java/org/springframework/data/redis/connection/jedis/DefaultJedisClientConfiguration.java
index f17261553..f33e5623d 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/DefaultJedisClientConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/DefaultJedisClientConfiguration.java
@@ -60,82 +60,46 @@ class DefaultJedisClientConfiguration implements JedisClientConfiguration {
 		this.connectTimeout = connectTimeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#useSsl()
-	 */
 	@Override
 	public boolean isUseSsl() {
 		return useSsl;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getSslSocketFactory()
-	 */
 	@Override
 	public Optional<SSLSocketFactory> getSslSocketFactory() {
 		return sslSocketFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getSslParameters()
-	 */
 	@Override
 	public Optional<SSLParameters> getSslParameters() {
 		return sslParameters;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getHostnameVerifier()
-	 */
 	@Override
 	public Optional<HostnameVerifier> getHostnameVerifier() {
 		return hostnameVerifier;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#usePooling()
-	 */
 	@Override
 	public boolean isUsePooling() {
 		return usePooling;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getPoolConfig()
-	 */
 	@Override
 	public Optional<GenericObjectPoolConfig> getPoolConfig() {
 		return poolConfig;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getClientName()
-	 */
 	@Override
 	public Optional<String> getClientName() {
 		return clientName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getReadTimeout()
-	 */
 	@Override
 	public Duration getReadTimeout() {
 		return readTimeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getConnectTimeout()
-	 */
 	@Override
 	public Duration getConnectTimeout() {
 		return connectTimeout;
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClientConfiguration.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClientConfiguration.java
index 8c5b5592d..12a70365a 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClientConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClientConfiguration.java
@@ -281,10 +281,6 @@ public interface JedisClientConfiguration {
 
 		private DefaultJedisClientConfigurationBuilder() {}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#useSsl()
-		 */
 		@Override
 		public JedisSslClientConfigurationBuilder useSsl() {
 
@@ -292,10 +288,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisSslClientConfigurationBuilder#sslSocketFactory(javax.net.ssl.SSLSocketFactory)
-		 */
 		@Override
 		public JedisSslClientConfigurationBuilder sslSocketFactory(SSLSocketFactory sslSocketFactory) {
 
@@ -305,10 +297,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisSslClientConfigurationBuilder#sslParameters(javax.net.ssl.SSLParameters)
-		 */
 		@Override
 		public JedisSslClientConfigurationBuilder sslParameters(SSLParameters sslParameters) {
 
@@ -318,10 +306,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisSslClientConfigurationBuilder#hostnameVerifier(javax.net.ssl.HostnameVerifier)
-		 */
 		@Override
 		public JedisSslClientConfigurationBuilder hostnameVerifier(HostnameVerifier hostnameVerifier) {
 
@@ -331,10 +315,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#usePooling()
-		 */
 		@Override
 		public JedisPoolingClientConfigurationBuilder usePooling() {
 
@@ -342,10 +322,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisPoolingClientConfigurationBuilder#poolConfig(org.apache.commons.pool2.impl.GenericObjectPoolConfig)
-		 */
 		@Override
 		public JedisPoolingClientConfigurationBuilder poolConfig(GenericObjectPoolConfig poolConfig) {
 
@@ -355,19 +331,11 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisPoolingClientConfigurationBuilder#and()
-		 */
 		@Override
 		public JedisClientConfigurationBuilder and() {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#clientName(java.lang.String)
-		 */
 		@Override
 		public JedisClientConfigurationBuilder clientName(String clientName) {
 
@@ -377,10 +345,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#readTimeout(java.time.Duration)
-		 */
 		@Override
 		public JedisClientConfigurationBuilder readTimeout(Duration readTimeout) {
 
@@ -390,10 +354,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#connectTimeout(java.time.Duration)
-		 */
 		@Override
 		public JedisClientConfigurationBuilder connectTimeout(Duration connectTimeout) {
 
@@ -403,10 +363,6 @@ public interface JedisClientConfiguration {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder#build()
-		 */
 		@Override
 		public JedisClientConfiguration build() {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
index 096e250a6..db40d16bd 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
@@ -150,10 +150,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		this.disposeClusterCommandExecutorOnClose = false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisCommands#execute(java.lang.String, byte[][])
-	 */
 	@Nullable
 	@Override
 	public Object execute(String command, byte[]... args) {
@@ -167,10 +163,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#execute(String, byte[], java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public <T> T execute(String command, byte[] key, Collection<byte[]> args) {
@@ -240,100 +232,56 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		}, keys).resultsAsList();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#geoCommands()
-	 */
 	@Override
 	public RedisGeoCommands geoCommands() {
 		return new JedisClusterGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hashCommands()
-	 */
 	@Override
 	public RedisHashCommands hashCommands() {
 		return new JedisClusterHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public RedisHyperLogLogCommands hyperLogLogCommands() {
 		return new JedisClusterHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#keyCommands()
-	 */
 	@Override
 	public RedisKeyCommands keyCommands() {
 		return doGetKeyCommands();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#stringCommands()
-	 */
 	@Override
 	public RedisStringCommands stringCommands() {
 		return new JedisClusterStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#listCommands()
-	 */
 	@Override
 	public RedisListCommands listCommands() {
 		return new JedisClusterListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#setCommands()
-	 */
 	@Override
 	public RedisSetCommands setCommands() {
 		return new JedisClusterSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#streamCommands()
-	 */
 	@Override
 	public RedisStreamCommands streamCommands() {
 		return new JedisClusterStreamCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#zSetCommands()
-	 */
 	@Override
 	public RedisZSetCommands zSetCommands() {
 		return new JedisClusterZSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#serverCommands()
-	 */
 	@Override
 	public RedisClusterServerCommands serverCommands() {
 		return new JedisClusterServerCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#scriptingCommands()
-	 */
 	@Override
 	public RedisScriptingCommands scriptingCommands() {
 		return new JedisClusterScriptingCommands(this);
@@ -343,91 +291,51 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		return new JedisClusterKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#keys(org.springframework.data.redis.connection.RedisClusterNode, byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(RedisClusterNode node, byte[] pattern) {
 		return doGetKeyCommands().keys(node, pattern);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#scan(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(RedisClusterNode node, ScanOptions options) {
 		return doGetKeyCommands().scan(node, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#randomKey(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public byte[] randomKey(RedisClusterNode node) {
 		return doGetKeyCommands().randomKey(node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#multi()
-	 */
 	@Override
 	public void multi() {
 		throw new InvalidDataAccessApiUsageException("MULTI is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#exec()
-	 */
 	@Override
 	public List<Object> exec() {
 		throw new InvalidDataAccessApiUsageException("EXEC is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#discard()
-	 */
 	@Override
 	public void discard() {
 		throw new InvalidDataAccessApiUsageException("DISCARD is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#watch(byte[][])
-	 */
 	@Override
 	public void watch(byte[]... keys) {
 		throw new InvalidDataAccessApiUsageException("WATCH is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#unwatch()
-	 */
 	@Override
 	public void unwatch() {
 		throw new InvalidDataAccessApiUsageException("UNWATCH is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#isSubscribed()
-	 */
 	@Override
 	public boolean isSubscribed() {
 		return (subscription != null && subscription.isAlive());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#getSubscription()
-	 */
 	@Override
 	public Subscription getSubscription() {
 		return subscription;
@@ -474,10 +382,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#select(int)
-	 */
 	@Override
 	public void select(int dbIndex) {
 
@@ -486,10 +390,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#echo(byte[])
-	 */
 	@Override
 	public byte[] echo(byte[] message) {
 
@@ -500,10 +400,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#ping()
-	 */
 	@Override
 	public String ping() {
 
@@ -512,10 +408,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#ping(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public String ping(RedisClusterNode node) {
 
@@ -527,10 +419,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 	 * --> Cluster Commands
 	 */
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterSetSlot(org.springframework.data.redis.connection.RedisClusterNode, int, org.springframework.data.redis.connection.RedisClusterCommands.AddSlots)
-	 */
 	@Override
 	public void clusterSetSlot(RedisClusterNode node, int slot, AddSlots mode) {
 
@@ -558,10 +446,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetKeysInSlot(int, java.lang.Integer)
-	 */
 	@Override
 	public List<byte[]> clusterGetKeysInSlot(int slot, Integer count) {
 
@@ -575,10 +459,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterAddSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public void clusterAddSlots(RedisClusterNode node, int... slots) {
 
@@ -586,10 +466,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				(JedisClusterCommandCallback<String>) client -> client.clusterAddSlots(slots), node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterAddSlots(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public void clusterAddSlots(RedisClusterNode node, SlotRange range) {
 
@@ -598,10 +474,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		clusterAddSlots(node, range.getSlotsArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterCountKeysInSlot(int)
-	 */
 	@Override
 	public Long clusterCountKeysInSlot(int slot) {
 
@@ -612,10 +484,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterDeleteSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public void clusterDeleteSlots(RedisClusterNode node, int... slots) {
 
@@ -624,10 +492,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterDeleteSlotsInRange(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public void clusterDeleteSlotsInRange(RedisClusterNode node, SlotRange range) {
 
@@ -636,10 +500,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		clusterDeleteSlots(node, range.getSlotsArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterForget(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterForget(RedisClusterNode node) {
 
@@ -651,10 +511,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				(JedisClusterCommandCallback<String>) client -> client.clusterForget(node.getId()), nodes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterMeet(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterMeet(RedisClusterNode node) {
 
@@ -666,10 +522,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				(JedisClusterCommandCallback<String>) client -> client.clusterMeet(node.getHost(), node.getPort()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterReplicate(RedisClusterNode master, RedisClusterNode replica) {
 
@@ -680,10 +532,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterSlotForKey(byte[])
-	 */
 	@Override
 	public Integer clusterGetSlotForKey(byte[] key) {
 
@@ -691,19 +539,11 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				.clusterKeySlot(JedisConverters.toString(key)).intValue()).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetNodeForKey(byte[])
-	 */
 	@Override
 	public RedisClusterNode clusterGetNodeForKey(byte[] key) {
 		return topologyProvider.getTopology().getKeyServingMasterNode(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetNodeForSlot(int)
-	 */
 	@Override
 	public RedisClusterNode clusterGetNodeForSlot(int slot) {
 
@@ -716,19 +556,11 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetNodes()
-	 */
 	@Override
 	public Set<RedisClusterNode> clusterGetNodes() {
 		return topologyProvider.getTopology().getNodes();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetSlaves(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Set<RedisClusterNode> clusterGetSlaves(RedisClusterNode master) {
 
@@ -742,10 +574,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 				.getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetMasterSlaveMap()
-	 */
 	@Override
 	public Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap() {
 
@@ -766,10 +594,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetClusterInfo()
-	 */
 	@Override
 	public ClusterInfo clusterGetClusterInfo() {
 
@@ -788,10 +612,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		return translated != null ? translated : new RedisSystemException(ex.getMessage(), ex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#close()
-	 */
 	@Override
 	public void close() throws DataAccessException {
 
@@ -806,64 +626,36 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 		closed = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return closed;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getNativeConnection()
-	 */
 	@Override
 	public JedisCluster getNativeConnection() {
 		return cluster;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isQueueing()
-	 */
 	@Override
 	public boolean isQueueing() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isPipelined()
-	 */
 	@Override
 	public boolean isPipelined() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#openPipeline()
-	 */
 	@Override
 	public void openPipeline() {
 		throw new UnsupportedOperationException("Pipeline is currently not supported for JedisClusterConnection.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#closePipeline()
-	 */
 	@Override
 	public List<Object> closePipeline() throws RedisPipelineException {
 		throw new UnsupportedOperationException("Pipeline is currently not supported for JedisClusterConnection.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getSentinelConnection()
-	 */
 	@Override
 	public RedisSentinelConnection getSentinelConnection() {
 		throw new UnsupportedOperationException("Sentinel is currently not supported for JedisClusterConnection.");
@@ -927,10 +719,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ClusterNodeResourceProvider#getResourceForSpecificNode(org.springframework.data.redis.connection.RedisClusterNode)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Jedis getResourceForSpecificNode(RedisClusterNode node) {
@@ -977,10 +765,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ClusterNodeResourceProvider#returnResourceForSpecificNode(org.springframework.data.redis.connection.RedisClusterNode, java.lang.Object)
-		 */
 		@Override
 		public void returnResourceForSpecificNode(RedisClusterNode node, Object client) {
 			((Jedis) client).close();
@@ -1028,10 +812,6 @@ public class JedisClusterConnection implements DefaultedRedisClusterConnection {
 			this.cacheTimeMs = cacheTimeout.toMillis();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.ClusterTopologyProvider#getTopology()
-		 */
 		@Override
 		public ClusterTopology getTopology() {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterGeoCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterGeoCommands.java
index 8ee7a8132..d891a991d 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterGeoCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterGeoCommands.java
@@ -49,10 +49,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], org.springframework.data.geo.Point, byte[])
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Point point, byte[] member) {
 
@@ -67,10 +63,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.util.Map)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Map<byte[], Point> memberCoordinateMap) {
 
@@ -89,10 +81,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.lang.Iterable)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Iterable<GeoLocation<byte[]>> locations) {
 
@@ -111,10 +99,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[])
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2) {
 
@@ -130,10 +114,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[], org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2, Metric metric) {
 
@@ -151,10 +131,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoHash(byte[], byte[][])
-	 */
 	@Override
 	public List<String> geoHash(byte[] key, byte[]... members) {
 
@@ -169,10 +145,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoPos(byte[], byte[][])
-	 */
 	@Override
 	public List<Point> geoPos(byte[] key, byte[]... members) {
 
@@ -187,10 +159,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
 
@@ -206,10 +174,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
 
@@ -229,10 +193,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
 
@@ -249,10 +209,6 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,
 			GeoRadiusCommandArgs args) {
@@ -274,29 +230,17 @@ class JedisClusterGeoCommands implements RedisGeoCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRemove(byte[], byte[][])
-	 */
 	@Override
 	public Long geoRemove(byte[] key, byte[]... members) {
 		return connection.zRem(key, members);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearch(byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoSearch(byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchCommandArgs args) {
 		throw new UnsupportedOperationException("GEOSEARCH not supported through Jedis");
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearchStore(byte[], byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long geoSearchStore(byte[] destKey, byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchStoreCommandArgs args) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java
index 43ffee1cd..ed0af7520 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java
@@ -47,10 +47,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		this.connection = connection;
 	}
 
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.redis.connection.RedisHashCommands#hSet(byte[], byte[], byte[])
-	*/
 	@Override
 	public Boolean hSet(byte[] key, byte[] field, byte[] value) {
 
@@ -65,10 +61,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSetNX(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSetNX(byte[] key, byte[] field, byte[] value) {
 
@@ -83,10 +75,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGet(byte[], byte[])
-	 */
 	@Override
 	public byte[] hGet(byte[] key, byte[] field) {
 
@@ -100,10 +88,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMGet(byte[], byte[][])
-	 */
 	@Override
 	public List<byte[]> hMGet(byte[] key, byte[]... fields) {
 
@@ -117,10 +101,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMSet(byte[], java.util.Map)
-	 */
 	@Override
 	public void hMSet(byte[] key, Map<byte[], byte[]> hashes) {
 
@@ -134,10 +114,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], long)
-	 */
 	@Override
 	public Long hIncrBy(byte[] key, byte[] field, long delta) {
 
@@ -151,10 +127,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], double)
-	 */
 	@Override
 	public Double hIncrBy(byte[] key, byte[] field, double delta) {
 
@@ -168,10 +140,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] hRandField(byte[] key) {
@@ -185,10 +153,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[])
-	 */
 	@Nullable
 	@Override
 	public Entry<byte[], byte[]> hRandFieldWithValues(byte[] key) {
@@ -203,10 +167,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<byte[]> hRandField(byte[] key, long count) {
@@ -220,10 +180,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<Entry<byte[], byte[]>> hRandFieldWithValues(byte[] key, long count) {
@@ -236,10 +192,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hExists(byte[], byte[])
-	 */
 	@Override
 	public Boolean hExists(byte[] key, byte[] field) {
 
@@ -253,10 +205,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hDel(byte[], byte[][])
-	 */
 	@Override
 	public Long hDel(byte[] key, byte[]... fields) {
 
@@ -270,10 +218,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hLen(byte[])
-	 */
 	@Override
 	public Long hLen(byte[] key) {
 
@@ -286,10 +230,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hKeys(byte[])
-	 */
 	@Override
 	public Set<byte[]> hKeys(byte[] key) {
 
@@ -302,10 +242,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hVals(byte[])
-	 */
 	@Override
 	public List<byte[]> hVals(byte[] key) {
 
@@ -318,10 +254,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGetAll(byte[])
-	 */
 	@Override
 	public Map<byte[], byte[]> hGetAll(byte[] key) {
 
@@ -334,10 +266,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<byte[], byte[]>> hScan(byte[] key, ScanOptions options) {
 
@@ -357,10 +285,6 @@ class JedisClusterHashCommands implements RedisHashCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hStrLen(byte[], byte[])
-	 */
 	@Nullable
 	@Override
 	public Long hStrLen(byte[] key, byte[] field) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHyperLogLogCommands.java
index 0639cd47d..d8e78cc18 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHyperLogLogCommands.java
@@ -35,10 +35,6 @@ class JedisClusterHyperLogLogCommands implements RedisHyperLogLogCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long pfAdd(byte[] key, byte[]... values) {
 
@@ -52,10 +48,6 @@ class JedisClusterHyperLogLogCommands implements RedisHyperLogLogCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfCount(byte[][])
-	 */
 	@Override
 	public Long pfCount(byte[]... keys) {
 
@@ -74,10 +66,6 @@ class JedisClusterHyperLogLogCommands implements RedisHyperLogLogCommands {
 		throw new InvalidDataAccessApiUsageException("All keys must map to same slot for pfcount in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfMerge(byte[], byte[][])
-	 */
 	@Override
 	public void pfMerge(byte[] destinationKey, byte[]... sourceKeys) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java
index f63c269f9..ed77ab58b 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterKeyCommands.java
@@ -65,10 +65,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#copy(byte[], byte[])
-	 */
 	@Override
 	public Boolean copy(byte[] sourceKey, byte[] targetKey, boolean replace) {
 
@@ -78,10 +74,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		return connection.getCluster().copy(sourceKey, targetKey, replace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#del(byte[][])
-	 */
 	@Override
 	public Long del(byte[]... keys) {
 
@@ -102,10 +94,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.resultsAsList().size();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#unlink(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long unlink(byte[]... keys) {
@@ -116,10 +104,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.mapToLong(val -> val).sum();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#type(byte[])
-	 */
 	@Override
 	public DataType type(byte[] key) {
 
@@ -132,10 +116,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#touch(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long touch(byte[]... keys) {
@@ -146,10 +126,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.mapToLong(val -> val).sum();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#keys(byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(byte[] pattern) {
 
@@ -166,10 +142,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		return keys;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#keys(org.springframework.data.redis.connection.RedisClusterNode, byte[])
-	 */
 	public Set<byte[]> keys(RedisClusterNode node, byte[] pattern) {
 
 		Assert.notNull(node, "RedisClusterNode must not be null!");
@@ -180,10 +152,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(ScanOptions options) {
 		throw new InvalidDataAccessApiUsageException("Scan is not supported across multiple nodes within a cluster");
@@ -219,10 +187,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				}, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#randomKey()
-	 */
 	@Override
 	public byte[] randomKey() {
 
@@ -248,10 +212,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#randomKey(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	public byte[] randomKey(RedisClusterNode node) {
 
 		Assert.notNull(node, "RedisClusterNode must not be null!");
@@ -261,10 +221,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#rename(byte[], byte[])
-	 */
 	@Override
 	public void rename(byte[] oldKey, byte[] newKey) {
 
@@ -290,10 +246,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#renameNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean renameNX(byte[] sourceKey, byte[] targetKey) {
 
@@ -320,10 +272,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		return Boolean.FALSE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expire(byte[], long)
-	 */
 	@Override
 	public Boolean expire(byte[] key, long seconds) {
 
@@ -339,10 +287,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpire(byte[], long)
-	 */
 	@Override
 	public Boolean pExpire(byte[] key, long millis) {
 
@@ -355,10 +299,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expireAt(byte[], long)
-	 */
 	@Override
 	public Boolean expireAt(byte[] key, long unixTime) {
 
@@ -371,10 +311,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpireAt(byte[], long)
-	 */
 	@Override
 	public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {
 
@@ -387,10 +323,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#persist(byte[])
-	 */
 	@Override
 	public Boolean persist(byte[] key) {
 
@@ -403,19 +335,11 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#move(byte[], int)
-	 */
 	@Override
 	public Boolean move(byte[] key, int dbIndex) {
 		throw new UnsupportedOperationException("Cluster mode does not allow moving keys.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[])
-	 */
 	@Override
 	public Long ttl(byte[] key) {
 
@@ -428,10 +352,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long ttl(byte[] key, TimeUnit timeUnit) {
 
@@ -444,10 +364,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[])
-	 */
 	@Override
 	public Long pTtl(byte[] key) {
 
@@ -459,10 +375,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long pTtl(byte[] key, TimeUnit timeUnit) {
 
@@ -475,10 +387,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#dump(byte[])
-	 */
 	@Override
 	public byte[] dump(byte[] key) {
 
@@ -490,10 +398,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#restore(byte[], long, byte[], boolean)
-	 */
 	@Override
 	public void restore(byte[] key, long ttlInMillis, byte[] serializedValue, boolean replace) {
 
@@ -516,10 +420,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}, connection.clusterGetNodeForKey(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters)
-	 */
 	@Override
 	public List<byte[]> sort(byte[] key, SortParameters params) {
 
@@ -532,10 +432,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters, byte[])
-	 */
 	@Override
 	public Long sort(byte[] key, SortParameters params, byte[] storeKey) {
 
@@ -560,10 +456,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 		return 0L;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long exists(byte[]... keys) {
@@ -584,10 +476,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.resultsAsList().stream().mapToLong(val -> ObjectUtils.nullSafeEquals(val, Boolean.TRUE) ? 1 : 0).sum();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#encoding(byte[])
-	 */
 	@Nullable
 	@Override
 	public ValueEncoding encodingOf(byte[] key) {
@@ -600,10 +488,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.mapValue(JedisConverters::toEncoding);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#idletime(byte[])
-	 */
 	@Nullable
 	@Override
 	public Duration idletime(byte[] key) {
@@ -616,10 +500,6 @@ class JedisClusterKeyCommands implements RedisKeyCommands {
 				.mapValue(Converters::secondsToDuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#refcount(byte[])
-	 */
 	@Nullable
 	@Override
 	public Long refcount(byte[] key) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterListCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterListCommands.java
index 4467d37f5..f6e140547 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterListCommands.java
@@ -45,10 +45,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPush(byte[], byte[][])
-	 */
 	@Override
 	public Long rPush(byte[] key, byte[]... values) {
 
@@ -61,10 +57,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#l{lPos(byte[], byte[], java.lang.Integer, java.lang.Integer)
-	 */
 	@Override
 	public List<Long> lPos(byte[] key, byte[] element, @Nullable Integer rank, @Nullable Integer count) {
 
@@ -89,10 +81,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPush(byte[], byte[][])
-	 */
 	@Override
 	public Long lPush(byte[] key, byte[]... values) {
 
@@ -107,10 +95,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPushX(byte[], byte[])
-	 */
 	@Override
 	public Long rPushX(byte[] key, byte[] value) {
 
@@ -124,10 +108,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPushX(byte[], byte[])
-	 */
 	@Override
 	public Long lPushX(byte[] key, byte[] value) {
 
@@ -141,10 +121,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lLen(byte[])
-	 */
 	@Override
 	public Long lLen(byte[] key) {
 
@@ -157,10 +133,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRange(byte[], long, long)
-	 */
 	@Override
 	public List<byte[]> lRange(byte[] key, long start, long end) {
 
@@ -173,10 +145,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lTrim(byte[], long, long)
-	 */
 	@Override
 	public void lTrim(byte[] key, long start, long end) {
 
@@ -189,10 +157,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lIndex(byte[], long)
-	 */
 	@Override
 	public byte[] lIndex(byte[] key, long index) {
 
@@ -205,10 +169,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lInsert(byte[], org.springframework.data.redis.connection.RedisListCommands.Position, byte[], byte[])
-	 */
 	@Override
 	public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) {
 
@@ -221,10 +181,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public byte[] lMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to) {
 
@@ -241,10 +197,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction, double)
-	 */
 	@Override
 	public byte[] bLMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to, double timeout) {
 
@@ -261,10 +213,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lSet(byte[], long, byte[])
-	 */
 	@Override
 	public void lSet(byte[] key, long index, byte[] value) {
 
@@ -278,10 +226,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRem(byte[], long, byte[])
-	 */
 	@Override
 	public Long lRem(byte[] key, long count, byte[] value) {
 
@@ -295,10 +239,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[])
-	 */
 	@Override
 	public byte[] lPop(byte[] key) {
 
@@ -311,10 +251,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> lPop(byte[] key, long count) {
 
@@ -327,10 +263,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[])
-	 */
 	@Override
 	public byte[] rPop(byte[] key) {
 
@@ -343,10 +275,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> rPop(byte[] key, long count) {
 
@@ -359,10 +287,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bLPop(int timeout, byte[]... keys) {
 
@@ -384,10 +308,6 @@ class JedisClusterListCommands implements RedisListCommands {
 				.getFirstNonNullNotEmptyOrDefault(Collections.<byte[]> emptyList());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bRPop(int timeout, byte[]... keys) {
 
@@ -409,10 +329,6 @@ class JedisClusterListCommands implements RedisListCommands {
 				.getFirstNonNullNotEmptyOrDefault(Collections.<byte[]> emptyList());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPopLPush(byte[], byte[])
-	 */
 	@Override
 	public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 
@@ -432,10 +348,6 @@ class JedisClusterListCommands implements RedisListCommands {
 		return val;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPopLPush(int, byte[], byte[])
-	 */
 	@Override
 	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterScriptingCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterScriptingCommands.java
index d89f55d38..f93781055 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterScriptingCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterScriptingCommands.java
@@ -39,10 +39,6 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptFlush()
-	 */
 	@Override
 	public void scriptFlush() {
 
@@ -54,10 +50,6 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptKill()
-	 */
 	@Override
 	public void scriptKill() {
 
@@ -69,10 +61,6 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptLoad(byte[])
-	 */
 	@Override
 	public String scriptLoad(byte[] script) {
 
@@ -89,19 +77,11 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptExists(java.lang.String[])
-	 */
 	@Override
 	public List<Boolean> scriptExists(String... scriptShas) {
 		throw new InvalidDataAccessApiUsageException("ScriptExists is not supported in cluster environment.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#eval(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T eval(byte[] script, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
@@ -116,19 +96,11 @@ class JedisClusterScriptingCommands implements RedisScriptingCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(java.lang.String, org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(String scriptSha, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 		return evalSha(JedisConverters.toBytes(scriptSha), returnType, numKeys, keysAndArgs);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T evalSha(byte[] scriptSha, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterServerCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterServerCommands.java
index d88f60b09..a86795735 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterServerCommands.java
@@ -51,48 +51,28 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#bgReWriteAof(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgReWriteAof(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::bgrewriteaof, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgReWriteAof()
-	 */
 	@Override
 	public void bgReWriteAof() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::bgrewriteaof);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgSave()
-	 */
 	@Override
 	public void bgSave() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::bgsave);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#bgSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgSave(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::bgsave, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#lastSave()
-	 */
 	@Override
 	public Long lastSave() {
 
@@ -106,37 +86,21 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return result.get(0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#lastSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Long lastSave(RedisClusterNode node) {
 		return executeCommandOnSingleNode(BinaryJedis::lastsave, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#save()
-	 */
 	@Override
 	public void save() {
 		executeCommandOnAllNodes(BinaryJedis::save);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#save(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void save(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::save, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#dbSize()
-	 */
 	@Override
 	public Long dbSize() {
 
@@ -153,56 +117,32 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return size;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#dbSize(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Long dbSize(RedisClusterNode node) {
 		return executeCommandOnSingleNode(BinaryJedis::dbSize, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushDb()
-	 */
 	@Override
 	public void flushDb() {
 		executeCommandOnAllNodes(BinaryJedis::flushDB);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#flushDb(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void flushDb(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::flushDB, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushAll()
-	 */
 	@Override
 	public void flushAll() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::flushAll);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#flushAll(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void flushAll(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::flushAll, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info()
-	 */
 	@Override
 	public Properties info() {
 
@@ -222,19 +162,11 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return infos;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Properties info(RedisClusterNode node) {
 		return JedisConverters.toProperties(executeCommandOnSingleNode(BinaryJedis::info, node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Properties info(String section) {
 
@@ -256,10 +188,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return infos;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Properties info(RedisClusterNode node, String section) {
 
@@ -268,29 +196,17 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return JedisConverters.toProperties(executeCommandOnSingleNode(client -> client.info(section), node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown()
-	 */
 	@Override
 	public void shutdown() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::shutdown);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#shutdown(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void shutdown(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::shutdown, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown(org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption)
-	 */
 	@Override
 	public void shutdown(ShutdownOption option) {
 
@@ -302,10 +218,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		throw new IllegalArgumentException("Shutdown with options is not supported for jedis.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(String pattern) {
 
@@ -328,10 +240,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return Converters.toProperties(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#getConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(RedisClusterNode node, String pattern) {
 
@@ -344,10 +252,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(String param, String value) {
 
@@ -358,10 +262,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) client -> client.configSet(param, value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#setConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(RedisClusterNode node, String param, String value) {
 
@@ -371,48 +271,28 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		executeCommandOnSingleNode(client -> client.configSet(param, value), node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void resetConfigStats() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::configResetStat);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#rewriteConfig()
-	 */
 	@Override
 	public void rewriteConfig() {
 		connection.getClusterCommandExecutor()
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) BinaryJedis::configRewrite);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#resetConfigStats(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void resetConfigStats(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::configResetStat, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#rewriteConfig(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void rewriteConfig(RedisClusterNode node) {
 		executeCommandOnSingleNode(BinaryJedis::configRewrite, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#time(TimeUnit)
-	 */
 	@Override
 	public Long time(TimeUnit timeUnit) {
 
@@ -421,10 +301,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				timeUnit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#time(org.springframework.data.redis.connection.RedisClusterNode, TimeUnit)
-	 */
 	@Override
 	public Long time(RedisClusterNode node, TimeUnit timeUnit) {
 
@@ -433,10 +309,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				timeUnit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#killClient(java.lang.String, int)
-	 */
 	@Override
 	public void killClient(String host, int port) {
 
@@ -447,28 +319,16 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) client -> client.clientKill(hostAndPort));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setClientName(byte[])
-	 */
 	@Override
 	public void setClientName(byte[] name) {
 		throw new InvalidDataAccessApiUsageException("CLIENT SETNAME is not supported in cluster environment.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
-	 */
 	@Override
 	public String getClientName() {
 		throw new InvalidDataAccessApiUsageException("CLIENT GETNAME is not supported in cluster environment.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 
@@ -482,10 +342,6 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#getClientList(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList(RedisClusterNode node) {
 
@@ -493,39 +349,23 @@ class JedisClusterServerCommands implements RedisClusterServerCommands {
 				.toListOfRedisClientInformation(executeCommandOnSingleNode(Jedis::clientList, node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
-	 */
 	@Override
 	public void slaveOf(String host, int port) {
 		throw new InvalidDataAccessApiUsageException(
 				"SlaveOf is not supported in cluster environment. Please use CLUSTER REPLICATE.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 		throw new InvalidDataAccessApiUsageException(
 				"SlaveOf is not supported in cluster environment. Please use CLUSTER REPLICATE.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option) {
 		migrate(key, target, dbIndex, option, Long.MAX_VALUE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption, long)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option, long timeout) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java
index 7031e39ad..c694a99cb 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterSetCommands.java
@@ -49,10 +49,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long sAdd(byte[] key, byte[]... values) {
 
@@ -67,10 +63,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRem(byte[], byte[][])
-	 */
 	@Override
 	public Long sRem(byte[] key, byte[]... values) {
 
@@ -85,10 +77,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[])
-	 */
 	@Override
 	public byte[] sPop(byte[] key) {
 
@@ -101,10 +89,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sPop(byte[] key, long count) {
 
@@ -117,10 +101,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMove(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) {
 
@@ -144,10 +124,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return Boolean.FALSE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sCard(byte[])
-	 */
 	@Override
 	public Long sCard(byte[] key) {
 
@@ -160,10 +136,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sIsMember(byte[], byte[])
-	 */
 	@Override
 	public Boolean sIsMember(byte[] key, byte[] value) {
 
@@ -177,10 +149,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMIsMember(byte[], byte[]...)
-	 */
 	@Override
 	public List<Boolean> sMIsMember(byte[] key, byte[]... values) {
 
@@ -195,10 +163,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sInter(byte[]... keys) {
 
@@ -241,10 +205,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return result.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sInterStore(byte[] destKey, byte[]... keys) {
 
@@ -269,10 +229,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return sAdd(destKey, result.toArray(new byte[result.size()][]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sUnion(byte[]... keys) {
 
@@ -305,10 +261,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return result.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sUnionStore(byte[] destKey, byte[]... keys) {
 
@@ -333,10 +285,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return sAdd(destKey, result.toArray(new byte[result.size()][]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sDiff(byte[]... keys) {
 
@@ -372,10 +320,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return values.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sDiffStore(byte[] destKey, byte[]... keys) {
 
@@ -401,10 +345,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		return sAdd(destKey, diff.toArray(new byte[diff.size()][]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMembers(byte[])
-	 */
 	@Override
 	public Set<byte[]> sMembers(byte[] key) {
 
@@ -417,10 +357,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[])
-	 */
 	@Override
 	public byte[] sRandMember(byte[] key) {
 
@@ -433,10 +369,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sRandMember(byte[] key, long count) {
 
@@ -453,10 +385,6 @@ class JedisClusterSetCommands implements RedisSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStreamCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStreamCommands.java
index 20e9ba9fe..986ce81b3 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStreamCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStreamCommands.java
@@ -51,10 +51,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAck(byte[], String, org.springframework.data.redis.connection.stream.RecordId[])
-	 */
 	@Override
 	public Long xAck(byte[] key, String group, RecordId... recordIds) {
 
@@ -70,10 +66,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAdd(MapRecord, XAddOptions)
-	 */
 	@Override
 	public RecordId xAdd(MapRecord<byte[], byte[], byte[]> record, XAddOptions options) {
 
@@ -94,19 +86,11 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaimJustId(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<RecordId> xClaimJustId(byte[] key, String group, String newOwner, XClaimOptions options) {
 		throw new UnsupportedOperationException("JedisCluster does not support xClaimJustId.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaim(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<ByteRecord> xClaim(byte[] key, String group, String newOwner, XClaimOptions options) {
 
@@ -127,10 +111,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xDel(byte[], java.lang.String[])
-	 */
 	@Override
 	public Long xDel(byte[] key, RecordId... recordIds) {
 
@@ -144,19 +124,11 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset) {
 		return xGroupCreate(key, groupName, readOffset, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String, boolean)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset, boolean mkStream) {
 
@@ -172,10 +144,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDelConsumer(byte[], org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean xGroupDelConsumer(byte[] key, Consumer consumer) {
 
@@ -190,10 +158,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDestroy(byte[], java.lang.String)
-	 */
 	@Override
 	public Boolean xGroupDestroy(byte[] key, String groupName) {
 
@@ -207,37 +171,21 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfo(byte[])
-	 */
 	@Override
 	public StreamInfo.XInfoStream xInfo(byte[] key) {
 		throw new UnsupportedOperationException("JedisCluster does not support XINFO.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoGroups(byte[])
-	 */
 	@Override
 	public StreamInfo.XInfoGroups xInfoGroups(byte[] key) {
 		throw new UnsupportedOperationException("JedisCluster does not support XINFO.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoConsumers(byte[], java.lang.String)
-	 */
 	@Override
 	public StreamInfo.XInfoConsumers xInfoConsumers(byte[] key, String groupName) {
 		throw new UnsupportedOperationException("JedisCluster does not support XINFO.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xLen(byte[])
-	 */
 	@Override
 	public Long xLen(byte[] key) {
 
@@ -250,19 +198,11 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary xPending(byte[] key, String groupName) {
 		throw new UnsupportedOperationException("Jedis does not support returning PendingMessagesSummary.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XPendingOptions)
-	 */
 	@Override
 	public PendingMessages xPending(byte[] key, String groupName, XPendingOptions options) {
 
@@ -285,10 +225,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRange(byte[] key, Range<String> range, RedisZSetCommands.Limit limit) {
 
@@ -306,10 +242,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRead(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xRead(StreamReadOptions readOptions, StreamOffset<byte[]>... streams) {
 
@@ -333,10 +265,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xReadGroup(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xReadGroup(Consumer consumer, StreamReadOptions readOptions,
 			StreamOffset<byte[]>... streams) {
@@ -363,10 +291,6 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRevRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRevRange(byte[] key, Range<String> range, RedisZSetCommands.Limit limit) {
 
@@ -384,19 +308,11 @@ class JedisClusterStreamCommands implements RedisStreamCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count) {
 		return xTrim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long, boolean)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count, boolean approximateTrimming) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java
index c986c257f..d08fab789 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStringCommands.java
@@ -53,10 +53,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[])
-	 */
 	@Override
 	public byte[] get(byte[] key) {
 
@@ -69,10 +65,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getDel(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] getDel(byte[] key) {
@@ -86,10 +78,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getEx(byte[], org.springframework.data.redis.core.types.Expiration)
-	 */
 	@Nullable
 	@Override
 	public byte[] getEx(byte[] key, Expiration expiration) {
@@ -104,10 +92,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getSet(byte[], byte[])
-	 */
 	@Override
 	public byte[] getSet(byte[] key, byte[] value) {
 
@@ -121,10 +105,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mGet(byte[][])
-	 */
 	@Override
 	public List<byte[]> mGet(byte[]... keys) {
 
@@ -140,10 +120,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 				.resultsAsListSortBy(keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[])
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value) {
 
@@ -157,10 +133,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[], org.springframework.data.redis.core.types.Expiration, org.springframework.data.redis.connection.RedisStringCommands.SetOptions)
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value, Expiration expiration, SetOption option) {
 
@@ -179,10 +151,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean setNX(byte[] key, byte[] value) {
 
@@ -196,10 +164,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean setEx(byte[] key, long seconds, byte[] value) {
 
@@ -217,10 +181,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#pSetEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean pSetEx(byte[] key, long milliseconds, byte[] value) {
 
@@ -234,10 +194,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSet(java.util.Map)
-	 */
 	@Override
 	public Boolean mSet(Map<byte[], byte[]> tuples) {
 
@@ -260,10 +216,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSetNX(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNX(Map<byte[], byte[]> tuples) {
 
@@ -286,10 +238,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incr(byte[])
-	 */
 	@Override
 	public Long incr(byte[] key) {
 
@@ -302,10 +250,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], long)
-	 */
 	@Override
 	public Long incrBy(byte[] key, long value) {
 
@@ -318,10 +262,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], double)
-	 */
 	@Override
 	public Double incrBy(byte[] key, double value) {
 
@@ -334,10 +274,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decr(byte[])
-	 */
 	@Override
 	public Long decr(byte[] key) {
 
@@ -350,10 +286,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decrBy(byte[], long)
-	 */
 	@Override
 	public Long decrBy(byte[] key, long value) {
 
@@ -366,10 +298,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#append(byte[], byte[])
-	 */
 	@Override
 	public Long append(byte[] key, byte[] value) {
 
@@ -383,10 +311,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getRange(byte[], long, long)
-	 */
 	@Override
 	public byte[] getRange(byte[] key, long start, long end) {
 
@@ -399,10 +323,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setRange(byte[], byte[], long)
-	 */
 	@Override
 	public void setRange(byte[] key, byte[] value, long offset) {
 
@@ -416,10 +336,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getBit(byte[], long)
-	 */
 	@Override
 	public Boolean getBit(byte[] key, long offset) {
 
@@ -432,10 +348,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setBit(byte[], long, boolean)
-	 */
 	@Override
 	public Boolean setBit(byte[] key, long offset, boolean value) {
 
@@ -448,10 +360,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[])
-	 */
 	@Override
 	public Long bitCount(byte[] key) {
 
@@ -464,10 +372,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[], long, long)
-	 */
 	@Override
 	public Long bitCount(byte[] key, long start, long end) {
 
@@ -480,10 +384,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitfield(byte[], BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitField(byte[] key, BitFieldSubCommands subCommands) {
 
@@ -499,10 +399,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitOp(org.springframework.data.redis.connection.RedisStringCommands.BitOperation, byte[], byte[][])
-	 */
 	@Override
 	public Long bitOp(BitOperation op, byte[] destination, byte[]... keys) {
 
@@ -522,10 +418,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		throw new InvalidDataAccessApiUsageException("BITOP is only supported for same slot keys in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitPos(byte[], boolean, org.springframework.data.Range)
-	 */
 	@Override
 	public Long bitPos(byte[] key, boolean bit, Range<Long> range) {
 
@@ -545,10 +437,6 @@ class JedisClusterStringCommands implements RedisStringCommands {
 		return Long.class.cast(connection.execute("BITPOS", key, args));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#strLen(byte[])
-	 */
 	@Override
 	public Long strLen(byte[] key) {
 		Assert.notNull(key, "Key must not be null!");
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
index e044a3219..59c5ee437 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
@@ -55,10 +55,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], double, byte[])
-	 */
 	@Override
 	public Boolean zAdd(byte[] key, double score, byte[] value, ZAddArgs args) {
 
@@ -73,10 +69,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], java.util.Set, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Long zAdd(byte[] key, Set<Tuple> tuples, ZAddArgs args) {
 
@@ -90,10 +82,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRem(byte[], byte[][])
-	 */
 	@Override
 	public Long zRem(byte[] key, byte[]... values) {
 
@@ -109,10 +97,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zIncrBy(byte[], double, byte[])
-	 */
 	@Override
 	public Double zIncrBy(byte[] key, double increment, byte[] value) {
 
@@ -126,10 +110,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[])
-	 */
 	@Override
 	public byte[] zRandMember(byte[] key) {
 
@@ -142,10 +122,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> zRandMember(byte[] key, long count) {
 
@@ -158,10 +134,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[])
-	 */
 	@Override
 	public Tuple zRandMemberWithScore(byte[] key) {
 
@@ -176,10 +148,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[], long)
-	 */
 	@Override
 	public List<Tuple> zRandMemberWithScore(byte[] key, long count) {
 
@@ -194,10 +162,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRank(byte[] key, byte[] value) {
 
@@ -211,10 +175,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRevRank(byte[] key, byte[] value) {
 
@@ -228,10 +188,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRange(byte[] key, long start, long end) {
 
@@ -244,10 +200,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -268,10 +220,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -291,10 +239,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -315,10 +259,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zCount(byte[] key, Range range) {
 
@@ -335,10 +275,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zLexCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zLexCount(byte[] key, Range range) {
 
@@ -355,10 +291,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMin(byte[] key) {
@@ -373,10 +305,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMin(byte[] key, long count) {
@@ -390,10 +318,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMin(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
@@ -408,10 +332,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMax(byte[] key) {
@@ -426,10 +346,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMax(byte[] key, long count) {
@@ -443,10 +359,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMax(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
@@ -461,10 +373,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, Range range) {
 
@@ -482,10 +390,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -505,10 +409,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key, Range range, Limit limit) {
 
@@ -529,10 +429,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByLex(byte[] key, Range range) {
 
@@ -549,10 +445,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
 
@@ -573,10 +465,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeWithScores(byte[] key, long start, long end) {
 
@@ -589,10 +477,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, double min, double max) {
 
@@ -605,10 +489,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], double, double)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, double min, double max) {
 
@@ -621,10 +501,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, double min, double max, long offset, long count) {
 
@@ -642,10 +518,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) {
 
@@ -663,10 +535,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRange(byte[] key, long start, long end) {
 
@@ -679,10 +547,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeWithScores(byte[] key, long start, long end) {
 
@@ -695,10 +559,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, double min, double max) {
 
@@ -711,10 +571,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], double, double)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, double min, double max) {
 
@@ -727,10 +583,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, double min, double max, long offset, long count) {
 
@@ -748,10 +600,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], double, double, long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) {
 
@@ -769,10 +617,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], double, double)
-	 */
 	@Override
 	public Long zCount(byte[] key, double min, double max) {
 
@@ -785,10 +629,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCard(byte[])
-	 */
 	@Override
 	public Long zCard(byte[] key) {
 
@@ -801,10 +641,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScore(byte[], byte[])
-	 */
 	@Override
 	public Double zScore(byte[] key, byte[] value) {
 
@@ -818,10 +654,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zMScore(byte[], byte[][])
-	 */
 	@Override
 	public List<Double> zMScore(byte[] key, byte[][] values) {
 
@@ -835,10 +667,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRange(byte[], long, long)
-	 */
 	@Override
 	public Long zRemRange(byte[] key, long start, long end) {
 
@@ -851,10 +679,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], double, double)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, double min, double max) {
 
@@ -867,10 +691,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zDiff(byte[]... sets) {
 
@@ -888,10 +708,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZDIFF can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zDiffWithScores(byte[]... sets) {
 
@@ -909,10 +725,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZDIFF can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zDiffStore(byte[] destKey, byte[]... sets) {
 
@@ -933,10 +745,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZDIFFSTORE can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zInter(byte[]... sets) {
 
@@ -954,10 +762,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZINTER can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(byte[]... sets) {
 
@@ -975,10 +779,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZINTER can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -1000,10 +800,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZINTER can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, byte[]... sets) {
 
@@ -1025,10 +821,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZINTERSTORE can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -1052,10 +844,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new IllegalArgumentException("ZINTERSTORE can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.redis.connection.RedisZSetCommands#zUnion(byte[][])
-	*/
 	@Override
 	public Set<byte[]> zUnion(byte[]... sets) {
 
@@ -1073,10 +861,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZUNION can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(byte[]... sets) {
 
@@ -1094,10 +878,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZUNION can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -1119,10 +899,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZUNION can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, byte[]... sets) {
 
@@ -1144,10 +920,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZUNIONSTORE can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -1173,10 +945,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		throw new InvalidDataAccessApiUsageException("ZUNIONSTORE can only be executed when all keys map to the same slot");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Tuple> zScan(byte[] key, ScanOptions options) {
 
@@ -1197,10 +965,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max) {
 
@@ -1213,10 +977,6 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max, long offset, long count) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
index 9a8563915..26b016bb3 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
@@ -188,109 +188,61 @@ public class JedisConnection extends AbstractRedisConnection {
 		return exception != null ? exception : new RedisSystemException(ex.getMessage(), ex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#keyCommands()
-	 */
 	@Override
 	public RedisKeyCommands keyCommands() {
 		return new JedisKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#streamCommands()
-	 */
 	@Override
 	public RedisStreamCommands streamCommands() {
 		return new JedisStreamCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#stringCommands()
-	 */
 	@Override
 	public RedisStringCommands stringCommands() {
 		return new JedisStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#listCommands()
-	 */
 	@Override
 	public RedisListCommands listCommands() {
 		return new JedisListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#setCommands()
-	 */
 	@Override
 	public RedisSetCommands setCommands() {
 		return new JedisSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#zSetCommands()
-	 */
 	@Override
 	public RedisZSetCommands zSetCommands() {
 		return new JedisZSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hashCommands()
-	 */
 	@Override
 	public RedisHashCommands hashCommands() {
 		return new JedisHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#geoCommands()
-	 */
 	@Override
 	public RedisGeoCommands geoCommands() {
 		return new JedisGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#scriptingCommands()
-	 */
 	@Override
 	public RedisScriptingCommands scriptingCommands() {
 		return new JedisScriptingCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#serverCommands()
-	 */
 	@Override
 	public RedisServerCommands serverCommands() {
 		return new JedisServerCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public RedisHyperLogLogCommands hyperLogLogCommands() {
 		return new JedisHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisCommands#execute(java.lang.String, byte[][])
-	 */
 	@Override
 	public Object execute(String command, byte[]... args) {
 		return execute(command, args, Connection::getOne, JedisClientUtils::getResponse);
@@ -322,10 +274,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.AbstractRedisConnection#close()
-	 */
 	@Override
 	public void close() throws DataAccessException {
 
@@ -352,46 +300,26 @@ public class JedisConnection extends AbstractRedisConnection {
 			throw convertJedisAccessException(exc);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getNativeConnection()
-	 */
 	@Override
 	public Jedis getNativeConnection() {
 		return jedis;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return doWithJedis(it -> !it.isConnected());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isQueueing()
-	 */
 	@Override
 	public boolean isQueueing() {
 		return JedisClientUtils.isInMulti(jedis);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isPipelined()
-	 */
 	@Override
 	public boolean isPipelined() {
 		return (pipeline != null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#openPipeline()
-	 */
 	@Override
 	public void openPipeline() {
 		if (pipeline == null) {
@@ -399,10 +327,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#closePipeline()
-	 */
 	@Override
 	public List<Object> closePipeline() {
 		if (pipeline != null) {
@@ -459,10 +383,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		txResults.add(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#echo(byte[])
-	 */
 	@Override
 	public byte[] echo(byte[] message) {
 
@@ -471,19 +391,11 @@ public class JedisConnection extends AbstractRedisConnection {
 		return invoke().just(BinaryJedis::echo, MultiKeyPipelineBase::echo, message);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#ping()
-	 */
 	@Override
 	public String ping() {
 		return invoke().just(BinaryJedis::ping, MultiKeyPipelineBase::ping);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#discard()
-	 */
 	@Override
 	public void discard() {
 		try {
@@ -500,10 +412,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#exec()
-	 */
 	@Override
 	public List<Object> exec() {
 		try {
@@ -607,10 +515,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		return JedisResultBuilder.<T, T> forResponse(response).buildStatusResult();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#multi()
-	 */
 	@Override
 	public void multi() {
 		if (isQueueing()) {
@@ -627,28 +531,16 @@ public class JedisConnection extends AbstractRedisConnection {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#select(int)
-	 */
 	@Override
 	public void select(int dbIndex) {
 		invokeStatus().just(BinaryJedis::select, MultiKeyPipelineBase::select, dbIndex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#unwatch()
-	 */
 	@Override
 	public void unwatch() {
 		doWithJedis((Consumer<Jedis>) BinaryJedis::unwatch);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisTxCommands#watch(byte[][])
-	 */
 	@Override
 	public void watch(byte[]... keys) {
 		if (isQueueing()) {
@@ -670,37 +562,21 @@ public class JedisConnection extends AbstractRedisConnection {
 	// Pub/Sub functionality
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#publish(byte[], byte[])
-	 */
 	@Override
 	public Long publish(byte[] channel, byte[] message) {
 		return invoke().just(BinaryJedis::publish, MultiKeyPipelineBase::publish, channel, message);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#getSubscription()
-	 */
 	@Override
 	public Subscription getSubscription() {
 		return subscription;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#isSubscribed()
-	 */
 	@Override
 	public boolean isSubscribed() {
 		return (subscription != null && subscription.isAlive());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#pSubscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void pSubscribe(MessageListener listener, byte[]... patterns) {
 
@@ -722,10 +598,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#subscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void subscribe(MessageListener listener, byte[]... channels) {
 
@@ -757,10 +629,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		this.convertPipelineAndTxResults = convertPipelineAndTxResults;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.AbstractRedisConnection#isActive(org.springframework.data.redis.connection.RedisNode)
-	 */
 	@Override
 	protected boolean isActive(RedisNode node) {
 
@@ -779,10 +647,6 @@ public class JedisConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.AbstractRedisConnection#getSentinelConnection(org.springframework.data.redis.connection.RedisNode)
-	 */
 	@Override
 	protected JedisSentinelConnection getSentinelConnection(RedisNode sentinel) {
 		return new JedisSentinelConnection(getJedis(sentinel));
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
index c77be1d64..ee367bdaf 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
@@ -313,10 +313,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		return connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	public void afterPropertiesSet() {
 
 		clientConfig = createClientConfig(getDatabase(), getRedisUsername(), getRedisPassword());
@@ -466,10 +462,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		return new JedisCluster(hostAndPort, this.clientConfig, redirects, poolConfig);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	public void destroy() {
 
 		if (getUsePool() && pool != null) {
@@ -500,10 +492,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		this.destroyed = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionFactory#getConnection()
-	 */
 	public RedisConnection getConnection() {
 
 		assertInitialized();
@@ -526,10 +514,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		return postProcessConnection(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionFactory#getClusterConnection()
-	 */
 	@Override
 	public RedisClusterConnection getClusterConnection() {
 
@@ -541,10 +525,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		return new JedisClusterConnection(this.cluster, this.clusterCommandExecutor, this.topologyProvider);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return EXCEPTION_TRANSLATION.translate(ex);
 	}
@@ -888,9 +868,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 		return RedisConfiguration.isClusterConfiguration(configuration);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionFactory#getSentinelConnection()
-	 */
 	@Override
 	public RedisSentinelConnection getSentinelConnection() {
 
@@ -1002,9 +979,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			return configuration;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#isUseSsl()
-		 */
 		@Override
 		public boolean isUseSsl() {
 			return useSsl;
@@ -1014,10 +988,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.useSsl = useSsl;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getSslSocketFactory()
-		 */
 		@Override
 		public Optional<SSLSocketFactory> getSslSocketFactory() {
 			return Optional.ofNullable(sslSocketFactory);
@@ -1027,10 +997,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.sslSocketFactory = sslSocketFactory;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getSslParameters()
-		 */
 		@Override
 		public Optional<SSLParameters> getSslParameters() {
 			return Optional.ofNullable(sslParameters);
@@ -1040,10 +1006,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.sslParameters = sslParameters;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getHostnameVerifier()
-		 */
 		@Override
 		public Optional<HostnameVerifier> getHostnameVerifier() {
 			return Optional.ofNullable(hostnameVerifier);
@@ -1053,10 +1015,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.hostnameVerifier = hostnameVerifier;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#isUsePooling()
-		 */
 		@Override
 		public boolean isUsePooling() {
 			return usePooling;
@@ -1066,10 +1024,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.usePooling = usePooling;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getPoolConfig()
-		 */
 		@Override
 		public Optional<GenericObjectPoolConfig> getPoolConfig() {
 			return Optional.ofNullable(poolConfig);
@@ -1079,10 +1033,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.poolConfig = poolConfig;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getClientName()
-		 */
 		@Override
 		public Optional<String> getClientName() {
 			return Optional.ofNullable(clientName);
@@ -1092,10 +1042,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.clientName = clientName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getReadTimeout()
-		 */
 		@Override
 		public Duration getReadTimeout() {
 			return readTimeout;
@@ -1105,10 +1051,6 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 			this.readTimeout = readTimeout;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.jedis.JedisClientConfiguration#getConnectTimeout()
-		 */
 		@Override
 		public Duration getConnectTimeout() {
 			return connectTimeout;
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverter.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverter.java
index fefc9a68d..506c2ac1d 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverter.java
@@ -41,10 +41,6 @@ import org.springframework.data.redis.TooManyClusterRedirectionsException;
  */
 public class JedisExceptionConverter implements Converter<Exception, DataAccessException> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	public DataAccessException convert(Exception ex) {
 
 		if (ex instanceof DataAccessException) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisGeoCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisGeoCommands.java
index f5cb4ca4b..be07a636a 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisGeoCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisGeoCommands.java
@@ -48,10 +48,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], org.springframework.data.geo.Point, byte[])
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Point point, byte[] member) {
 
@@ -63,10 +59,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				member);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.util.Map)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Map<byte[], Point> memberCoordinateMap) {
 
@@ -82,10 +74,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 		return connection.invoke().just(BinaryJedis::geoadd, MultiKeyPipelineBase::geoadd, key, redisGeoCoordinateMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.lang.Iterable)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Iterable<GeoLocation<byte[]>> locations) {
 
@@ -101,10 +89,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 		return connection.invoke().just(BinaryJedis::geoadd, MultiKeyPipelineBase::geoadd, key, redisGeoCoordinateMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[])
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2) {
 
@@ -118,10 +102,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.get(distanceConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[], org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2, Metric metric) {
 
@@ -137,10 +117,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.get(distanceConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoHash(byte[], byte[][])
-	 */
 	@Override
 	public List<String> geoHash(byte[] key, byte[]... members) {
 
@@ -152,10 +128,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.toList(JedisConverters::toString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoPos(byte[], byte[][])
-	 */
 	@Override
 	public List<Point> geoPos(byte[] key, byte[]... members) {
 
@@ -167,10 +139,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.toList(JedisConverters::toPoint);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
 
@@ -187,10 +155,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.get(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
 
@@ -209,10 +173,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				.get(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
 
@@ -228,10 +188,6 @@ class JedisGeoCommands implements RedisGeoCommands {
 				member, radius.getValue(), geoUnit).get(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,
 			GeoRadiusCommandArgs args) {
@@ -250,29 +206,17 @@ class JedisGeoCommands implements RedisGeoCommands {
 				member, radius.getValue(), geoUnit, geoRadiusParam).get(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRemove(byte[], byte[][])
-	 */
 	@Override
 	public Long geoRemove(byte[] key, byte[]... members) {
 		return connection.zSetCommands().zRem(key, members);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearch(byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoSearch(byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchCommandArgs args) {
 		throw new UnsupportedOperationException("GEOSEARCH not supported through Jedis");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearchStore(byte[], byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long geoSearchStore(byte[] destKey, byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchStoreCommandArgs args) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java
index 9adb2486d..213f207ab 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisHashCommands.java
@@ -48,10 +48,6 @@ class JedisHashCommands implements RedisHashCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSet(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSet(byte[] key, byte[] field, byte[] value) {
 
@@ -63,10 +59,6 @@ class JedisHashCommands implements RedisHashCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSetNX(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSetNX(byte[] key, byte[] field, byte[] value) {
 
@@ -78,10 +70,6 @@ class JedisHashCommands implements RedisHashCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hDel(byte[], byte[][])
-	 */
 	@Override
 	public Long hDel(byte[] key, byte[]... fields) {
 
@@ -91,10 +79,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hdel, MultiKeyPipelineBase::hdel, key, fields);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hExists(byte[], byte[])
-	 */
 	@Override
 	public Boolean hExists(byte[] key, byte[] field) {
 
@@ -104,10 +88,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hexists, MultiKeyPipelineBase::hexists, key, field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGet(byte[], byte[])
-	 */
 	@Override
 	public byte[] hGet(byte[] key, byte[] field) {
 
@@ -117,10 +97,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hget, MultiKeyPipelineBase::hget, key, field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGetAll(byte[])
-	 */
 	@Override
 	public Map<byte[], byte[]> hGetAll(byte[] key) {
 
@@ -129,10 +105,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hgetAll, MultiKeyPipelineBase::hgetAll, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] hRandField(byte[] key) {
@@ -142,10 +114,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hrandfield, MultiKeyPipelineBase::hrandfield, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[])
-	 */
 	@Nullable
 	@Override
 	public Entry<byte[], byte[]> hRandFieldWithValues(byte[] key) {
@@ -157,10 +125,6 @@ class JedisHashCommands implements RedisHashCommands {
 				.get(it -> it.isEmpty() ? null : it.entrySet().iterator().next());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<byte[]> hRandField(byte[] key, long count) {
@@ -170,10 +134,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hrandfield, MultiKeyPipelineBase::hrandfield, key, count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<Entry<byte[], byte[]>> hRandFieldWithValues(byte[] key, long count) {
@@ -190,10 +150,6 @@ class JedisHashCommands implements RedisHashCommands {
 				});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], long)
-	 */
 	@Override
 	public Long hIncrBy(byte[] key, byte[] field, long delta) {
 
@@ -203,10 +159,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hincrBy, MultiKeyPipelineBase::hincrBy, key, field, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], double)
-	 */
 	@Override
 	public Double hIncrBy(byte[] key, byte[] field, double delta) {
 
@@ -216,10 +168,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hincrByFloat, MultiKeyPipelineBase::hincrByFloat, key, field, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hKeys(byte[])
-	 */
 	@Override
 	public Set<byte[]> hKeys(byte[] key) {
 
@@ -228,10 +176,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hkeys, MultiKeyPipelineBase::hkeys, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hLen(byte[])
-	 */
 	@Override
 	public Long hLen(byte[] key) {
 
@@ -240,10 +184,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hlen, MultiKeyPipelineBase::hlen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMGet(byte[], byte[][])
-	 */
 	@Override
 	public List<byte[]> hMGet(byte[] key, byte[]... fields) {
 
@@ -253,10 +193,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hmget, MultiKeyPipelineBase::hmget, key, fields);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMSet(byte[], java.util.Map)
-	 */
 	@Override
 	public void hMSet(byte[] key, Map<byte[], byte[]> hashes) {
 
@@ -266,10 +202,6 @@ class JedisHashCommands implements RedisHashCommands {
 		connection.invokeStatus().just(BinaryJedis::hmset, MultiKeyPipelineBase::hmset, key, hashes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hVals(byte[])
-	 */
 	@Override
 	public List<byte[]> hVals(byte[] key) {
 
@@ -278,10 +210,6 @@ class JedisHashCommands implements RedisHashCommands {
 		return connection.invoke().just(BinaryJedis::hvals, MultiKeyPipelineBase::hvals, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<byte[], byte[]>> hScan(byte[] key, ScanOptions options) {
 		return hScan(key, 0, options);
@@ -322,10 +250,6 @@ class JedisHashCommands implements RedisHashCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hStrLen(byte[], byte[])
-	 */
 	@Nullable
 	@Override
 	public Long hStrLen(byte[] key, byte[] field) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisHyperLogLogCommands.java
index 0bed1d88b..5c9559ef7 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisHyperLogLogCommands.java
@@ -34,10 +34,6 @@ class JedisHyperLogLogCommands implements RedisHyperLogLogCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long pfAdd(byte[] key, byte[]... values) {
 
@@ -47,10 +43,6 @@ class JedisHyperLogLogCommands implements RedisHyperLogLogCommands {
 		return connection.invoke().just(BinaryJedis::pfadd, MultiKeyPipelineBase::pfadd, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfCount(byte[][])
-	 */
 	@Override
 	public Long pfCount(byte[]... keys) {
 
@@ -60,10 +52,6 @@ class JedisHyperLogLogCommands implements RedisHyperLogLogCommands {
 		return connection.invoke().just(BinaryJedis::pfcount, MultiKeyPipelineBase::pfcount, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfMerge(byte[], byte[][])
-	 */
 	@Override
 	public void pfMerge(byte[] destinationKey, byte[]... sourceKeys) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java
index a6c07703f..eea9ec452 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisKeyCommands.java
@@ -56,10 +56,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[])
-	 */
 	@Override
 	public Boolean exists(byte[] key) {
 
@@ -68,10 +64,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::exists, MultiKeyPipelineBase::exists, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long exists(byte[]... keys) {
@@ -82,10 +74,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::exists, MultiKeyPipelineBase::exists, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#del(byte[][])
-	 */
 	@Override
 	public Long del(byte[]... keys) {
 
@@ -95,10 +83,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::del, MultiKeyPipelineBase::del, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#copy(byte[], byte[])
-	 */
 	public Boolean copy(byte[] sourceKey, byte[] targetKey, boolean replace) {
 
 		Assert.notNull(sourceKey, "source key must not be null!");
@@ -107,10 +91,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::copy, MultiKeyPipelineBase::copy, sourceKey, targetKey, replace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#unlink(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long unlink(byte[]... keys) {
@@ -120,10 +100,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::unlink, MultiKeyPipelineBase::unlink, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#type(byte[])
-	 */
 	@Override
 	public DataType type(byte[] key) {
 
@@ -133,10 +109,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.stringToDataType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#touch(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long touch(byte[]... keys) {
@@ -146,10 +118,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::touch, MultiKeyPipelineBase::touch, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#keys(byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(byte[] pattern) {
 
@@ -158,10 +126,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::keys, MultiKeyPipelineBase::keys, pattern);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(ScanOptions options) {
 		return scan(0, options != null ? options : ScanOptions.NONE);
@@ -214,19 +178,11 @@ class JedisKeyCommands implements RedisKeyCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#randomKey()
-	 */
 	@Override
 	public byte[] randomKey() {
 		return connection.invoke().just(BinaryJedis::randomBinaryKey, MultiKeyPipelineBase::randomKeyBinary);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#rename(byte[], byte[])
-	 */
 	@Override
 	public void rename(byte[] oldKey, byte[] newKey) {
 
@@ -236,10 +192,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		connection.invokeStatus().just(BinaryJedis::rename, MultiKeyPipelineBase::rename, oldKey, newKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#renameNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean renameNX(byte[] sourceKey, byte[] targetKey) {
 
@@ -250,10 +202,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expire(byte[], long)
-	 */
 	@Override
 	public Boolean expire(byte[] key, long seconds) {
 
@@ -267,10 +215,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpire(byte[], long)
-	 */
 	@Override
 	public Boolean pExpire(byte[] key, long millis) {
 
@@ -280,10 +224,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expireAt(byte[], long)
-	 */
 	@Override
 	public Boolean expireAt(byte[] key, long unixTime) {
 
@@ -293,10 +233,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpireAt(byte[], long)
-	 */
 	@Override
 	public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {
 
@@ -306,10 +242,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#persist(byte[])
-	 */
 	@Override
 	public Boolean persist(byte[] key) {
 
@@ -319,10 +251,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#move(byte[], int)
-	 */
 	@Override
 	public Boolean move(byte[] key, int dbIndex) {
 
@@ -332,10 +260,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(JedisConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[])
-	 */
 	@Override
 	public Long ttl(byte[] key) {
 
@@ -344,10 +268,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::ttl, MultiKeyPipelineBase::ttl, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long ttl(byte[] key, TimeUnit timeUnit) {
 
@@ -357,10 +277,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(Converters.secondsToTimeUnit(timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[])
-	 */
 	@Override
 	public Long pTtl(byte[] key) {
 
@@ -369,10 +285,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::pttl, MultiKeyPipelineBase::pttl, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long pTtl(byte[] key, TimeUnit timeUnit) {
 
@@ -382,10 +294,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(Converters.millisecondsToTimeUnit(timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters)
-	 */
 	@Override
 	public List<byte[]> sort(byte[] key, SortParameters params) {
 
@@ -400,10 +308,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::sort, MultiKeyPipelineBase::sort, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters, byte[])
-	 */
 	@Override
 	public Long sort(byte[] key, @Nullable SortParameters params, byte[] storeKey) {
 
@@ -418,10 +322,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::sort, MultiKeyPipelineBase::sort, key, storeKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#dump(byte[])
-	 */
 	@Override
 	public byte[] dump(byte[] key) {
 
@@ -430,10 +330,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(BinaryJedis::dump, MultiKeyPipelineBase::dump, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#restore(byte[], long, byte[], boolean)
-	 */
 	@Override
 	public void restore(byte[] key, long ttlInMillis, byte[] serializedValue, boolean replace) {
 
@@ -455,10 +351,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				serializedValue);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#encoding(byte[])
-	 */
 	@Nullable
 	@Override
 	public ValueEncoding encodingOf(byte[] key) {
@@ -469,10 +361,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.getOrElse(JedisConverters::toEncoding, () -> RedisValueEncoding.VACANT);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#idletime(byte[])
-	 */
 	@Nullable
 	@Override
 	public Duration idletime(byte[] key) {
@@ -483,10 +371,6 @@ class JedisKeyCommands implements RedisKeyCommands {
 				.get(Converters::secondsToDuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#refcount(byte[])
-	 */
 	@Nullable
 	@Override
 	public Long refcount(byte[] key) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisListCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisListCommands.java
index c3df142ba..071d81531 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisListCommands.java
@@ -42,10 +42,6 @@ class JedisListCommands implements RedisListCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPush(byte[], byte[][])
-	 */
 	@Override
 	public Long rPush(byte[] key, byte[]... values) {
 
@@ -54,10 +50,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::rpush, MultiKeyPipelineBase::rpush, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#l{lPos(byte[], byte[], java.lang.Integer, java.lang.Integer)
-	 */
 	@Override
 	public List<Long> lPos(byte[] key, byte[] element, @Nullable Integer rank, @Nullable Integer count) {
 
@@ -77,10 +69,6 @@ class JedisListCommands implements RedisListCommands {
 				.getOrElse(Collections::singletonList, Collections::emptyList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPush(byte[], byte[][])
-	 */
 	@Override
 	public Long lPush(byte[] key, byte[]... values) {
 
@@ -91,10 +79,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lpush, MultiKeyPipelineBase::lpush, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPushX(byte[], byte[])
-	 */
 	@Override
 	public Long rPushX(byte[] key, byte[] value) {
 
@@ -104,10 +88,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::rpushx, MultiKeyPipelineBase::rpushx, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPushX(byte[], byte[])
-	 */
 	@Override
 	public Long lPushX(byte[] key, byte[] value) {
 
@@ -117,10 +97,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lpushx, MultiKeyPipelineBase::lpushx, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lLen(byte[])
-	 */
 	@Override
 	public Long lLen(byte[] key) {
 
@@ -129,10 +105,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::llen, MultiKeyPipelineBase::llen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRange(byte[], long, long)
-	 */
 	@Override
 	public List<byte[]> lRange(byte[] key, long start, long end) {
 
@@ -141,10 +113,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lrange, MultiKeyPipelineBase::lrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lTrim(byte[], long, long)
-	 */
 	@Override
 	public void lTrim(byte[] key, long start, long end) {
 
@@ -153,10 +121,6 @@ class JedisListCommands implements RedisListCommands {
 		connection.invokeStatus().just(BinaryJedis::ltrim, MultiKeyPipelineBase::ltrim, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lIndex(byte[], long)
-	 */
 	@Override
 	public byte[] lIndex(byte[] key, long index) {
 
@@ -165,10 +129,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lindex, MultiKeyPipelineBase::lindex, key, index);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lInsert(byte[], org.springframework.data.redis.connection.RedisListCommands.Position, byte[], byte[])
-	 */
 	@Override
 	public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) {
 
@@ -178,10 +138,6 @@ class JedisListCommands implements RedisListCommands {
 				JedisConverters.toListPosition(where), pivot, value);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public byte[] lMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to) {
 
@@ -194,10 +150,6 @@ class JedisListCommands implements RedisListCommands {
 				ListDirection.valueOf(from.name()), ListDirection.valueOf(to.name()));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction, double)
-	 */
 	@Override
 	public byte[] bLMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to, double timeout) {
 
@@ -210,10 +162,6 @@ class JedisListCommands implements RedisListCommands {
 				ListDirection.valueOf(from.name()), ListDirection.valueOf(to.name()), timeout);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lSet(byte[], long, byte[])
-	 */
 	@Override
 	public void lSet(byte[] key, long index, byte[] value) {
 
@@ -223,10 +171,6 @@ class JedisListCommands implements RedisListCommands {
 		connection.invokeStatus().just(BinaryJedis::lset, MultiKeyPipelineBase::lset, key, index, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRem(byte[], long, byte[])
-	 */
 	@Override
 	public Long lRem(byte[] key, long count, byte[] value) {
 
@@ -236,10 +180,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lrem, MultiKeyPipelineBase::lrem, key, count, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[])
-	 */
 	@Override
 	public byte[] lPop(byte[] key) {
 
@@ -248,10 +188,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lpop, MultiKeyPipelineBase::lpop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> lPop(byte[] key, long count) {
 
@@ -260,10 +196,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::lpop, MultiKeyPipelineBase::lpop, key, (int) count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[])
-	 */
 	@Override
 	public byte[] rPop(byte[] key) {
 
@@ -272,10 +204,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::rpop, MultiKeyPipelineBase::rpop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> rPop(byte[] key, long count) {
 
@@ -284,10 +212,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::rpop, MultiKeyPipelineBase::rpop, key, (int) count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bLPop(int timeout, byte[]... keys) {
 
@@ -297,10 +221,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::blpop, MultiKeyPipelineBase::blpop, bXPopArgs(timeout, keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bRPop(int timeout, byte[]... keys) {
 
@@ -310,10 +230,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::brpop, MultiKeyPipelineBase::brpop, bXPopArgs(timeout, keys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPopLPush(byte[], byte[])
-	 */
 	@Override
 	public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 
@@ -323,10 +239,6 @@ class JedisListCommands implements RedisListCommands {
 		return connection.invoke().just(BinaryJedis::rpoplpush, MultiKeyPipelineBase::rpoplpush, srcKey, dstKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPopLPush(int, byte[], byte[])
-	 */
 	@Override
 	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisResult.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisResult.java
index 164c749fb..d6a639d9f 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisResult.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisResult.java
@@ -53,11 +53,6 @@ class JedisResult<T, R> extends FutureResult<Response<?>> {
 		this.convertPipelineAndTxResults = convertPipelineAndTxResults;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.FutureResult#get()
-	 * @return
-	 */
 	@Nullable
 	@Override
 	@SuppressWarnings("unchecked")
@@ -65,10 +60,6 @@ class JedisResult<T, R> extends FutureResult<Response<?>> {
 		return (T) getResultHolder().get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.FutureResult#conversionRequired()
-	 */
 	public boolean conversionRequired() {
 		return convertPipelineAndTxResults;
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisScriptingCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisScriptingCommands.java
index ca21da256..7b310870b 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisScriptingCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisScriptingCommands.java
@@ -35,10 +35,6 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptFlush()
-	 */
 	@Override
 	public void scriptFlush() {
 
@@ -47,10 +43,6 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 		connection.invoke().just(BinaryJedis::scriptFlush);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptKill()
-	 */
 	@Override
 	public void scriptKill() {
 
@@ -59,10 +51,6 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 		connection.invoke().just(BinaryJedis::scriptKill);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptLoad(byte[])
-	 */
 	@Override
 	public String scriptLoad(byte[] script) {
 
@@ -72,10 +60,6 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 		return connection.invoke().from(it -> it.scriptLoad(script)).get(JedisConverters::toString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptExists(java.lang.String[])
-	 */
 	@Override
 	public List<Boolean> scriptExists(String... scriptSha1) {
 
@@ -86,10 +70,6 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 		return connection.invoke().just(it -> it.scriptExists(scriptSha1));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#eval(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T eval(byte[] script, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
@@ -102,19 +82,11 @@ class JedisScriptingCommands implements RedisScriptingCommands {
 				.getOrElse(converter, () -> converter.convert(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(java.lang.String, org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(String scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 		return evalSha(JedisConverters.toBytes(scriptSha1), returnType, numKeys, keysAndArgs);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T evalSha(byte[] scriptSha, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnection.java
index 72ad2ed8a..7cf08d7e2 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnection.java
@@ -50,10 +50,6 @@ public class JedisSentinelConnection implements RedisSentinelConnection {
 		init();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#failover(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public void failover(NamedNode master) {
 
@@ -62,19 +58,11 @@ public class JedisSentinelConnection implements RedisSentinelConnection {
 		jedis.sentinelFailover(master.getName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#masters()
-	 */
 	@Override
 	public List<RedisServer> masters() {
 		return JedisConverters.toListOfRedisServer(jedis.sentinelMasters());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#slaves(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public List<RedisServer> slaves(NamedNode master) {
 
@@ -93,10 +81,6 @@ public class JedisSentinelConnection implements RedisSentinelConnection {
 		return JedisConverters.toListOfRedisServer(jedis.sentinelSlaves(masterName));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#remove(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public void remove(NamedNode master) {
 
@@ -114,10 +98,6 @@ public class JedisSentinelConnection implements RedisSentinelConnection {
 		jedis.sentinelRemove(masterName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#monitor(org.springframework.data.redis.connection.RedisServer)
-	 */
 	@Override
 	public void monitor(RedisServer server) {
 
@@ -130,10 +110,6 @@ public class JedisSentinelConnection implements RedisSentinelConnection {
 				server.getQuorum().intValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	public void close() throws IOException {
 		jedis.close();
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisServerCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisServerCommands.java
index f0ea3f1cf..fd4e59f9c 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisServerCommands.java
@@ -45,82 +45,46 @@ class JedisServerCommands implements RedisServerCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgReWriteAof()
-	 */
 	@Override
 	public void bgReWriteAof() {
 		connection.invoke().just(BinaryJedis::bgrewriteaof, MultiKeyPipelineBase::bgrewriteaof);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgSave()
-	 */
 	@Override
 	public void bgSave() {
 		connection.invokeStatus().just(BinaryJedis::bgsave, MultiKeyPipelineBase::bgsave);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#lastSave()
-	 */
 	@Override
 	public Long lastSave() {
 		return connection.invoke().just(BinaryJedis::lastsave, MultiKeyPipelineBase::lastsave);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#save()
-	 */
 	@Override
 	public void save() {
 		connection.invokeStatus().just(BinaryJedis::save, MultiKeyPipelineBase::save);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#dbSize()
-	 */
 	@Override
 	public Long dbSize() {
 		return connection.invoke().just(BinaryJedis::dbSize, MultiKeyPipelineBase::dbSize);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushDb()
-	 */
 	@Override
 	public void flushDb() {
 		connection.invokeStatus().just(BinaryJedis::flushDB, MultiKeyPipelineBase::flushDB);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushAll()
-	 */
 	@Override
 	public void flushAll() {
 		connection.invokeStatus().just(BinaryJedis::flushAll, MultiKeyPipelineBase::flushAll);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info()
-	 */
 	@Override
 	public Properties info() {
 		return connection.invoke().from(BinaryJedis::info, MultiKeyPipelineBase::info).get(JedisConverters::toProperties);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Properties info(String section) {
 
@@ -130,19 +94,11 @@ class JedisServerCommands implements RedisServerCommands {
 				.get(JedisConverters::toProperties);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown()
-	 */
 	@Override
 	public void shutdown() {
 		connection.invokeStatus().just(BinaryJedis::shutdown, MultiKeyPipelineBase::shutdown);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown(org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption)
-	 */
 	@Override
 	public void shutdown(ShutdownOption option) {
 
@@ -156,10 +112,6 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.getJedis().shutdown(saveMode);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(String pattern) {
 
@@ -169,10 +121,6 @@ class JedisServerCommands implements RedisServerCommands {
 				.get(Converters::toProperties);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(String param, String value) {
 
@@ -182,28 +130,16 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(Jedis::configSet, MultiKeyPipelineBase::configSet, param, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void resetConfigStats() {
 		connection.invokeStatus().just(BinaryJedis::configResetStat, MultiKeyPipelineBase::configResetStat);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void rewriteConfig() {
 		connection.invokeStatus().just(Jedis::configRewrite);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#time(TimeUnit)
-	 */
 	@Override
 	public Long time(TimeUnit timeUnit) {
 
@@ -213,10 +149,6 @@ class JedisServerCommands implements RedisServerCommands {
 				.get((List<String> source) -> JedisConverters.toTime(source, timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#killClient(java.lang.String, int)
-	 */
 	@Override
 	public void killClient(String host, int port) {
 
@@ -229,10 +161,6 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(it -> it.clientKill(String.format("%s:%s", host, port)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setClientName(byte[])
-	 */
 	@Override
 	public void setClientName(byte[] name) {
 
@@ -245,10 +173,6 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(it -> it.clientSetname(name));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
-	 */
 	@Override
 	public String getClientName() {
 
@@ -259,10 +183,6 @@ class JedisServerCommands implements RedisServerCommands {
 		return connection.invokeStatus().just(Jedis::clientGetname);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 
@@ -273,10 +193,6 @@ class JedisServerCommands implements RedisServerCommands {
 		return connection.invokeStatus().from(Jedis::clientList).get(JedisConverters::toListOfRedisClientInformation);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
-	 */
 	@Override
 	public void slaveOf(String host, int port) {
 
@@ -289,10 +205,6 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(it -> it.slaveof(host, port));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 
@@ -303,19 +215,11 @@ class JedisServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(BinaryJedis::slaveofNoOne);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option) {
 		migrate(key, target, dbIndex, option, Long.MAX_VALUE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption, long)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option, long timeout) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java
index 5a3394240..959bb3b77 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSetCommands.java
@@ -43,10 +43,6 @@ class JedisSetCommands implements RedisSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long sAdd(byte[] key, byte[]... values) {
 
@@ -57,10 +53,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sadd, MultiKeyPipelineBase::sadd, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sCard(byte[])
-	 */
 	@Override
 	public Long sCard(byte[] key) {
 
@@ -69,10 +61,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::scard, MultiKeyPipelineBase::scard, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sDiff(byte[]... keys) {
 
@@ -82,10 +70,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sdiff, MultiKeyPipelineBase::sdiff, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sDiffStore(byte[] destKey, byte[]... keys) {
 
@@ -96,10 +80,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sdiffstore, MultiKeyPipelineBase::sdiffstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sInter(byte[]... keys) {
 
@@ -109,10 +89,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sinter, MultiKeyPipelineBase::sinter, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sInterStore(byte[] destKey, byte[]... keys) {
 
@@ -123,10 +99,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sinterstore, MultiKeyPipelineBase::sinterstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sIsMember(byte[], byte[])
-	 */
 	@Override
 	public Boolean sIsMember(byte[] key, byte[] value) {
 
@@ -136,10 +108,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sismember, MultiKeyPipelineBase::sismember, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMIsMember(byte[], byte[]...)
-	 */
 	@Override
 	public List<Boolean> sMIsMember(byte[] key, byte[]... values) {
 
@@ -150,10 +118,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::smismember, MultiKeyPipelineBase::smismember, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMembers(byte[])
-	 */
 	@Override
 	public Set<byte[]> sMembers(byte[] key) {
 
@@ -162,10 +126,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::smembers, MultiKeyPipelineBase::smembers, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMove(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) {
 
@@ -177,10 +137,6 @@ class JedisSetCommands implements RedisSetCommands {
 				.get(JedisConverters::toBoolean);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[])
-	 */
 	@Override
 	public byte[] sPop(byte[] key) {
 
@@ -189,10 +145,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::spop, MultiKeyPipelineBase::spop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sPop(byte[] key, long count) {
 
@@ -201,10 +153,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().from(BinaryJedis::spop, MultiKeyPipelineBase::spop, key, count).get(ArrayList::new);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[])
-	 */
 	@Override
 	public byte[] sRandMember(byte[] key) {
 
@@ -213,10 +161,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::srandmember, MultiKeyPipelineBase::srandmember, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sRandMember(byte[] key, long count) {
 
@@ -229,10 +173,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::srandmember, MultiKeyPipelineBase::srandmember, key, (int) count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRem(byte[], byte[][])
-	 */
 	@Override
 	public Long sRem(byte[] key, byte[]... values) {
 
@@ -243,10 +183,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::srem, MultiKeyPipelineBase::srem, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sUnion(byte[]... keys) {
 
@@ -256,10 +192,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sunion, MultiKeyPipelineBase::sunion, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sUnionStore(byte[] destKey, byte[]... keys) {
 
@@ -270,10 +202,6 @@ class JedisSetCommands implements RedisSetCommands {
 		return connection.invoke().just(BinaryJedis::sunionstore, MultiKeyPipelineBase::sunionstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {
 		return sScan(key, 0, options);
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisStreamCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisStreamCommands.java
index ef9293a74..12ea7d735 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisStreamCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisStreamCommands.java
@@ -54,10 +54,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAck(byte[], String, org.springframework.data.redis.connection.stream.RecordId[])
-	 */
 	@Override
 	public Long xAck(byte[] key, String group, RecordId... recordIds) {
 
@@ -69,10 +65,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				StreamConverters.entryIdsToBytes(Arrays.asList(recordIds)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAdd(MapRecord, XAddOptions)
-	 */
 	@Override
 	public RecordId xAdd(MapRecord<byte[], byte[], byte[]> record, XAddOptions options) {
 
@@ -93,19 +85,11 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(it -> RecordId.of(JedisConverters.toString(it)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaimJustId(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<RecordId> xClaimJustId(byte[] key, String group, String newOwner, XClaimOptions options) {
 		throw new UnsupportedOperationException("Jedis does not support xClaimJustId.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaim(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<ByteRecord> xClaim(byte[] key, String group, String newOwner, XClaimOptions options) {
 
@@ -126,10 +110,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(r -> StreamConverters.convertToByteRecord(key, r));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xDel(byte[], java.lang.String[])
-	 */
 	@Override
 	public Long xDel(byte[] key, RecordId... recordIds) {
 
@@ -140,19 +120,11 @@ class JedisStreamCommands implements RedisStreamCommands {
 				StreamConverters.entryIdsToBytes(Arrays.asList(recordIds)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset) {
 		return xGroupCreate(key, groupName, readOffset, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String, boolean)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset, boolean mkStream) {
 
@@ -164,10 +136,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				JedisConverters.toBytes(groupName), JedisConverters.toBytes(readOffset.getOffset()), mkStream);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDelConsumer(byte[], org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean xGroupDelConsumer(byte[] key, Consumer consumer) {
 
@@ -178,10 +146,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				JedisConverters.toBytes(consumer.getGroup()), JedisConverters.toBytes(consumer.getName())).get(r -> r > 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDestroy(byte[], java.lang.String)
-	 */
 	@Override
 	public Boolean xGroupDestroy(byte[] key, String groupName) {
 
@@ -193,10 +157,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(r -> r > 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfo(byte[])
-	 */
 	@Override
 	public StreamInfo.XInfoStream xInfo(byte[] key) {
 
@@ -212,10 +172,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoGroups(byte[])
-	 */
 	@Override
 	public StreamInfo.XInfoGroups xInfoGroups(byte[] key) {
 
@@ -234,10 +190,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoConsumers(byte[], java.lang.String)
-	 */
 	@Override
 	public StreamInfo.XInfoConsumers xInfoConsumers(byte[] key, String groupName) {
 
@@ -258,10 +210,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xLen(byte[])
-	 */
 	@Override
 	public Long xLen(byte[] key) {
 
@@ -270,19 +218,11 @@ class JedisStreamCommands implements RedisStreamCommands {
 		return connection.invoke().just(BinaryJedis::xlen, MultiKeyPipelineBase::xlen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary xPending(byte[] key, String groupName) {
 		throw new UnsupportedOperationException("Jedis does not support returning PendingMessagesSummary.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XPendingOptions)
-	 */
 	@Override
 	public PendingMessages xPending(byte[] key, String groupName, XPendingOptions options) {
 
@@ -302,10 +242,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(r -> StreamConverters.toPendingMessages(groupName, range, r));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRange(byte[] key, Range<String> range, RedisZSetCommands.Limit limit) {
 
@@ -324,10 +260,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(r -> StreamConverters.convertToByteRecord(key, r));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRead(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xRead(StreamReadOptions readOptions, StreamOffset<byte[]>... streams) {
 
@@ -345,10 +277,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.getOrElse(StreamConverters::convertToByteRecords, Collections::emptyList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xReadGroup(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xReadGroup(Consumer consumer, StreamReadOptions readOptions,
 			StreamOffset<byte[]>... streams) {
@@ -371,10 +299,6 @@ class JedisStreamCommands implements RedisStreamCommands {
 		}).getOrElse(StreamConverters::convertToByteRecords, Collections::emptyList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRevRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRevRange(byte[] key, Range<String> range, RedisZSetCommands.Limit limit) {
 
@@ -390,19 +314,11 @@ class JedisStreamCommands implements RedisStreamCommands {
 				.get(it -> StreamConverters.convertToByteRecord(key, it));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count) {
 		return xTrim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long, boolean)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count, boolean approximateTrimming) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisStringCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisStringCommands.java
index ad8d06f3b..668fdfcc2 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisStringCommands.java
@@ -45,10 +45,6 @@ class JedisStringCommands implements RedisStringCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[])
-	 */
 	@Override
 	public byte[] get(byte[] key) {
 
@@ -57,10 +53,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::get, MultiKeyPipelineBase::get, key);
 	}
 
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.redis.connection.RedisStringCommands#getDel(byte[])
-	*/
 	@Nullable
 	@Override
 	public byte[] getDel(byte[] key) {
@@ -70,10 +62,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::getDel, MultiKeyPipelineBase::getDel, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getEx(byte[], org.springframework.data.redis.core.types.Expiration)
-	 */
 	@Nullable
 	@Override
 	public byte[] getEx(byte[] key, Expiration expiration) {
@@ -85,10 +73,6 @@ class JedisStringCommands implements RedisStringCommands {
 				JedisConverters.toGetExParams(expiration));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getSet(byte[], byte[])
-	 */
 	@Override
 	public byte[] getSet(byte[] key, byte[] value) {
 
@@ -98,10 +82,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::getSet, MultiKeyPipelineBase::getSet, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mGet(byte[][])
-	 */
 	@Override
 	public List<byte[]> mGet(byte[]... keys) {
 
@@ -111,10 +91,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::mget, MultiKeyPipelineBase::mget, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[])
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value) {
 
@@ -125,10 +101,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[], org.springframework.data.redis.core.types.Expiration, org.springframework.data.redis.connection.RedisStringCommands.SetOption)
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value, Expiration expiration, SetOption option) {
 
@@ -144,10 +116,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.getOrElse(Converters.stringToBooleanConverter(), () -> false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean setNX(byte[] key, byte[] value) {
 
@@ -158,10 +126,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.get(Converters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean setEx(byte[] key, long seconds, byte[] value) {
 
@@ -176,10 +140,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.getOrElse(Converters.stringToBooleanConverter(), () -> false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#pSetEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean pSetEx(byte[] key, long milliseconds, byte[] value) {
 
@@ -190,10 +150,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.getOrElse(Converters.stringToBooleanConverter(), () -> false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSet(java.util.Map)
-	 */
 	@Override
 	public Boolean mSet(Map<byte[], byte[]> tuples) {
 
@@ -203,10 +159,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSetNX(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNX(Map<byte[], byte[]> tuples) {
 
@@ -217,10 +169,6 @@ class JedisStringCommands implements RedisStringCommands {
 				.get(Converters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incr(byte[])
-	 */
 	@Override
 	public Long incr(byte[] key) {
 
@@ -229,10 +177,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::incr, MultiKeyPipelineBase::incr, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], long)
-	 */
 	@Override
 	public Long incrBy(byte[] key, long value) {
 
@@ -241,10 +185,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::incrBy, MultiKeyPipelineBase::incrBy, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], double)
-	 */
 	@Override
 	public Double incrBy(byte[] key, double value) {
 
@@ -253,10 +193,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::incrByFloat, MultiKeyPipelineBase::incrByFloat, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decr(byte[])
-	 */
 	@Override
 	public Long decr(byte[] key) {
 
@@ -265,10 +201,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::decr, MultiKeyPipelineBase::decr, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decrBy(byte[], long)
-	 */
 	@Override
 	public Long decrBy(byte[] key, long value) {
 
@@ -277,10 +209,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::decrBy, MultiKeyPipelineBase::decrBy, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#append(byte[], byte[])
-	 */
 	@Override
 	public Long append(byte[] key, byte[] value) {
 
@@ -290,10 +218,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::append, MultiKeyPipelineBase::append, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getRange(byte[], long, long)
-	 */
 	@Override
 	public byte[] getRange(byte[] key, long start, long end) {
 
@@ -302,10 +226,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::getrange, MultiKeyPipelineBase::getrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setRange(byte[], byte[], long)
-	 */
 	@Override
 	public void setRange(byte[] key, byte[] value, long offset) {
 
@@ -315,10 +235,6 @@ class JedisStringCommands implements RedisStringCommands {
 		connection.invokeStatus().just(BinaryJedis::setrange, MultiKeyPipelineBase::setrange, key, offset, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getBit(byte[], long)
-	 */
 	@Override
 	public Boolean getBit(byte[] key, long offset) {
 
@@ -327,10 +243,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::getbit, MultiKeyPipelineBase::getbit, key, offset);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setBit(byte[], long, boolean)
-	 */
 	@Override
 	public Boolean setBit(byte[] key, long offset, boolean value) {
 
@@ -340,10 +252,6 @@ class JedisStringCommands implements RedisStringCommands {
 				JedisConverters.toBit(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[])
-	 */
 	@Override
 	public Long bitCount(byte[] key) {
 
@@ -352,10 +260,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::bitcount, MultiKeyPipelineBase::bitcount, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[], long, long)
-	 */
 	@Override
 	public Long bitCount(byte[] key, long start, long end) {
 
@@ -364,10 +268,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::bitcount, MultiKeyPipelineBase::bitcount, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitfield(byte[], BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitField(byte[] key, BitFieldSubCommands subCommands) {
 
@@ -378,10 +278,6 @@ class JedisStringCommands implements RedisStringCommands {
 				JedisConverters.toBitfieldCommandArguments(subCommands));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitOp(org.springframework.data.redis.connection.RedisStringCommands.BitOperation, byte[], byte[][])
-	 */
 	@Override
 	public Long bitOp(BitOperation op, byte[] destination, byte[]... keys) {
 
@@ -396,10 +292,6 @@ class JedisStringCommands implements RedisStringCommands {
 				destination, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitOp(byte[], boolean, org.springframework.data.domain.Range)
-	 */
 	@Nullable
 	@Override
 	public Long bitPos(byte[] key, boolean bit, Range<Long> range) {
@@ -419,10 +311,6 @@ class JedisStringCommands implements RedisStringCommands {
 		return connection.invoke().just(BinaryJedis::bitpos, MultiKeyPipelineBase::bitpos, key, bit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#strLen(byte[])
-	 */
 	@Override
 	public Long strLen(byte[] key) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java
index 915c4dba4..dd46d52eb 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java
@@ -36,10 +36,6 @@ class JedisSubscription extends AbstractSubscription {
 		this.jedisPubSub = jedisPubSub;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doClose()
-	 */
 	@Override
 	protected void doClose() {
 		if (!getChannels().isEmpty()) {
@@ -50,19 +46,11 @@ class JedisSubscription extends AbstractSubscription {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doPsubscribe(byte[][])
-	 */
 	@Override
 	protected void doPsubscribe(byte[]... patterns) {
 		jedisPubSub.psubscribe(patterns);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doPUnsubscribe(boolean, byte[][])
-	 */
 	@Override
 	protected void doPUnsubscribe(boolean all, byte[]... patterns) {
 		if (all) {
@@ -72,19 +60,11 @@ class JedisSubscription extends AbstractSubscription {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doSubscribe(byte[][])
-	 */
 	@Override
 	protected void doSubscribe(byte[]... channels) {
 		jedisPubSub.subscribe(channels);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doUnsubscribe(boolean, byte[][])
-	 */
 	@Override
 	protected void doUnsubscribe(boolean all, byte[]... channels) {
 		if (all) {
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
index 906070b18..6bd569cee 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
@@ -52,10 +52,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], double, byte[])
-	 */
 	@Override
 	public Boolean zAdd(byte[] key, double score, byte[] value, ZAddArgs args) {
 
@@ -67,10 +63,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.get(JedisConverters::toBoolean);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], java.util.Set, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Long zAdd(byte[] key, Set<Tuple> tuples, ZAddArgs args) {
 
@@ -81,10 +73,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				JedisConverters.toTupleMap(tuples), JedisConverters.toZAddParams(args));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRem(byte[], byte[][])
-	 */
 	@Override
 	public Long zRem(byte[] key, byte[]... values) {
 
@@ -95,10 +83,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrem, MultiKeyPipelineBase::zrem, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zIncrBy(byte[], double, byte[])
-	 */
 	@Override
 	public Double zIncrBy(byte[] key, double increment, byte[] value) {
 
@@ -108,10 +92,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zincrby, MultiKeyPipelineBase::zincrby, key, increment, value);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[])
-	 */
 	@Override
 	public byte[] zRandMember(byte[] key) {
 
@@ -120,10 +100,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrandmember, MultiKeyPipelineBase::zrandmember, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> zRandMember(byte[] key, long count) {
 
@@ -133,10 +109,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toList();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[])
-	 */
 	@Override
 	public Tuple zRandMemberWithScore(byte[] key) {
 
@@ -153,10 +125,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				});
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[], long)
-	 */
 	@Override
 	public List<Tuple> zRandMemberWithScore(byte[] key, long count) {
 
@@ -167,10 +135,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toList(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRank(byte[] key, byte[] value) {
 
@@ -180,10 +144,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrank, MultiKeyPipelineBase::zrank, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRevRank(byte[] key, byte[] value) {
 
@@ -192,10 +152,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrevrank, MultiKeyPipelineBase::zrevrank, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRange(byte[] key, long start, long end) {
 
@@ -204,10 +160,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrange, MultiKeyPipelineBase::zrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeWithScores(byte[] key, long start, long end) {
 
@@ -218,10 +170,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -243,10 +191,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRange(byte[] key, long start, long end) {
 
@@ -255,10 +199,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrevrange, MultiKeyPipelineBase::zrevrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeWithScores(byte[] key, long start, long end) {
 
@@ -269,10 +209,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -292,10 +228,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				min);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -316,10 +248,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				MultiKeyPipelineBase::zrevrangeByScoreWithScores, key, max, min).toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], double, double)
-	 */
 	@Override
 	public Long zCount(byte[] key, double min, double max) {
 
@@ -328,10 +256,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zcount, MultiKeyPipelineBase::zcount, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zCount(byte[] key, Range range) {
 
@@ -344,10 +268,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zcount, MultiKeyPipelineBase::zcount, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zLexCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zLexCount(byte[] key, Range range) {
 
@@ -360,10 +280,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zlexcount, MultiKeyPipelineBase::zlexcount, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMin(byte[] key) {
@@ -374,10 +290,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.get(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMin(byte[] key, long count) {
@@ -389,10 +301,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMin(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
@@ -405,10 +313,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.get(JedisZSetCommands::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMax(byte[] key) {
@@ -419,10 +323,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.get(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMax(byte[] key, long count) {
@@ -434,10 +334,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMax(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
@@ -450,10 +346,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.get(JedisZSetCommands::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCard(byte[])
-	 */
 	@Override
 	public Long zCard(byte[] key) {
 
@@ -462,10 +354,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zcard, MultiKeyPipelineBase::zcard, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScore(byte[], byte[])
-	 */
 	@Override
 	public Double zScore(byte[] key, byte[] value) {
 
@@ -475,10 +363,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zscore, MultiKeyPipelineBase::zscore, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScore(byte[], byte[][])
-	 */
 	@Override
 	public List<Double> zMScore(byte[] key, byte[][] values) {
 
@@ -488,10 +372,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zmscore, MultiKeyPipelineBase::zmscore, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRange(byte[], long, long)
-	 */
 	@Override
 	public Long zRemRange(byte[] key, long start, long end) {
 
@@ -501,10 +381,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByLex(byte[] key, Range range) {
 
@@ -517,10 +393,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zremrangeByLex, MultiKeyPipelineBase::zremrangeByLex, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, Range range) {
 
@@ -534,10 +406,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zDiff(byte[]... sets) {
 
@@ -546,10 +414,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zdiff, MultiKeyPipelineBase::zdiff, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zDiffWithScores(byte[]... sets) {
 
@@ -559,10 +423,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zDiffStore(byte[] destKey, byte[]... sets) {
 
@@ -572,10 +432,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zdiffStore, MultiKeyPipelineBase::zdiffStore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zInter(byte[]... sets) {
 
@@ -584,10 +440,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zinter, MultiKeyPipelineBase::zinter, new ZParams(), sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(byte[]... sets) {
 
@@ -598,10 +450,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -614,10 +462,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				toZParams(aggregate, weights), sets).toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -633,10 +477,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, byte[]... sets) {
 
@@ -647,10 +487,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zinterstore, MultiKeyPipelineBase::zinterstore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zUnion(byte[]... sets) {
 
@@ -659,10 +495,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zunion, MultiKeyPipelineBase::zunion, new ZParams(), sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(byte[]... sets) {
 
@@ -673,10 +505,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -689,10 +517,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				toZParams(aggregate, weights), sets).toSet(JedisConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -709,10 +533,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, byte[]... sets) {
 
@@ -723,10 +543,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zunionstore, MultiKeyPipelineBase::zunionstore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Tuple> zScan(byte[] key, ScanOptions options) {
 		return zScan(key, 0L, options);
@@ -768,10 +584,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max) {
 
@@ -782,10 +594,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				.toSet(JedisConverters::toBytes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max, long offset, long count) {
 
@@ -802,10 +610,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 				(int) offset, (int) count).toSet(JedisConverters::toBytes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -824,10 +628,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrangeByScore, MultiKeyPipelineBase::zrangeByScore, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key, Range range, Limit limit) {
 
@@ -846,10 +646,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(BinaryJedis::zrangeByLex, MultiKeyPipelineBase::zrangeByLex, key, min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClient.java b/src/main/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClient.java
index ec83fdce8..46e1fdeaf 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClient.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClient.java
@@ -40,19 +40,11 @@ public class AuthenticatingRedisClient extends RedisClient {
 		super(null, RedisURI.builder().withHost(host).withPassword(password).build());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.RedisClient#connect(io.lettuce.core.codec.RedisCodec)
-	 */
 	@Override
 	public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
 		return super.connect(codec);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.RedisClient#connectPubSub(io.lettuce.core.codec.RedisCodec)
-	 */
 	@Override
 	public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
 		return super.connectPubSub(codec);
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java
index c71f1d9b0..21393692d 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java
@@ -75,10 +75,6 @@ class ClusterConnectionProvider implements LettuceConnectionProvider, RedisClien
 		this.readFrom = Optional.ofNullable(readFrom);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> CompletableFuture<T> getConnectionAsync(Class<T> connectionType) {
 
@@ -117,10 +113,6 @@ class ClusterConnectionProvider implements LettuceConnectionProvider, RedisClien
 				.failed(new UnsupportedOperationException("Connection type " + connectionType + " not supported!"));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.RedisClientProvider#getRedisClient()
-	 */
 	@Override
 	public RedisClusterClient getRedisClient() {
 		return client;
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java
index c025e6a21..5a03b2d30 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java
@@ -61,91 +61,51 @@ class DefaultLettuceClientConfiguration implements LettuceClientConfiguration {
 		this.shutdownQuietPeriod = shutdownQuietPeriod != null ? shutdownQuietPeriod : shutdownTimeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#useSsl()
-	 */
 	@Override
 	public boolean isUseSsl() {
 		return useSsl;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isVerifyPeer()
-	 */
 	@Override
 	public boolean isVerifyPeer() {
 		return verifyPeer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isStartTls()
-	 */
 	@Override
 	public boolean isStartTls() {
 		return startTls;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientResources()
-	 */
 	@Override
 	public Optional<ClientResources> getClientResources() {
 		return clientResources;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientOptions()
-	 */
 	@Override
 	public Optional<ClientOptions> getClientOptions() {
 		return clientOptions;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientName()
-	 */
 	@Override
 	public Optional<String> getClientName() {
 		return clientName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getReadFrom()
-	 */
 	@Override
 	public Optional<ReadFrom> getReadFrom() {
 		return readFrom;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getTimeout()
-	 */
 	@Override
 	public Duration getCommandTimeout() {
 		return timeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownTimeout()
-	 */
 	@Override
 	public Duration getShutdownTimeout() {
 		return shutdownTimeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownQuietPeriod()
-	 */
 	@Override
 	public Duration getShutdownQuietPeriod() {
 		return shutdownQuietPeriod;
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java
index 3a5d18b01..fa02949d7 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java
@@ -106,10 +106,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 		return sentinelConfiguration != null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@SuppressWarnings({ "rawtypes" })
 	public void afterPropertiesSet() {
 
@@ -142,10 +138,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 		return RedisURI.Builder.redis(hostName, port).withTimeout(Duration.ofMillis(timeout)).build();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Pool#getResource()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public StatefulConnection<byte[], byte[]> getResource() {
@@ -156,10 +148,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Pool#returnBrokenResource(java.lang.Object)
-	 */
 	@Override
 	public void returnBrokenResource(final StatefulConnection<byte[], byte[]> resource) {
 
@@ -170,10 +158,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Pool#returnResource(java.lang.Object)
-	 */
 	@Override
 	public void returnResource(final StatefulConnection<byte[], byte[]> resource) {
 
@@ -184,10 +168,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Pool#destroy()
-	 */
 	@Override
 	public void destroy() {
 
@@ -349,10 +329,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 			this.dbIndex = dbIndex;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.apache.commons.pool2.BasePooledObjectFactory#activateObject(org.apache.commons.pool2.PooledObject)
-		 */
 		@Override
 		public void activateObject(PooledObject<StatefulConnection<byte[], byte[]>> pooledObject) throws Exception {
 
@@ -361,10 +337,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.apache.commons.pool2.BasePooledObjectFactory#destroyObject(org.apache.commons.pool2.PooledObject)
-		 */
 		@Override
 		public void destroyObject(final PooledObject<StatefulConnection<byte[], byte[]>> obj) throws Exception {
 			try {
@@ -374,10 +346,6 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.apache.commons.pool2.BasePooledObjectFactory#validateObject(org.apache.commons.pool2.PooledObject)
-		 */
 		@Override
 		public boolean validateObject(final PooledObject<StatefulConnection<byte[], byte[]>> obj) {
 			try {
@@ -390,19 +358,11 @@ public class DefaultLettucePool implements LettucePool, InitializingBean {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.apache.commons.pool2.BasePooledObjectFactory#create()
-		 */
 		@Override
 		public StatefulConnection<byte[], byte[]> create() throws Exception {
 			return client.connect(LettuceConnection.CODEC);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.apache.commons.pool2.BasePooledObjectFactory#wrap(java.lang.Object)
-		 */
 		@Override
 		public PooledObject<StatefulConnection<byte[], byte[]>> wrap(StatefulConnection<byte[], byte[]> obj) {
 			return new DefaultPooledObject<>(obj);
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolingClientConfiguration.java b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolingClientConfiguration.java
index bf5671a20..7f8808564 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolingClientConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolingClientConfiguration.java
@@ -44,100 +44,56 @@ class DefaultLettucePoolingClientConfiguration implements LettucePoolingClientCo
 		this.poolConfig = poolConfig;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isUseSsl()
-	 */
 	@Override
 	public boolean isUseSsl() {
 		return clientConfiguration.isUseSsl();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isVerifyPeer()
-	 */
 	@Override
 	public boolean isVerifyPeer() {
 		return clientConfiguration.isVerifyPeer();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isStartTls()
-	 */
 	@Override
 	public boolean isStartTls() {
 		return clientConfiguration.isStartTls();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientResources()
-	 */
 	@Override
 	public Optional<ClientResources> getClientResources() {
 		return clientConfiguration.getClientResources();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientOptions()
-	 */
 	@Override
 	public Optional<ClientOptions> getClientOptions() {
 		return clientConfiguration.getClientOptions();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientName()
-	 */
 	@Override
 	public Optional<String> getClientName() {
 		return clientConfiguration.getClientName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getReadFrom()
-	 */
 	@Override
 	public Optional<ReadFrom> getReadFrom() {
 		return clientConfiguration.getReadFrom();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getCommandTimeout()
-	 */
 	@Override
 	public Duration getCommandTimeout() {
 		return clientConfiguration.getCommandTimeout();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownTimeout()
-	 */
 	@Override
 	public Duration getShutdownTimeout() {
 		return clientConfiguration.getShutdownTimeout();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownQuietPeriod()
-	 */
 	@Override
 	public Duration getShutdownQuietPeriod() {
 		return clientConfiguration.getShutdownQuietPeriod();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettucePoolingClientConfiguration#getPoolConfig()
-	 */
 	@Override
 	public GenericObjectPoolConfig getPoolConfig() {
 		return poolConfig;
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceByteBufferPubSubListenerWrapper.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceByteBufferPubSubListenerWrapper.java
index 4cec5ca24..b64556266 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceByteBufferPubSubListenerWrapper.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceByteBufferPubSubListenerWrapper.java
@@ -40,50 +40,26 @@ class LettuceByteBufferPubSubListenerWrapper implements RedisPubSubListener<Byte
 		this.delegate = delegate;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object)
-	 */
 	public void message(ByteBuffer channel, ByteBuffer message) {
 		delegate.message(getBytes(channel), getBytes(message));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	public void message(ByteBuffer pattern, ByteBuffer channel, ByteBuffer message) {
 		delegate.message(getBytes(channel), getBytes(message), getBytes(pattern));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#subscribed(java.lang.Object, long)
-	 */
 	public void subscribed(ByteBuffer channel, long count) {
 		delegate.subscribed(getBytes(channel), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#psubscribed(java.lang.Object, long)
-	 */
 	public void psubscribed(ByteBuffer pattern, long count) {
 		delegate.psubscribed(getBytes(pattern), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#unsubscribed(java.lang.Object, long)
-	 */
 	public void unsubscribed(ByteBuffer channel, long count) {
 		delegate.unsubscribed(getBytes(channel), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#punsubscribed(java.lang.Object, long)
-	 */
 	public void punsubscribed(ByteBuffer pattern, long count) {
 		delegate.punsubscribed(getBytes(pattern), count);
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
index f1a609265..847e22f56 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
@@ -199,37 +199,21 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				connectionProvider.getClass().getName()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#geoCommands()
-	 */
 	@Override
 	public RedisGeoCommands geoCommands() {
 		return new LettuceClusterGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#hashCommands()
-	 */
 	@Override
 	public RedisHashCommands hashCommands() {
 		return new LettuceClusterHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public RedisHyperLogLogCommands hyperLogLogCommands() {
 		return new LettuceClusterHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#keyCommands()
-	 */
 	@Override
 	public RedisKeyCommands keyCommands() {
 		return doGetClusterKeyCommands();
@@ -239,55 +223,31 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return new LettuceClusterKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#listCommands()
-	 */
 	@Override
 	public RedisListCommands listCommands() {
 		return new LettuceClusterListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#stringCommands()
-	 */
 	@Override
 	public RedisStringCommands stringCommands() {
 		return new LettuceClusterStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#setCommands()
-	 */
 	@Override
 	public RedisSetCommands setCommands() {
 		return new LettuceClusterSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#zSetCommands()
-	 */
 	@Override
 	public RedisZSetCommands zSetCommands() {
 		return new LettuceClusterZSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#serverCommands()
-	 */
 	@Override
 	public RedisClusterServerCommands serverCommands() {
 		return new LettuceClusterServerCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#ping()
-	 */
 	@Override
 	public String ping() {
 		Collection<String> ping = clusterCommandExecutor
@@ -302,10 +262,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return "PONG";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#ping(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public String ping(RedisClusterNode node) {
 
@@ -313,19 +269,11 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				.executeCommandOnSingleNode((LettuceClusterCommandCallback<String>) BaseRedisCommands::ping, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterNodes()
-	 */
 	@Override
 	public List<RedisClusterNode> clusterGetNodes() {
 		return new ArrayList<>(topologyProvider.getTopology().getNodes());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterSlaves(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Set<RedisClusterNode> clusterGetSlaves(RedisClusterNode master) {
 
@@ -339,10 +287,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetMasterSlaveMap()
-	 */
 	@Override
 	public Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap() {
 
@@ -360,19 +304,11 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterSlotForKey(byte[])
-	 */
 	@Override
 	public Integer clusterGetSlotForKey(byte[] key) {
 		return SlotHash.getSlot(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterNodeForSlot(int)
-	 */
 	@Override
 	public RedisClusterNode clusterGetNodeForSlot(int slot) {
 
@@ -383,19 +319,11 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return nodes.iterator().next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterNodeForKey(byte[])
-	 */
 	@Override
 	public RedisClusterNode clusterGetNodeForKey(byte[] key) {
 		return clusterGetNodeForSlot(clusterGetSlotForKey(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterInfo()
-	 */
 	@Override
 	public ClusterInfo clusterGetClusterInfo() {
 
@@ -405,10 +333,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#addSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public void clusterAddSlots(RedisClusterNode node, int... slots) {
 
@@ -416,10 +340,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				(LettuceClusterCommandCallback<String>) client -> client.clusterAddSlots(slots), node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterAddSlots(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public void clusterAddSlots(RedisClusterNode node, SlotRange range) {
 
@@ -428,10 +348,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		clusterAddSlots(node, range.getSlotsArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#countKeys(int)
-	 */
 	@Override
 	public Long clusterCountKeysInSlot(int slot) {
 
@@ -442,20 +358,12 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#deleteSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public void clusterDeleteSlots(RedisClusterNode node, int... slots) {
 		clusterCommandExecutor.executeCommandOnSingleNode(
 				(LettuceClusterCommandCallback<String>) client -> client.clusterDelSlots(slots), node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterDeleteSlotsInRange(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public void clusterDeleteSlotsInRange(RedisClusterNode node, SlotRange range) {
 
@@ -464,10 +372,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		clusterDeleteSlots(node, range.getSlotsArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterForget(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterForget(RedisClusterNode node) {
 
@@ -479,10 +383,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				(LettuceClusterCommandCallback<String>) client -> client.clusterForget(nodeToRemove.getId()), nodes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterMeet(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterMeet(RedisClusterNode node) {
 
@@ -494,10 +394,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				(LettuceClusterCommandCallback<String>) client -> client.clusterMeet(node.getHost(), node.getPort()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterSetSlot(org.springframework.data.redis.connection.RedisClusterNode, int, org.springframework.data.redis.connection.RedisClusterCommands.AddSlots)
-	 */
 	@Override
 	public void clusterSetSlot(RedisClusterNode node, int slot, AddSlots mode) {
 
@@ -523,10 +419,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		}, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getKeysInSlot(int, java.lang.Integer)
-	 */
 	@Override
 	public List<byte[]> clusterGetKeysInSlot(int slot, Integer count) {
 
@@ -537,10 +429,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void clusterReplicate(RedisClusterNode master, RedisClusterNode replica) {
 
@@ -549,36 +437,20 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				(LettuceClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), replica);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#keys(org.springframework.data.redis.connection.RedisClusterNode, byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(RedisClusterNode node, byte[] pattern) {
 		return doGetClusterKeyCommands().keys(node, pattern);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#scan(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(RedisClusterNode node, ScanOptions options) {
 		return doGetClusterKeyCommands().scan(node, options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#randomKey(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	public byte[] randomKey(RedisClusterNode node) {
 		return doGetClusterKeyCommands().randomKey(node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionCommands#select(int)
-	 */
 	@Override
 	public void select(int dbIndex) {
 
@@ -589,28 +461,16 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 
 	// --> cluster node stuff
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#watch(byte[][])
-	 */
 	@Override
 	public void watch(byte[]... keys) {
 		throw new InvalidDataAccessApiUsageException("WATCH is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#unwatch()
-	 */
 	@Override
 	public void unwatch() {
 		throw new InvalidDataAccessApiUsageException("UNWATCH is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#multi()
-	 */
 	@Override
 	public void multi() {
 		throw new InvalidDataAccessApiUsageException("MULTI is currently not supported in cluster mode.");
@@ -621,10 +481,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return clusterCommandExecutor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#close()
-	 */
 	@Override
 	public void close() throws DataAccessException {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterHyperLogLogCommands.java
index 3464949db..488fe32e8 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterHyperLogLogCommands.java
@@ -30,10 +30,6 @@ class LettuceClusterHyperLogLogCommands extends LettuceHyperLogLogCommands {
 		super(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#pfCount(byte[][])
-	 */
 	@Override
 	public Long pfCount(byte[]... keys) {
 
@@ -44,10 +40,6 @@ class LettuceClusterHyperLogLogCommands extends LettuceHyperLogLogCommands {
 		throw new InvalidDataAccessApiUsageException("All keys must map to same slot for pfcount in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#pfMerge(byte[], byte[][])
-	 */
 	@Override
 	public void pfMerge(byte[] destinationKey, byte[]... sourceKeys) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterKeyCommands.java
index ee585cc0a..b2b73166b 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterKeyCommands.java
@@ -50,10 +50,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#randomKey()
-	 */
 	@Override
 	public byte[] randomKey() {
 
@@ -78,10 +74,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#keys(byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(byte[] pattern) {
 
@@ -99,10 +91,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 		return keys;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#rename(byte[], byte[])
-	 */
 	@Override
 	public void rename(byte[] oldKey, byte[] newKey) {
 
@@ -123,10 +111,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#renameNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean renameNX(byte[] sourceKey, byte[] targetKey) {
 
@@ -148,19 +132,11 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 		return Boolean.FALSE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#move(byte[], int)
-	*/
 	@Override
 	public Boolean move(byte[] key, int dbIndex) {
 		throw new UnsupportedOperationException("MOVE not supported in CLUSTER mode!");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#randomKey(org.springframework.data.redis.connection.RedisClusterNode)
-	*/
 	@Nullable
 	public byte[] randomKey(RedisClusterNode node) {
 
@@ -169,10 +145,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 				.getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#keys(org.springframework.data.redis.connection.RedisClusterNode, byte[])
-	 */
 	@Nullable
 	public Set<byte[]> keys(RedisClusterNode node, byte[] pattern) {
 
@@ -215,10 +187,6 @@ class LettuceClusterKeyCommands extends LettuceKeyCommands {
 				}, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sort(byte[], org.springframework.data.redis.connection.SortParameters, byte[])
-	 */
 	@Override
 	public Long sort(byte[] key, SortParameters params, byte[] storeKey) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterListCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterListCommands.java
index a9b54df73..4812ca073 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterListCommands.java
@@ -41,10 +41,6 @@ class LettuceClusterListCommands extends LettuceListCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#bLPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bLPop(int timeout, byte[]... keys) {
 
@@ -68,10 +64,6 @@ class LettuceClusterListCommands extends LettuceListCommands {
 		return Collections.emptyList();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#bRPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bRPop(int timeout, byte[]... keys) {
 
@@ -95,10 +87,6 @@ class LettuceClusterListCommands extends LettuceListCommands {
 		return Collections.emptyList();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#rPopLPush(byte[], byte[])
-	 */
 	@Override
 	public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 
@@ -114,10 +102,6 @@ class LettuceClusterListCommands extends LettuceListCommands {
 		return val;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#bRPopLPush(int, byte[], byte[])
-	 */
 	@Override
 	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java
index 39aba2b7d..3c91b2965 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java
@@ -50,46 +50,26 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#bgReWriteAof(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgReWriteAof(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::bgrewriteaof, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#bgSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgSave(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::bgsave, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#lastSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Long lastSave(RedisClusterNode node) {
 		return executeCommandOnSingleNode(client -> client.lastsave().getTime(), node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#save(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void save(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::save, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#dbSize()
-	 */
 	@Override
 	public Long dbSize() {
 
@@ -106,64 +86,36 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return size;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#dbSize(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Long dbSize(RedisClusterNode node) {
 		return executeCommandOnSingleNode(RedisServerCommands::dbsize, node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#flushDb()
-	 */
 	@Override
 	public void flushDb() {
 		executeCommandOnAllNodes(RedisServerCommands::flushdb);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#flushDb(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void flushDb(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::flushdb, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#flushAll()
-	 */
 	@Override
 	public void flushAll() {
 		executeCommandOnAllNodes(RedisServerCommands::flushall);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#flushAll(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void flushAll(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::flushall, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Properties info(RedisClusterNode node) {
 		return LettuceConverters.toProperties(executeCommandOnSingleNode(RedisServerCommands::info, node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#info()
-	 */
 	@Override
 	public Properties info() {
 
@@ -181,10 +133,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return infos;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Properties info(String section) {
 
@@ -203,10 +151,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return infos;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Properties info(RedisClusterNode node, String section) {
 
@@ -215,10 +159,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return LettuceConverters.toProperties(executeCommandOnSingleNode(client -> client.info(section), node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#shutdown(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void shutdown(RedisClusterNode node) {
 
@@ -228,10 +168,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		}, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(String pattern) {
 
@@ -251,10 +187,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return properties;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#getConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(RedisClusterNode node, String pattern) {
 
@@ -263,10 +195,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return executeCommandOnSingleNode(client -> Converters.toProperties(client.configGet(pattern)), node).getValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(String param, String value) {
 
@@ -276,10 +204,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		executeCommandOnAllNodes(client -> client.configSet(param, value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#setConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(RedisClusterNode node, String param, String value) {
 
@@ -289,55 +213,31 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		executeCommandOnSingleNode(client -> client.configSet(param, value), node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void resetConfigStats() {
 		executeCommandOnAllNodes(RedisServerCommands::configResetstat);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#resetConfigStats(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void resetConfigStats(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::configResetstat, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#rewriteConfig()
-	 */
 	@Override
 	public void rewriteConfig() {
 		executeCommandOnAllNodes(RedisServerCommands::configRewrite);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#rewriteConfig(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void rewriteConfig(RedisClusterNode node) {
 		executeCommandOnSingleNode(RedisServerCommands::configRewrite, node);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#time(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Long time(RedisClusterNode node, TimeUnit timeUnit) {
 		return convertListOfStringToTime(executeCommandOnSingleNode(RedisServerCommands::time, node).getValue(), timeUnit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 
@@ -350,10 +250,6 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterServerCommands#getClientList(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList(RedisClusterNode node) {
 
@@ -361,20 +257,12 @@ class LettuceClusterServerCommands extends LettuceServerCommands implements Redi
 				.toListOfRedisClientInformation(executeCommandOnSingleNode(RedisServerCommands::clientList, node).getValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#slaveOf(java.lang.String, int)
-	 */
 	@Override
 	public void slaveOf(String host, int port) {
 		throw new InvalidDataAccessApiUsageException(
 				"SlaveOf is not supported in cluster environment. Please use CLUSTER REPLICATE.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceServerCommands#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 		throw new InvalidDataAccessApiUsageException(
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterSetCommands.java
index a66dd338e..337864fc3 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterSetCommands.java
@@ -43,10 +43,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sMove(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) {
 
@@ -66,10 +62,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return Boolean.FALSE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sInter(byte[]... keys) {
 
@@ -106,10 +98,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return result.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sInterStore(byte[] destKey, byte[]... keys) {
 
@@ -130,10 +118,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return sAdd(destKey, result.toArray(new byte[result.size()][]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sUnion(byte[]... keys) {
 
@@ -161,10 +145,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return result.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sUnionStore(byte[] destKey, byte[]... keys) {
 
@@ -185,10 +165,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return sAdd(destKey, result.toArray(new byte[result.size()][]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sDiff(byte[]... keys) {
 
@@ -219,10 +195,6 @@ class LettuceClusterSetCommands extends LettuceSetCommands {
 		return values.asRawSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#sDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sDiffStore(byte[] destKey, byte[]... keys) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterStringCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterStringCommands.java
index 083c4f510..3de79645e 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterStringCommands.java
@@ -31,10 +31,6 @@ class LettuceClusterStringCommands extends LettuceStringCommands {
 		super(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#mSetNX(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNX(Map<byte[], byte[]> tuples) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterTopologyProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterTopologyProvider.java
index dfe701c0f..5b0cc9c82 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterTopologyProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterTopologyProvider.java
@@ -44,10 +44,6 @@ class LettuceClusterTopologyProvider implements ClusterTopologyProvider {
 		this.client = client;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ClusterTopologyProvider#getTopology()
-	 */
 	@Override
 	public ClusterTopology getTopology() {
 		return new ClusterTopology(new LinkedHashSet<>(LettuceConverters.partitionsToClusterNodes(client.getPartitions())));
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
index 238a8fab7..81620f4a2 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
@@ -272,100 +272,56 @@ public class LettuceConnection extends AbstractRedisConnection {
 		return EXCEPTION_TRANSLATION.translate(ex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#geoCommands()
-	 */
 	@Override
 	public RedisGeoCommands geoCommands() {
 		return new LettuceGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hashCommands()
-	 */
 	@Override
 	public RedisHashCommands hashCommands() {
 		return new LettuceHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public RedisHyperLogLogCommands hyperLogLogCommands() {
 		return new LettuceHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#keyCommands()
-	 */
 	@Override
 	public RedisKeyCommands keyCommands() {
 		return new LettuceKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#listCommands()
-	 */
 	@Override
 	public RedisListCommands listCommands() {
 		return new LettuceListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#setCommands()
-	 */
 	@Override
 	public RedisSetCommands setCommands() {
 		return new LettuceSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#scriptingCommands()
-	 */
 	@Override
 	public RedisScriptingCommands scriptingCommands() {
 		return new LettuceScriptingCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#streamCommands()
-	 */
 	@Override
 	public RedisStreamCommands streamCommands() {
 		return new LettuceStreamCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#stringCommands()
-	 */
 	@Override
 	public RedisStringCommands stringCommands() {
 		return new LettuceStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#serverCommands()
-	 */
 	@Override
 	public RedisServerCommands serverCommands() {
 		return new LettuceServerCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#zSetCommands()
-	 */
 	@Override
 	public RedisZSetCommands zSetCommands() {
 		return new LettuceZSetCommands(this);
@@ -408,10 +364,6 @@ public class LettuceConnection extends AbstractRedisConnection {
 		return invoke().just(RedisClusterAsyncCommands::dispatch, cmd.getType(), cmd.getOutput(), cmd.getArgs());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.AbstractRedisConnection#close()
-	 */
 	@Override
 	public void close() throws DataAccessException {
 
@@ -444,19 +396,11 @@ public class LettuceConnection extends AbstractRedisConnection {
 		this.dbIndex = defaultDbIndex;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return isClosed && !isSubscribed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#getNativeConnection()
-	 */
 	@Override
 	public RedisClusterAsyncCommands<byte[], byte[]> getNativeConnection() {
 
@@ -464,28 +408,16 @@ public class LettuceConnection extends AbstractRedisConnection {
 		return (subscription != null ? subscription.getNativeConnection().async() : getAsyncConnection());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isQueueing()
-	 */
 	@Override
 	public boolean isQueueing() {
 		return isMulti;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#isPipelined()
-	 */
 	@Override
 	public boolean isPipelined() {
 		return isPipelined;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#openPipeline()
-	 */
 	@Override
 	public void openPipeline() {
 
@@ -497,10 +429,6 @@ public class LettuceConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnection#closePipeline()
-	 */
 	@Override
 	public List<Object> closePipeline() {
 
@@ -564,10 +492,6 @@ public class LettuceConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown(org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption)
-	 */
 	@Override
 	public byte[] echo(byte[] message) {
 		return invoke().just(RedisClusterAsyncCommands::echo, message);
@@ -699,37 +623,21 @@ public class LettuceConnection extends AbstractRedisConnection {
 	// Pub/Sub functionality
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#publish(byte[], byte[])
-	 */
 	@Override
 	public Long publish(byte[] channel, byte[] message) {
 		return invoke().just(RedisClusterAsyncCommands::publish, channel, message);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#getSubscription()
-	 */
 	@Override
 	public Subscription getSubscription() {
 		return subscription;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#isSubscribed()
-	 */
 	@Override
 	public boolean isSubscribed() {
 		return (subscription != null && subscription.isAlive());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#pSubscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void pSubscribe(MessageListener listener, byte[]... patterns) {
 
@@ -747,10 +655,6 @@ public class LettuceConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisPubSubCommands#subscribe(org.springframework.data.redis.connection.MessageListener, byte[][])
-	 */
 	@Override
 	public void subscribe(MessageListener listener, byte[]... channels) {
 
@@ -1029,10 +933,6 @@ public class LettuceConnection extends AbstractRedisConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.AbstractRedisConnection#getSentinelConnection(org.springframework.data.redis.connection.RedisNode)
-	 */
 	@Override
 	protected RedisSentinelConnection getSentinelConnection(RedisNode sentinel) {
 
@@ -1356,28 +1256,16 @@ public class LettuceConnection extends AbstractRedisConnection {
 			this.pool = pool;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType) {
 			return connectionType.cast(pool.getResource());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType) {
 			throw new UnsupportedOperationException("Async operations not supported!");
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#release(io.lettuce.core.api.StatefulConnection)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public void release(StatefulConnection<?, ?> connection) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
index 9f0cb1ac5..f929c4d84 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
@@ -329,10 +329,6 @@ public class LettuceConnectionFactory
 		return LettuceConverters.createRedisStandaloneConfiguration(redisUri);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	public void afterPropertiesSet() {
 
 		this.client = createClient();
@@ -356,10 +352,6 @@ public class LettuceConnectionFactory
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	public void destroy() {
 
 		resetConnection();
@@ -405,10 +397,6 @@ public class LettuceConnectionFactory
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionFactory#getConnection()
-	 */
 	public RedisConnection getConnection() {
 
 		assertInitialized();
@@ -423,10 +411,6 @@ public class LettuceConnectionFactory
 		return connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisConnectionFactory#getClusterConnection()
-	 */
 	@Override
 	public RedisClusterConnection getClusterConnection() {
 
@@ -492,10 +476,6 @@ public class LettuceConnectionFactory
 		return connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnectionFactory#getReactiveConnection()
-	 */
 	@Override
 	public LettuceReactiveRedisConnection getReactiveConnection() {
 
@@ -510,10 +490,6 @@ public class LettuceConnectionFactory
 				: new LettuceReactiveRedisConnection(reactiveConnectionProvider);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnectionFactory#getReactiveClusterConnection()
-	 */
 	@Override
 	public LettuceReactiveRedisClusterConnection getReactiveClusterConnection() {
 
@@ -1449,10 +1425,6 @@ public class LettuceConnectionFactory
 		private Duration timeout = Duration.ofSeconds(RedisURI.DEFAULT_TIMEOUT);
 		private Duration shutdownTimeout = Duration.ofMillis(100);
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isUseSsl()
-		 */
 		@Override
 		public boolean isUseSsl() {
 			return useSsl;
@@ -1462,10 +1434,6 @@ public class LettuceConnectionFactory
 			this.useSsl = useSsl;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isVerifyPeer()
-		 */
 		@Override
 		public boolean isVerifyPeer() {
 			return verifyPeer;
@@ -1475,10 +1443,6 @@ public class LettuceConnectionFactory
 			this.verifyPeer = verifyPeer;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#isStartTls()
-		 */
 		@Override
 		public boolean isStartTls() {
 			return startTls;
@@ -1488,10 +1452,6 @@ public class LettuceConnectionFactory
 			this.startTls = startTls;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientResources()
-		 */
 		@Override
 		public Optional<ClientResources> getClientResources() {
 			return Optional.ofNullable(clientResources);
@@ -1501,28 +1461,16 @@ public class LettuceConnectionFactory
 			this.clientResources = clientResources;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientOptions()
-		 */
 		@Override
 		public Optional<ClientOptions> getClientOptions() {
 			return Optional.empty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getReadFrom()
-		 */
 		@Override
 		public Optional<ReadFrom> getReadFrom() {
 			return Optional.empty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getClientName()
-		 */
 		@Override
 		public Optional<String> getClientName() {
 			return Optional.ofNullable(clientName);
@@ -1536,10 +1484,6 @@ public class LettuceConnectionFactory
 			this.clientName = clientName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getTimeout()
-		 */
 		@Override
 		public Duration getCommandTimeout() {
 			return timeout;
@@ -1549,10 +1493,6 @@ public class LettuceConnectionFactory
 			this.timeout = timeout;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownTimeout()
-		 */
 		@Override
 		public Duration getShutdownTimeout() {
 			return shutdownTimeout;
@@ -1562,10 +1502,6 @@ public class LettuceConnectionFactory
 			this.shutdownTimeout = shutdownTimeout;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration#getShutdownQuietPeriod()
-		 */
 		@Override
 		public Duration getShutdownQuietPeriod() {
 			return shutdownTimeout;
@@ -1584,10 +1520,6 @@ public class LettuceConnectionFactory
 			this.delegate = delegate;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType) {
 
@@ -1598,10 +1530,6 @@ public class LettuceConnectionFactory
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class, RedisURI)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType, RedisURI redisURI) {
 
@@ -1612,10 +1540,6 @@ public class LettuceConnectionFactory
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType) {
 
@@ -1633,10 +1557,6 @@ public class LettuceConnectionFactory
 			return future;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class, RedisURI)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType,
 				RedisURI redisURI) {
@@ -1655,28 +1575,16 @@ public class LettuceConnectionFactory
 			return future;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#release(io.lettuce.core.api.StatefulConnection)
-		 */
 		@Override
 		public void release(StatefulConnection<?, ?> connection) {
 			delegate.release(connection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#releaseAsync(io.lettuce.core.api.StatefulConnection)
-		 */
 		@Override
 		public CompletableFuture<Void> releaseAsync(StatefulConnection<?, ?> connection) {
 			return delegate.releaseAsync(connection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.DisposableBean#destroy()
-		 */
 		@Override
 		public void destroy() throws Exception {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceExceptionConverter.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceExceptionConverter.java
index a0b24b3bd..3bc468bf2 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceExceptionConverter.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceExceptionConverter.java
@@ -40,10 +40,6 @@ import org.springframework.data.redis.RedisSystemException;
  */
 public class LettuceExceptionConverter implements Converter<Exception, DataAccessException> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	public DataAccessException convert(Exception ex) {
 
 		if (ex instanceof ExecutionException || ex instanceof RedisCommandExecutionException) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceGeoCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceGeoCommands.java
index d86074ba8..e7693d06a 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceGeoCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceGeoCommands.java
@@ -52,10 +52,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], org.springframework.data.geo.Point, byte[])
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Point point, byte[] member) {
 
@@ -66,10 +62,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 		return connection.invoke().just(RedisGeoAsyncCommands::geoadd, key, point.getX(), point.getY(), member);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.util.Map)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Map<byte[], Point> memberCoordinateMap) {
 
@@ -87,10 +79,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 		return geoAdd(key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoAdd(byte[], java.lang.Iterable)
-	 */
 	@Override
 	public Long geoAdd(byte[] key, Iterable<GeoLocation<byte[]>> locations) {
 
@@ -113,19 +101,11 @@ class LettuceGeoCommands implements RedisGeoCommands {
 		return connection.invoke().just(it -> it.geoadd(key, values.toArray()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[])
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2) {
 		return geoDist(key, member1, member2, DistanceUnit.METERS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoDist(byte[], byte[], byte[], org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance geoDist(byte[] key, byte[] member1, byte[] member2, Metric metric) {
 
@@ -141,10 +121,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(distanceConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoHash(byte[], byte[][])
-	 */
 	@Override
 	public List<String> geoHash(byte[] key, byte[]... members) {
 
@@ -156,10 +132,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.toList(it -> it.getValueOrElse(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoPos(byte[], byte[][])
-	 */
 	@Override
 	public List<Point> geoPos(byte[] key, byte[]... members) {
 
@@ -171,10 +143,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.toList(LettuceConverters::geoCoordinatesToPoint);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within) {
 
@@ -190,10 +158,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(geoResultsConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadius(byte[], org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadius(byte[] key, Circle within, GeoRadiusCommandArgs args) {
 
@@ -211,19 +175,11 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(geoResultsConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, double radius) {
 		return geoRadiusByMember(key, member, new Distance(radius, DistanceUnit.METERS));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], double, org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius) {
 
@@ -239,10 +195,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRadiusByMember(byte[], byte[], org.springframework.data.geo.Distance, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoRadiusByMember(byte[] key, byte[] member, Distance radius,
 			GeoRadiusCommandArgs args) {
@@ -262,19 +214,11 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(geoResultsConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoRemove(byte[], byte[][])
-	 */
 	@Override
 	public Long geoRemove(byte[] key, byte[]... values) {
 		return connection.zSetCommands().zRem(key, values);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearch(byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<byte[]>> geoSearch(byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchCommandArgs args) {
@@ -292,10 +236,6 @@ class LettuceGeoCommands implements RedisGeoCommands {
 				.get(LettuceConverters.geoRadiusResponseToGeoResultsConverter(predicate.getMetric()));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisGeoCommands#geoSearchStore(byte[], byte[], org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long geoSearchStore(byte[] destKey, byte[] key, GeoReference<byte[]> reference, GeoShape predicate,
 			GeoSearchStoreCommandArgs args) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java
index aa8172a0d..32a7ac9e7 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHashCommands.java
@@ -47,10 +47,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSet(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSet(byte[] key, byte[] field, byte[] value) {
 
@@ -61,10 +57,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hset, key, field, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hSetNX(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean hSetNX(byte[] key, byte[] field, byte[] value) {
 
@@ -75,10 +67,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hsetnx, key, field, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hDel(byte[], byte[][])
-	 */
 	@Override
 	public Long hDel(byte[] key, byte[]... fields) {
 
@@ -88,10 +76,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hdel, key, fields);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hExists(byte[], byte[])
-	 */
 	@Override
 	public Boolean hExists(byte[] key, byte[] field) {
 
@@ -101,10 +85,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hexists, key, field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGet(byte[], byte[])
-	 */
 	@Override
 	public byte[] hGet(byte[] key, byte[] field) {
 
@@ -114,10 +94,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hget, key, field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hGetAll(byte[])
-	 */
 	@Override
 	public Map<byte[], byte[]> hGetAll(byte[] key) {
 
@@ -126,10 +102,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hgetall, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] hRandField(byte[] key) {
@@ -139,10 +111,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hrandfield, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[])
-	 */
 	@Nullable
 	@Override
 	public Entry<byte[], byte[]> hRandFieldWithValues(byte[] key) {
@@ -153,10 +121,6 @@ class LettuceHashCommands implements RedisHashCommands {
 				.get(LettuceHashCommands::toEntry);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandField(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<byte[]> hRandField(byte[] key, long count) {
@@ -166,10 +130,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hrandfield, key, count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hRandFieldWithValues(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public List<Entry<byte[], byte[]>> hRandFieldWithValues(byte[] key, long count) {
@@ -180,10 +140,6 @@ class LettuceHashCommands implements RedisHashCommands {
 				.toList(LettuceHashCommands::toEntry);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], long)
-	 */
 	@Override
 	public Long hIncrBy(byte[] key, byte[] field, long delta) {
 
@@ -193,10 +149,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hincrby, key, field, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hIncrBy(byte[], byte[], double)
-	 */
 	@Override
 	public Double hIncrBy(byte[] key, byte[] field, double delta) {
 
@@ -206,10 +158,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hincrbyfloat, key, field, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hKeys(byte[])
-	 */
 	@Override
 	public Set<byte[]> hKeys(byte[] key) {
 
@@ -218,10 +166,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().fromMany(RedisHashAsyncCommands::hkeys, key).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hLen(byte[])
-	 */
 	@Override
 	public Long hLen(byte[] key) {
 
@@ -230,10 +174,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hlen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMGet(byte[], byte[][])
-	 */
 	@Override
 	public List<byte[]> hMGet(byte[] key, byte[]... fields) {
 
@@ -244,10 +184,6 @@ class LettuceHashCommands implements RedisHashCommands {
 				.toList(source -> source.getValueOrElse(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hMSet(byte[], java.util.Map)
-	 */
 	@Override
 	public void hMSet(byte[] key, Map<byte[], byte[]> hashes) {
 
@@ -257,10 +193,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		connection.invokeStatus().just(RedisHashAsyncCommands::hmset, key, hashes);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hVals(byte[])
-	 */
 	@Override
 	public List<byte[]> hVals(byte[] key) {
 
@@ -269,10 +201,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		return connection.invoke().just(RedisHashAsyncCommands::hvals, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<byte[], byte[]>> hScan(byte[] key, ScanOptions options) {
 		return hScan(key, 0, options);
@@ -317,10 +245,6 @@ class LettuceHashCommands implements RedisHashCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHashCommands#hStrLen(byte[], byte[])
-	 */
 	@Nullable
 	@Override
 	public Long hStrLen(byte[] key, byte[] field) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHyperLogLogCommands.java
index bb981df2f..c0e2adf24 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceHyperLogLogCommands.java
@@ -33,10 +33,6 @@ class LettuceHyperLogLogCommands implements RedisHyperLogLogCommands {
 		this.connection = connection;
 	}
 
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfAdd(byte[], byte[][])
-	*/
 	@Override
 	public Long pfAdd(byte[] key, byte[]... values) {
 
@@ -46,10 +42,6 @@ class LettuceHyperLogLogCommands implements RedisHyperLogLogCommands {
 		return connection.invoke().just(RedisHLLAsyncCommands::pfadd, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfCount(byte[][])
-	 */
 	@Override
 	public Long pfCount(byte[]... keys) {
 
@@ -59,10 +51,6 @@ class LettuceHyperLogLogCommands implements RedisHyperLogLogCommands {
 		return connection.invoke().just(RedisHLLAsyncCommands::pfcount, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisHyperLogLogCommands#pfMerge(byte[], byte[][])
-	 */
 	@Override
 	public void pfMerge(byte[] destinationKey, byte[]... sourceKeys) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceKeyCommands.java
index 795d2ea93..9a4ad7a70 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceKeyCommands.java
@@ -53,10 +53,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#copy(byte[], byte[])
-	 */
 	@Override
 	public Boolean copy(byte[] sourceKey, byte[] targetKey, boolean replace) {
 
@@ -67,10 +63,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 				CopyArgs.Builder.replace(replace));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[])
-	 */
 	@Override
 	public Boolean exists(byte[] key) {
 
@@ -79,10 +71,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().from(RedisKeyAsyncCommands::exists, key).get(LettuceConverters.longToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#exists(byte[][])
-	 */
 	@Nullable
 	@Override
 	public Long exists(byte[]... keys) {
@@ -93,10 +81,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::exists, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#del(byte[][])
-	 */
 	@Override
 	public Long del(byte[]... keys) {
 
@@ -107,10 +91,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 	}
 
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#unlink(byte[][])
-	 */
 	@Override
 	public Long unlink(byte[]... keys) {
 
@@ -119,10 +99,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::unlink, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#type(byte[])
-	 */
 	@Override
 	public DataType type(byte[] key) {
 
@@ -131,10 +107,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().from(RedisKeyAsyncCommands::type, key).get(LettuceConverters.stringToDataType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#touch(byte[][])
-	 */
 	@Override
 	public Long touch(byte[]... keys) {
 
@@ -143,10 +115,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::touch, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#keys(byte[])
-	 */
 	@Override
 	public Set<byte[]> keys(byte[] pattern) {
 
@@ -163,10 +131,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return scan(ScanOptions.NONE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> scan(ScanOptions options) {
 		return doScan(options != null ? options : ScanOptions.NONE);
@@ -203,19 +167,11 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#randomKey()
-	 */
 	@Override
 	public byte[] randomKey() {
 		return connection.invoke().just(RedisKeyAsyncCommands::randomkey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#rename(byte[], byte[])
-	 */
 	@Override
 	public void rename(byte[] oldKey, byte[] newKey) {
 
@@ -225,10 +181,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		connection.invokeStatus().just(RedisKeyAsyncCommands::rename, oldKey, newKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#renameNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean renameNX(byte[] sourceKey, byte[] targetKey) {
 
@@ -238,10 +190,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::renamenx, sourceKey, targetKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expire(byte[], long)
-	 */
 	@Override
 	public Boolean expire(byte[] key, long seconds) {
 
@@ -250,10 +198,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::expire, key, seconds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpire(byte[], long)
-	 */
 	@Override
 	public Boolean pExpire(byte[] key, long millis) {
 
@@ -262,10 +206,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::pexpire, key, millis);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#expireAt(byte[], long)
-	 */
 	@Override
 	public Boolean expireAt(byte[] key, long unixTime) {
 
@@ -274,10 +214,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::expireat, key, unixTime);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pExpireAt(byte[], long)
-	 */
 	@Override
 	public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {
 
@@ -286,10 +222,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::pexpireat, key, unixTimeInMillis);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#persist(byte[])
-	 */
 	@Override
 	public Boolean persist(byte[] key) {
 
@@ -298,10 +230,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::persist, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#move(byte[], int)
-	 */
 	@Override
 	public Boolean move(byte[] key, int dbIndex) {
 
@@ -310,10 +238,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::move, key, dbIndex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[])
-	 */
 	@Override
 	public Long ttl(byte[] key) {
 
@@ -322,10 +246,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::ttl, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#ttl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long ttl(byte[] key, TimeUnit timeUnit) {
 
@@ -334,10 +254,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().from(RedisKeyAsyncCommands::ttl, key).get(Converters.secondsToTimeUnit(timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[])
-	 */
 	@Override
 	public Long pTtl(byte[] key) {
 
@@ -346,10 +262,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::pttl, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#pTtl(byte[], java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long pTtl(byte[] key, TimeUnit timeUnit) {
 
@@ -358,10 +270,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().from(RedisKeyAsyncCommands::pttl, key).get(Converters.millisecondsToTimeUnit(timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters)
-	 */
 	@Override
 	public List<byte[]> sort(byte[] key, SortParameters params) {
 
@@ -372,10 +280,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::sort, key, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#sort(byte[], org.springframework.data.redis.connection.SortParameters, byte[])
-	 */
 	@Override
 	public Long sort(byte[] key, SortParameters params, byte[] sortKey) {
 
@@ -386,10 +290,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::sortStore, key, args, sortKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#dump(byte[])
-	 */
 	@Override
 	public byte[] dump(byte[] key) {
 
@@ -398,10 +298,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().just(RedisKeyAsyncCommands::dump, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#restore(byte[], long, byte[], boolean)
-	 */
 	@Override
 	public void restore(byte[] key, long ttlInMillis, byte[] serializedValue, boolean replace) {
 
@@ -413,10 +309,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		connection.invokeStatus().just(RedisKeyAsyncCommands::restore, key, serializedValue, restoreArgs);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#encoding(byte[])
-	 */
 	@Nullable
 	@Override
 	public ValueEncoding encodingOf(byte[] key) {
@@ -427,10 +319,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 				RedisValueEncoding.VACANT);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#idletime(byte[])
-	 */
 	@Nullable
 	@Override
 	public Duration idletime(byte[] key) {
@@ -440,10 +328,6 @@ class LettuceKeyCommands implements RedisKeyCommands {
 		return connection.invoke().from(RedisKeyAsyncCommands::objectIdletime, key).get(Converters::secondsToDuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisKeyCommands#refcount(byte[])
-	 */
 	@Nullable
 	@Override
 	public Long refcount(byte[] key) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceListCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceListCommands.java
index 47a6bde30..e163018d8 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceListCommands.java
@@ -41,10 +41,6 @@ class LettuceListCommands implements RedisListCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPush(byte[], byte[][])
-	 */
 	@Override
 	public Long rPush(byte[] key, byte[]... values) {
 
@@ -53,10 +49,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::rpush, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#l{lPos(byte[], byte[], java.lang.Integer, java.lang.Integer)
-	 */
 	@Override
 	public List<Long> lPos(byte[] key, byte[] element, @Nullable Integer rank, @Nullable Integer count) {
 
@@ -76,10 +68,6 @@ class LettuceListCommands implements RedisListCommands {
 				.getOrElse(Collections::singletonList, Collections::emptyList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPush(byte[], byte[][])
-	 */
 	@Override
 	public Long lPush(byte[] key, byte[]... values) {
 
@@ -90,10 +78,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lpush, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPushX(byte[], byte[])
-	 */
 	@Override
 	public Long rPushX(byte[] key, byte[] value) {
 
@@ -103,10 +87,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::rpushx, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPushX(byte[], byte[])
-	 */
 	@Override
 	public Long lPushX(byte[] key, byte[] value) {
 
@@ -116,10 +96,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lpushx, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lLen(byte[])
-	 */
 	@Override
 	public Long lLen(byte[] key) {
 
@@ -128,10 +104,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::llen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRange(byte[], long, long)
-	 */
 	@Override
 	public List<byte[]> lRange(byte[] key, long start, long end) {
 
@@ -140,10 +112,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lTrim(byte[], long, long)
-	 */
 	@Override
 	public void lTrim(byte[] key, long start, long end) {
 
@@ -152,10 +120,6 @@ class LettuceListCommands implements RedisListCommands {
 		connection.invokeStatus().just(RedisListAsyncCommands::ltrim, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lIndex(byte[], long)
-	 */
 	@Override
 	public byte[] lIndex(byte[] key, long index) {
 
@@ -164,10 +128,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lindex, key, index);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lInsert(byte[], org.springframework.data.redis.connection.RedisListCommands.Position, byte[], byte[])
-	 */
 	@Override
 	public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) {
 
@@ -177,10 +137,6 @@ class LettuceListCommands implements RedisListCommands {
 				value);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public byte[] lMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to) {
 
@@ -194,10 +150,6 @@ class LettuceListCommands implements RedisListCommands {
 
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLMove(byte[], byte[], org.springframework.data.redis.connection.RedisListCommands.Direction, org.springframework.data.redis.connection.RedisListCommands.Direction, double)
-	 */
 	@Override
 	public byte[] bLMove(byte[] sourceKey, byte[] destinationKey, Direction from, Direction to, double timeout) {
 
@@ -210,10 +162,6 @@ class LettuceListCommands implements RedisListCommands {
 				destinationKey, LettuceConverters.toLmoveArgs(from, to), timeout);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lSet(byte[], long, byte[])
-	 */
 	@Override
 	public void lSet(byte[] key, long index, byte[] value) {
 
@@ -223,10 +171,6 @@ class LettuceListCommands implements RedisListCommands {
 		connection.invokeStatus().just(RedisListAsyncCommands::lset, key, index, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lRem(byte[], long, byte[])
-	 */
 	@Override
 	public Long lRem(byte[] key, long count, byte[] value) {
 
@@ -236,10 +180,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lrem, key, count, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[])
-	 */
 	@Override
 	public byte[] lPop(byte[] key) {
 
@@ -248,10 +188,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lpop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#lPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> lPop(byte[] key, long count) {
 
@@ -260,10 +196,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::lpop, key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[])
-	 */
 	@Override
 	public byte[] rPop(byte[] key) {
 
@@ -272,10 +204,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::rpop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> rPop(byte[] key, long count) {
 
@@ -284,10 +212,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::rpop, key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bLPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bLPop(int timeout, byte[]... keys) {
 
@@ -298,10 +222,6 @@ class LettuceListCommands implements RedisListCommands {
 				.from(RedisListAsyncCommands::blpop, timeout, keys).get(LettuceListCommands::toBytesList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPop(int, byte[][])
-	 */
 	@Override
 	public List<byte[]> bRPop(int timeout, byte[]... keys) {
 
@@ -312,10 +232,6 @@ class LettuceListCommands implements RedisListCommands {
 				.from(RedisListAsyncCommands::brpop, timeout, keys).get(LettuceListCommands::toBytesList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#rPopLPush(byte[], byte[])
-	 */
 	@Override
 	public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) {
 
@@ -325,10 +241,6 @@ class LettuceListCommands implements RedisListCommands {
 		return connection.invoke().just(RedisListAsyncCommands::rpoplpush, srcKey, dstKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisListCommands#bRPopLPush(int, byte[], byte[])
-	 */
 	@Override
 	public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceMessageListener.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceMessageListener.java
index 65bee4a65..f8638b6ca 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceMessageListener.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceMessageListener.java
@@ -42,50 +42,26 @@ class LettuceMessageListener implements RedisPubSubListener<byte[], byte[]> {
 		this.subscriptionListener = subscriptionListener;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object)
-	 */
 	public void message(byte[] channel, byte[] message) {
 		listener.onMessage(new DefaultMessage(channel, message), null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	public void message(byte[] pattern, byte[] channel, byte[] message) {
 		listener.onMessage(new DefaultMessage(channel, message), pattern);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#subscribed(java.lang.Object, long)
-	 */
 	public void subscribed(byte[] channel, long count) {
 		subscriptionListener.onChannelSubscribed(channel, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#psubscribed(java.lang.Object, long)
-	 */
 	public void psubscribed(byte[] pattern, long count) {
 		subscriptionListener.onPatternSubscribed(pattern, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#unsubscribed(java.lang.Object, long)
-	 */
 	public void unsubscribed(byte[] channel, long count) {
 		subscriptionListener.onChannelUnsubscribed(channel, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see io.lettuce.core.pubsub.RedisPubSubListener#punsubscribed(java.lang.Object, long)
-	 */
 	public void punsubscribed(byte[] pattern, long count) {
 		subscriptionListener.onPatternUnsubscribed(pattern, count);
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingClientConfiguration.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingClientConfiguration.java
index 8ff94ca50..628a75bb2 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingClientConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingClientConfiguration.java
@@ -97,10 +97,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			super();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#useSsl()
-		 */
 		@Override
 		public LettucePoolingSslClientConfigurationBuilder useSsl() {
 
@@ -108,10 +104,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return new LettucePoolingSslClientConfigurationBuilder(this);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#clientResources(io.lettuce.core.resource.ClientResources)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder clientResources(ClientResources clientResources) {
 
@@ -119,10 +111,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#clientOptions(io.lettuce.core.ClientOptions)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder clientOptions(ClientOptions clientOptions) {
 
@@ -130,10 +118,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#commandTimeout(java.time.Duration)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder commandTimeout(Duration timeout) {
 
@@ -141,10 +125,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#shutdownTimeout(java.time.Duration)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder shutdownTimeout(Duration shutdownTimeout) {
 
@@ -152,10 +132,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#shutdownQuietPeriod(java.time.Duration)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder shutdownQuietPeriod(Duration shutdownQuietPeriod) {
 
@@ -163,20 +139,12 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#readFrom(io.lettuce.core.ReadFrom)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder readFrom(ReadFrom readFrom) {
 			super.readFrom(readFrom);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#clientName(String)
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder clientName(String clientName) {
 			super.clientName(clientName);
@@ -196,10 +164,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceClientConfigurationBuilder#build()
-		 */
 		@Override
 		public LettucePoolingClientConfiguration build() {
 			return new DefaultLettucePoolingClientConfiguration(super.build(), poolConfig);
@@ -215,19 +179,11 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			super(delegate);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceSslClientConfigurationBuilder#and()
-		 */
 		@Override
 		public LettucePoolingClientConfigurationBuilder and() {
 			return (LettucePoolingClientConfigurationBuilder) super.and();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceSslClientConfigurationBuilder#disablePeerVerification()
-		 */
 		@Override
 		public LettucePoolingSslClientConfigurationBuilder disablePeerVerification() {
 
@@ -235,10 +191,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceSslClientConfigurationBuilder#startTls()
-		 */
 		@Override
 		public LettucePoolingSslClientConfigurationBuilder startTls() {
 
@@ -246,10 +198,6 @@ public interface LettucePoolingClientConfiguration extends LettuceClientConfigur
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration.LettuceSslClientConfigurationBuilder#build()
-		 */
 		@Override
 		public LettucePoolingClientConfiguration build() {
 			return (LettucePoolingClientConfiguration) super.build();
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
index bd54c1458..670a3e847 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
@@ -86,10 +86,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 		this.asyncPoolConfig = CommonsPool2ConfigConverter.bounded(this.poolConfig);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType) {
 
@@ -110,10 +106,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType) {
 
@@ -137,10 +129,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 		}).thenApply(connectionType::cast);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.RedisClientProvider#getRedisClient()
-	 */
 	@Override
 	public AbstractRedisClient getRedisClient() {
 
@@ -153,10 +141,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 						connectionProvider.getClass().getName()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#release(io.lettuce.core.api.StatefulConnection)
-	 */
 	@Override
 	public void release(StatefulConnection<?, ?> connection) {
 
@@ -191,10 +175,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#releaseAsync(io.lettuce.core.api.StatefulConnection)
-	 */
 	@Override
 	public CompletableFuture<Void> releaseAsync(StatefulConnection<?, ?> connection) {
 
@@ -217,10 +197,6 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
 		return pool.release(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() throws Exception {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommands.java
index 62775ca78..1dbfdecdf 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommands.java
@@ -47,9 +47,6 @@ class LettuceReactiveClusterHyperLogLogCommands extends LettuceReactiveHyperLogL
 		super(connection);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveHyperLogLogCommands#pfMerge(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<PfMergeCommand>> pfMerge(Publisher<PfMergeCommand> commands) {
 
@@ -70,9 +67,6 @@ class LettuceReactiveClusterHyperLogLogCommands extends LettuceReactiveHyperLogL
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveHyperLogLogCommands#pfCount(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<PfCountCommand, Long>> pfCount(Publisher<PfCountCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommands.java
index 498c32998..c1fdc8a42 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommands.java
@@ -69,10 +69,6 @@ class LettuceReactiveClusterKeyCommands extends LettuceReactiveKeyCommands imple
 		return connection.execute(node, RedisKeyReactiveCommands::randomkey).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#rename(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public Flux<BooleanResponse<RenameCommand>> rename(Publisher<RenameCommand> commands) {
 
@@ -95,10 +91,6 @@ class LettuceReactiveClusterKeyCommands extends LettuceReactiveKeyCommands imple
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#renameNX(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public Flux<BooleanResponse<RenameCommand>> renameNX(Publisher<RenameCommand> commands) {
 
@@ -128,9 +120,6 @@ class LettuceReactiveClusterKeyCommands extends LettuceReactiveKeyCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveKeyCommands#move(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<MoveCommand>> move(Publisher<MoveCommand> commands) {
 		throw new UnsupportedOperationException("MOVE not supported in CLUSTER mode!");
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommands.java
index cd5478951..ef5fe10fa 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommands.java
@@ -43,9 +43,6 @@ class LettuceReactiveClusterListCommands extends LettuceReactiveListCommands imp
 		super(connection);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveListCommands#bPop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<PopResponse> bPop(Publisher<BPopCommand> commands) {
 
@@ -62,9 +59,6 @@ class LettuceReactiveClusterListCommands extends LettuceReactiveListCommands imp
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveListCommands#rPopLPush(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<RPopLPushCommand>> rPopLPush(Publisher<RPopLPushCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java
index 5c459943a..18ab269a8 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java
@@ -75,82 +75,46 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 		this.topologyProvider = topologyProvider;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#bgReWriteAof(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> bgReWriteAof(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::bgrewriteaof).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#bgSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> bgSave(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::bgsave).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#lastSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Long> lastSave(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::lastsave).map(Date::getTime).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#save(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> save(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::save).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#dbSize(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Long> dbSize(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::dbsize).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#flushDb(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> flushDb(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::flushdb).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#flushAll(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> flushAll(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::flushall).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#info()
-	 */
 	@Override
 	public Mono<Properties> info() {
 		return Flux.merge(executeOnAllNodes(this::info)).collect(PropertiesCollector.INSTANCE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Properties> info(RedisClusterNode node) {
 
@@ -159,9 +123,6 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.next();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> info(String section) {
 
@@ -171,10 +132,6 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.collect(PropertiesCollector.INSTANCE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#info(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> info(RedisClusterNode node, String section) {
 
@@ -184,10 +141,6 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.map(LettuceConverters::toProperties).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> getConfig(String pattern) {
 
@@ -197,10 +150,6 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.collect(PropertiesCollector.INSTANCE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#getConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> getConfig(RedisClusterNode node, String pattern) {
 
@@ -211,19 +160,11 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Mono<String> setConfig(String param, String value) {
 		return Flux.merge(executeOnAllNodes(node -> setConfig(node, param, value))).map(Tuple2::getT2).last();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#setConfig(org.springframework.data.redis.connection.RedisClusterNode, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Mono<String> setConfig(RedisClusterNode node, String param, String value) {
 
@@ -233,28 +174,16 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 		return connection.execute(node, c -> c.configSet(param, value)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#resetConfigStats()
-	 */
 	@Override
 	public Mono<String> resetConfigStats() {
 		return Flux.merge(executeOnAllNodes(this::resetConfigStats)).map(Tuple2::getT2).last();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#resetConfigStats(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> resetConfigStats(RedisClusterNode node) {
 		return connection.execute(node, RedisServerReactiveCommands::configResetstat).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#time(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Long> time(RedisClusterNode node) {
 
@@ -264,19 +193,11 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 				.map(LettuceConverters.toTimeConverter(TimeUnit.MILLISECONDS)::convert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveServerCommands#getClientList()
-	 */
 	@Override
 	public Flux<RedisClientInfo> getClientList() {
 		return Flux.merge(executeOnAllNodesMany(this::getClientList)).map(Tuple2::getT2);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveClusterServerCommands#getClientList(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Flux<RedisClientInfo> getClientList(RedisClusterNode node) {
 
@@ -318,18 +239,11 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.stream.Collector#supplier()
-		 */
 		@Override
 		public Supplier<Properties> supplier() {
 			return Properties::new;
 		}
 
-		/* (non-Javadoc)
-		 * @see java.util.stream.Collector#accumulator()
-		 */
 		@Override
 		public BiConsumer<Properties, Tuple2<RedisClusterNode, Properties>> accumulator() {
 
@@ -341,10 +255,6 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 			};
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.stream.Collector#combiner()
-		 */
 		@Override
 		public BinaryOperator<Properties> combiner() {
 
@@ -359,19 +269,11 @@ class LettuceReactiveClusterServerCommands extends LettuceReactiveServerCommands
 			};
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.stream.Collector#finisher()
-		 */
 		@Override
 		public Function<Properties, Properties> finisher() {
 			return properties -> properties;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.stream.Collector#characteristics()
-		 */
 		@Override
 		public Set<Characteristics> characteristics() {
 			return new HashSet<>(Arrays.asList(Characteristics.UNORDERED, Characteristics.IDENTITY_FINISH));
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterSetCommands.java
index 6c13fdf83..b57f385e4 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterSetCommands.java
@@ -47,9 +47,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		super(connection);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sUnion(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SUnionCommand, Flux<ByteBuffer>>> sUnion(Publisher<SUnionCommand> commands) {
 
@@ -68,9 +65,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sUnionStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SUnionStoreCommand, Long>> sUnionStore(Publisher<SUnionStoreCommand> commands) {
 
@@ -99,9 +93,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sInter(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SInterCommand, Flux<ByteBuffer>>> sInter(Publisher<SInterCommand> commands) {
 
@@ -134,9 +125,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SInterStoreCommand, Long>> sInterStore(Publisher<SInterStoreCommand> commands) {
 
@@ -165,9 +153,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sDiff(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SDiffCommand, Flux<ByteBuffer>>> sDiff(Publisher<SDiffCommand> commands) {
 
@@ -202,9 +187,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sDiffStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SDiffStoreCommand, Long>> sDiffStore(Publisher<SDiffStoreCommand> commands) {
 
@@ -233,9 +215,6 @@ class LettuceReactiveClusterSetCommands extends LettuceReactiveSetCommands imple
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveSetCommands#sMove(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SMoveCommand>> sMove(Publisher<SMoveCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommands.java
index 85582df23..2488c1cb7 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommands.java
@@ -45,9 +45,6 @@ class LettuceReactiveClusterStringCommands extends LettuceReactiveStringCommands
 		super(connection);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveStringCommands#bitOp(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ReactiveRedisConnection.NumericResponse<BitOpCommand, Long>> bitOp(Publisher<BitOpCommand> commands) {
 
@@ -65,9 +62,6 @@ class LettuceReactiveClusterStringCommands extends LettuceReactiveStringCommands
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveStringCommands#mSetNX(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ReactiveRedisConnection.BooleanResponse<MSetCommand>> mSetNX(Publisher<MSetCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommands.java
index 0d79e7727..88b5b5641 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommands.java
@@ -41,10 +41,6 @@ class LettuceReactiveClusterZSetCommands extends LettuceReactiveZSetCommands imp
 		super(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveZSetCommands#zUnionStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZAggregateStoreCommand, Long>> zUnionStore(
 			Publisher<? extends ZAggregateStoreCommand> commands) {
@@ -62,10 +58,6 @@ class LettuceReactiveClusterZSetCommands extends LettuceReactiveZSetCommands imp
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveZSetCommands#zInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZAggregateStoreCommand, Long>> zInterStore(
 			Publisher<? extends ZAggregateStoreCommand> commands) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommands.java
index f59d1f077..cf07982e8 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommands.java
@@ -62,10 +62,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoAdd(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<GeoAddCommand, Long>> geoAdd(Publisher<GeoAddCommand> commands) {
 
@@ -89,10 +85,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoDist(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<GeoDistCommand, Distance>> geoDist(Publisher<GeoDistCommand> commands) {
 
@@ -115,10 +107,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoHash(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<GeoHashCommand, String>> geoHash(Publisher<GeoHashCommand> commands) {
 
@@ -133,10 +121,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoPos(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<GeoPosCommand, Point>> geoPos(Publisher<GeoPosCommand> commands) {
 
@@ -153,10 +137,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoRadius(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<GeoRadiusCommand, Flux<GeoResult<GeoLocation<ByteBuffer>>>>> geoRadius(
 			Publisher<GeoRadiusCommand> commands) {
@@ -180,10 +160,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoRadiusByMember(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<GeoRadiusByMemberCommand, Flux<GeoResult<GeoLocation<ByteBuffer>>>>> geoRadiusByMember(
 			Publisher<GeoRadiusByMemberCommand> commands) {
@@ -206,10 +182,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoSearch(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<GeoSearchCommand, Flux<GeoResult<GeoLocation<ByteBuffer>>>>> geoSearch(
 			Publisher<GeoSearchCommand> commands) {
@@ -232,10 +204,6 @@ class LettuceReactiveGeoCommands implements ReactiveGeoCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveGeoCommands#geoSearchStore(Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<GeoSearchStoreCommand, Long>> geoSearchStore(Publisher<GeoSearchStoreCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommands.java
index 10d2a77bf..7031b0476 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommands.java
@@ -59,10 +59,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hSet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<HSetCommand>> hSet(Publisher<HSetCommand> commands) {
 
@@ -90,10 +86,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hMGet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<HGetCommand, ByteBuffer>> hMGet(Publisher<HGetCommand> commands) {
 
@@ -117,10 +109,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hExists(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<HExistsCommand>> hExists(Publisher<HExistsCommand> commands) {
 
@@ -133,10 +121,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hDel(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<HDelCommand, Long>> hDel(Publisher<HDelCommand> commands) {
 
@@ -150,10 +134,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hLen(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> hLen(Publisher<KeyCommand> commands) {
 
@@ -198,10 +178,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hKeys(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<ByteBuffer>>> hKeys(Publisher<KeyCommand> commands) {
 
@@ -215,10 +191,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hKeys(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<ByteBuffer>>> hVals(Publisher<KeyCommand> commands) {
 
@@ -232,10 +204,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hGetAll(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<Map.Entry<ByteBuffer, ByteBuffer>>>> hGetAll(
 			Publisher<KeyCommand> commands) {
@@ -250,10 +218,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hScan(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<Map.Entry<ByteBuffer, ByteBuffer>>>> hScan(
 			Publisher<KeyScanCommand> commands) {
@@ -288,10 +252,6 @@ class LettuceReactiveHashCommands implements ReactiveHashCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHashCommands#hstrlen(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<HStrLenCommand, Long>> hStrLen(Publisher<HStrLenCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommands.java
index 0c00c00ca..26a1f2bac 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommands.java
@@ -46,10 +46,6 @@ class LettuceReactiveHyperLogLogCommands implements ReactiveHyperLogLogCommands
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHyperLogLogCommands#pfAdd(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<PfAddCommand, Long>> pfAdd(Publisher<PfAddCommand> commands) {
 
@@ -63,10 +59,6 @@ class LettuceReactiveHyperLogLogCommands implements ReactiveHyperLogLogCommands
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHyperLogLogCommands#pfCount(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<PfCountCommand, Long>> pfCount(Publisher<PfCountCommand> commands) {
 
@@ -79,10 +71,6 @@ class LettuceReactiveHyperLogLogCommands implements ReactiveHyperLogLogCommands
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveHyperLogLogCommands#pfMerge(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<PfMergeCommand>> pfMerge(Publisher<PfMergeCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommands.java
index d6bb1c337..557bb128b 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommands.java
@@ -60,10 +60,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#copy(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<CopyCommand>> copy(Publisher<CopyCommand> commands) {
 
@@ -81,10 +77,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#exists(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<KeyCommand>> exists(Publisher<KeyCommand> commands) {
 
@@ -97,10 +89,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#type(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, DataType>> type(Publisher<KeyCommand> commands) {
 
@@ -113,10 +101,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#touch(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<Collection<ByteBuffer>, Long>> touch(Publisher<Collection<ByteBuffer>> keysCollection) {
 
@@ -128,10 +112,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#keys(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<ByteBuffer, ByteBuffer>> keys(Publisher<ByteBuffer> patterns) {
 
@@ -143,10 +123,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Flux<ByteBuffer> scan(ScanOptions options) {
 
@@ -155,19 +131,11 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		return connection.execute(cmd -> ScanStream.scan(cmd, LettuceConverters.toScanArgs(options)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#randomKey()
-	 */
 	@Override
 	public Mono<ByteBuffer> randomKey() {
 		return connection.execute(RedisKeyReactiveCommands::randomkey).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#rename(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public Flux<BooleanResponse<RenameCommand>> rename(Publisher<RenameCommand> commands) {
 
@@ -181,10 +149,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#rename(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public Flux<BooleanResponse<RenameCommand>> renameNX(Publisher<RenameCommand> commands) {
 
@@ -197,10 +161,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#del(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> del(Publisher<KeyCommand> commands) {
 
@@ -212,10 +172,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#mDel(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<List<ByteBuffer>, Long>> mDel(Publisher<List<ByteBuffer>> keysCollection) {
 
@@ -227,10 +183,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#unlink(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> unlink(Publisher<KeyCommand> commands) {
 
@@ -242,10 +194,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveKeyCommands#mUnlink(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<List<ByteBuffer>, Long>> mUnlink(Publisher<List<ByteBuffer>> keysCollection) {
 
@@ -257,9 +205,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#expire(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<ExpireCommand>> expire(Publisher<ExpireCommand> commands) {
 
@@ -273,9 +218,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#pExpire(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<ExpireCommand>> pExpire(Publisher<ExpireCommand> commands) {
 
@@ -289,9 +231,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#expireAt(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<ExpireAtCommand>> expireAt(Publisher<ExpireAtCommand> commands) {
 
@@ -305,9 +244,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#pExpireAt(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<ExpireAtCommand>> pExpireAt(Publisher<ExpireAtCommand> commands) {
 
@@ -321,9 +257,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#persist(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<KeyCommand>> persist(Publisher<KeyCommand> commands) {
 
@@ -335,9 +268,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#ttl(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> ttl(Publisher<KeyCommand> commands) {
 
@@ -349,9 +279,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#pTtl(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> pTtl(Publisher<KeyCommand> commands) {
 
@@ -363,10 +290,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#move(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<MoveCommand>> move(Publisher<MoveCommand> commands) {
 
@@ -379,10 +302,6 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#encodingOf(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<ValueEncoding> encodingOf(ByteBuffer key) {
 
@@ -391,19 +310,11 @@ class LettuceReactiveKeyCommands implements ReactiveKeyCommands {
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#idletime(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<Duration> idletime(ByteBuffer key) {
 		return connection.execute(cmd -> cmd.objectIdletime(key).map(Duration::ofSeconds)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveKeyCommands#refcount(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<Long> refcount(ByteBuffer key) {
 		return connection.execute(cmd -> cmd.objectRefcount(key)).next();
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommands.java
index 3341e4fb1..f5f274cf8 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommands.java
@@ -64,10 +64,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lPush(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<PushCommand, Long>> push(Publisher<PushCommand> commands) {
 
@@ -97,10 +93,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lLen(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> lLen(Publisher<KeyCommand> commands) {
 
@@ -112,10 +104,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<RangeCommand, Flux<ByteBuffer>>> lRange(Publisher<RangeCommand> commands) {
 
@@ -134,10 +122,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lTrim(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<RangeCommand>> lTrim(Publisher<RangeCommand> commands) {
 
@@ -156,10 +140,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lPos(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<LPosCommand, Long>> lPos(Publisher<LPosCommand> commands) {
 
@@ -181,10 +161,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lIndex(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<LIndexCommand>> lIndex(Publisher<LIndexCommand> commands) {
 
@@ -197,10 +173,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lInsert(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<LInsertCommand, Long>> lInsert(Publisher<LInsertCommand> commands) {
 
@@ -216,10 +188,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lMove(Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<LMoveCommand>> lMove(Publisher<? extends LMoveCommand> commands) {
 
@@ -237,10 +205,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#bLMove(Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<BLMoveCommand>> bLMove(Publisher<BLMoveCommand> commands) {
 
@@ -260,10 +224,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lSet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<LSetCommand>> lSet(Publisher<LSetCommand> commands) {
 
@@ -281,10 +241,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#lRem(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<LRemCommand, Long>> lRem(Publisher<LRemCommand> commands) {
 
@@ -299,10 +255,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#pop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<PopCommand>> pop(Publisher<PopCommand> commands) {
 
@@ -319,10 +271,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#popList(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<PopCommand, Flux<ByteBuffer>>> popList(Publisher<PopCommand> commands) {
 
@@ -339,10 +287,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#bPop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<PopResponse> bPop(Publisher<BPopCommand> commands) {
 
@@ -362,10 +306,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#rPopLPush(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<RPopLPushCommand>> rPopLPush(Publisher<RPopLPushCommand> commands) {
 
@@ -379,10 +319,6 @@ class LettuceReactiveListCommands implements ReactiveListCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveListCommands#bRPopLPush(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<BRPopLPushCommand>> bRPopLPush(Publisher<BRPopLPushCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommands.java
index 31793592b..00bc7ce70 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommands.java
@@ -46,10 +46,6 @@ class LettuceReactiveNumberCommands implements ReactiveNumberCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveNumberCommands#incr(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> incr(Publisher<KeyCommand> commands) {
 
@@ -61,10 +57,6 @@ class LettuceReactiveNumberCommands implements ReactiveNumberCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveNumberCommands#incrBy(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public <T extends Number> Flux<NumericResponse<IncrByCommand<T>, T>> incrBy(Publisher<IncrByCommand<T>> commands) {
 
@@ -87,10 +79,6 @@ class LettuceReactiveNumberCommands implements ReactiveNumberCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveNumberCommands#decr(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> decr(Publisher<KeyCommand> commands) {
 
@@ -102,10 +90,6 @@ class LettuceReactiveNumberCommands implements ReactiveNumberCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveNumberCommands#decrBy(org.reactivestreams.Publisher, java.util.function.Supplier)
-	 */
 	@Override
 	public <T extends Number> Flux<NumericResponse<DecrByCommand<T>, T>> decrBy(Publisher<DecrByCommand<T>> commands) {
 
@@ -128,10 +112,6 @@ class LettuceReactiveNumberCommands implements ReactiveNumberCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveNumberCommands#hIncrBy(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public <T extends Number> Flux<NumericResponse<HIncrByCommand<T>, T>> hIncrBy(Publisher<HIncrByCommand<T>> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactivePubSubCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactivePubSubCommands.java
index e10c53d72..5812a7d57 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactivePubSubCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactivePubSubCommands.java
@@ -43,10 +43,6 @@ class LettuceReactivePubSubCommands implements ReactivePubSubCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactivePubSubCommands#createSubscription(org.springframework.data.redis.connection.SubscriptionListener)
-	 */
 	@Override
 	public Mono<ReactiveSubscription> createSubscription(SubscriptionListener listener) {
 
@@ -55,10 +51,6 @@ class LettuceReactivePubSubCommands implements ReactivePubSubCommands {
 						connection.translateException()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactivePubSubCommands#publish(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<Long> publish(Publisher<ChannelMessage<ByteBuffer, ByteBuffer>> messageStream) {
 
@@ -68,10 +60,6 @@ class LettuceReactivePubSubCommands implements ReactivePubSubCommands {
 				.flatMap(message -> commands.publish(message.getChannel(), message.getMessage())));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactivePubSubCommands#subscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> subscribe(ByteBuffer... channels) {
 
@@ -80,10 +68,6 @@ class LettuceReactivePubSubCommands implements ReactivePubSubCommands {
 		return doWithPubSub(commands -> commands.subscribe(channels));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactivePubSubCommands#pSubscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> pSubscribe(ByteBuffer... patterns) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisClusterConnection.java
index e4a785b3c..cc2517b90 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisClusterConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisClusterConnection.java
@@ -92,145 +92,81 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		this.topologyProvider = new LettuceClusterTopologyProvider(client);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#keyCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterKeyCommands keyCommands() {
 		return new LettuceReactiveClusterKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#listCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterListCommands listCommands() {
 		return new LettuceReactiveClusterListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#setCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterSetCommands setCommands() {
 		return new LettuceReactiveClusterSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#zSetCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterZSetCommands zSetCommands() {
 		return new LettuceReactiveClusterZSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterHyperLogLogCommands hyperLogLogCommands() {
 		return new LettuceReactiveClusterHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#stringCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterStringCommands stringCommands() {
 		return new LettuceReactiveClusterStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#geoCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterGeoCommands geoCommands() {
 		return new LettuceReactiveClusterGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#hashCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterHashCommands hashCommands() {
 		return new LettuceReactiveClusterHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#numberCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterNumberCommands numberCommands() {
 		return new LettuceReactiveClusterNumberCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#scriptingCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterScriptingCommands scriptingCommands() {
 		return new LettuceReactiveClusterScriptingCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#serverCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterServerCommands serverCommands() {
 		return new LettuceReactiveClusterServerCommands(this, topologyProvider);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#streamCommands()
-	 */
 	@Override
 	public LettuceReactiveClusterStreamCommands streamCommands() {
 		return new LettuceReactiveClusterStreamCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterConnection#ping()
-	 */
 	@Override
 	public Mono<String> ping() {
 		return clusterGetNodes().flatMap(node -> execute(node, BaseRedisReactiveCommands::ping)).last();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterConnection#ping(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<String> ping(RedisClusterNode node) {
 		return execute(node, BaseRedisReactiveCommands::ping).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetNodes()
-	 */
 	@Override
 	public Flux<RedisClusterNode> clusterGetNodes() {
 		return Flux.fromStream(() -> doGetActiveNodes().stream());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetSlaves(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Flux<RedisClusterNode> clusterGetSlaves(RedisClusterNode master) {
 
@@ -241,10 +177,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 						.flatMapIterable(LettuceConverters::toSetOfRedisClusterNodes)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetMasterSlaveMap()
-	 */
 	@Override
 	public Mono<Map<RedisClusterNode, Collection<RedisClusterNode>>> clusterGetMasterSlaveMap() {
 
@@ -256,19 +188,11 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 				}).collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetSlotForKey(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<Integer> clusterGetSlotForKey(ByteBuffer key) {
 		return Mono.fromSupplier(() -> SlotHash.getSlot(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetNodeForSlot(int)
-	 */
 	@Override
 	public Mono<RedisClusterNode> clusterGetNodeForSlot(int slot) {
 
@@ -276,10 +200,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		return nodes.isEmpty() ? Mono.empty() : Flux.fromIterable(nodes).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetNodeForKey(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<RedisClusterNode> clusterGetNodeForKey(ByteBuffer key) {
 
@@ -288,10 +208,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		return clusterGetSlotForKey(key).flatMap(this::clusterGetNodeForSlot);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetClusterInfo()
-	 */
 	@Override
 	public Mono<ClusterInfo> clusterGetClusterInfo() {
 
@@ -301,19 +217,11 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 				.single();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterAddSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public Mono<Void> clusterAddSlots(RedisClusterNode node, int... slots) {
 		return execute(node, cmd -> cmd.clusterAddSlots(slots)).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterAddSlots(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public Mono<Void> clusterAddSlots(RedisClusterNode node, RedisClusterNode.SlotRange range) {
 
@@ -322,28 +230,16 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		return execute(node, cmd -> cmd.clusterAddSlots(range.getSlotsArray())).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterCountKeysInSlot(int)
-	 */
 	@Override
 	public Mono<Long> clusterCountKeysInSlot(int slot) {
 		return execute(cmd -> cmd.clusterCountKeysInSlot(slot)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterDeleteSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public Mono<Void> clusterDeleteSlots(RedisClusterNode node, int... slots) {
 		return execute(node, cmd -> cmd.clusterDelSlots(slots)).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterDeleteSlotsInRange(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public Mono<Void> clusterDeleteSlotsInRange(RedisClusterNode node, RedisClusterNode.SlotRange range) {
 
@@ -352,10 +248,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		return execute(node, cmd -> cmd.clusterDelSlots(range.getSlotsArray())).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterForget(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Void> clusterForget(RedisClusterNode node) {
 
@@ -369,10 +261,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		}).flatMap(actualNode -> execute(node, cmd -> cmd.clusterForget(nodeToRemove.getId()))).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterMeet(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Void> clusterMeet(RedisClusterNode node) {
 
@@ -384,10 +272,6 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 				.flatMap(actualNode -> execute(node, cmd -> cmd.clusterMeet(node.getHost(), node.getPort()))).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterSetSlot(org.springframework.data.redis.connection.RedisClusterNode, int, org.springframework.data.redis.connection.ReactiveRedisClusterCommands.AddSlots)
-	 */
 	@Override
 	public Mono<Void> clusterSetSlot(RedisClusterNode node, int slot, AddSlots mode) {
 
@@ -415,19 +299,11 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		}).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterGetKeysInSlot(int, int)
-	 */
 	@Override
 	public Flux<ByteBuffer> clusterGetKeysInSlot(int slot, int count) {
 		return execute(cmd -> cmd.clusterGetKeysInSlot(slot, count));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Mono<Void> clusterReplicate(RedisClusterNode master, RedisClusterNode replica) {
 		return execute(replica, cmd -> cmd.clusterReplicate(lookup(master).getId())).then();
@@ -469,20 +345,12 @@ class LettuceReactiveRedisClusterConnection extends LettuceReactiveRedisConnecti
 		return getCommands(node).flatMapMany(callback::doWithCommands).onErrorMap(translateException());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#getConnection()
-	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	protected Mono<StatefulRedisClusterConnection<ByteBuffer, ByteBuffer>> getConnection() {
 		return (Mono) super.getConnection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceReactiveRedisConnection#getCommands()
-	 */
 	protected Mono<RedisClusterReactiveCommands<ByteBuffer, ByteBuffer>> getCommands() {
 		return getConnection().map(StatefulRedisClusterConnection::reactive);
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnection.java
index cbb755933..54e830b62 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnection.java
@@ -90,127 +90,71 @@ class LettuceReactiveRedisConnection implements ReactiveRedisConnection {
 		this.sharedConnection = Mono.just(sharedConnection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#keyCommands()
-	 */
 	@Override
 	public ReactiveKeyCommands keyCommands() {
 		return new LettuceReactiveKeyCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#stringCommands()
-	 */
 	@Override
 	public ReactiveStringCommands stringCommands() {
 		return new LettuceReactiveStringCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#numberCommands()
-	 */
 	@Override
 	public ReactiveNumberCommands numberCommands() {
 		return new LettuceReactiveNumberCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#listCommands()
-	 */
 	@Override
 	public ReactiveListCommands listCommands() {
 		return new LettuceReactiveListCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#setCommands()
-	 */
 	@Override
 	public ReactiveSetCommands setCommands() {
 		return new LettuceReactiveSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#zSetCommands()
-	 */
 	@Override
 	public ReactiveZSetCommands zSetCommands() {
 		return new LettuceReactiveZSetCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#hashCommands()
-	 */
 	@Override
 	public ReactiveHashCommands hashCommands() {
 		return new LettuceReactiveHashCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#geoCommands()
-	 */
 	@Override
 	public ReactiveGeoCommands geoCommands() {
 		return new LettuceReactiveGeoCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#hyperLogLogCommands()
-	 */
 	@Override
 	public ReactiveHyperLogLogCommands hyperLogLogCommands() {
 		return new LettuceReactiveHyperLogLogCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#pubSubCommands()
-	 */
 	@Override
 	public ReactivePubSubCommands pubSubCommands() {
 		return new LettuceReactivePubSubCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#scriptingCommands()
-	 */
 	@Override
 	public ReactiveScriptingCommands scriptingCommands() {
 		return new LettuceReactiveScriptingCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#serverCommands()
-	 */
 	@Override
 	public ReactiveServerCommands serverCommands() {
 		return new LettuceReactiveServerCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#streamCommands()
-	 */
 	@Override
 	public ReactiveStreamCommands streamCommands() {
 		return new LettuceReactiveStreamCommands(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#ping()
-	 */
 	@Override
 	public Mono<String> ping() {
 		return execute(BaseRedisReactiveCommands::ping).next();
@@ -233,10 +177,6 @@ class LettuceReactiveRedisConnection implements ReactiveRedisConnection {
 		return getDedicatedCommands().flatMapMany(callback::doWithCommands).onErrorMap(translateException());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection#closeLater()
-	 */
 	public Mono<Void> closeLater() {
 		return Flux.mergeDelayError(2, dedicatedConnection.close(), pubSubConnection.close()).then();
 	}
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommands.java
index ad8848603..70fd16fb9 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommands.java
@@ -54,28 +54,16 @@ class LettuceReactiveScriptingCommands implements ReactiveScriptingCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#scriptFlush()
-	 */
 	@Override
 	public Mono<String> scriptFlush() {
 		return connection.execute(RedisScriptingReactiveCommands::scriptFlush).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#scriptKill()
-	 */
 	@Override
 	public Mono<String> scriptKill() {
 		return connection.execute(RedisScriptingReactiveCommands::scriptKill).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#scriptLoad(java.nio.ByteBuffer)
-	 */
 	@Override
 	public Mono<String> scriptLoad(ByteBuffer script) {
 
@@ -84,10 +72,6 @@ class LettuceReactiveScriptingCommands implements ReactiveScriptingCommands {
 		return connection.execute(cmd -> cmd.scriptLoad(ByteUtils.getBytes(script))).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#scriptExists(java.util.List)
-	 */
 	@Override
 	public Flux<Boolean> scriptExists(List<String> scriptShas) {
 
@@ -96,10 +80,6 @@ class LettuceReactiveScriptingCommands implements ReactiveScriptingCommands {
 		return connection.execute(cmd -> cmd.scriptExists(scriptShas.toArray(new String[scriptShas.size()])));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#eval(java.nio.ByteBuffer, org.springframework.data.redis.connection.ReturnType, int, java.nio.ByteBuffer[])
-	 */
 	@Override
 	public <T> Flux<T> eval(ByteBuffer script, ReturnType returnType, int numKeys, ByteBuffer... keysAndArgs) {
 
@@ -117,10 +97,6 @@ class LettuceReactiveScriptingCommands implements ReactiveScriptingCommands {
 				returnType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveScriptingCommands#evalSha(java.lang.String, org.springframework.data.redis.connection.ReturnType, int, java.nio.ByteBuffer[])
-	 */
 	@Override
 	public <T> Flux<T> evalSha(String scriptSha, ReturnType returnType, int numKeys, ByteBuffer... keysAndArgs) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommands.java
index 24058d217..107ffaf64 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommands.java
@@ -52,73 +52,41 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#bgReWriteAof()
-	 */
 	@Override
 	public Mono<String> bgReWriteAof() {
 		return connection.execute(RedisServerReactiveCommands::bgrewriteaof).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#bgSave()
-	 */
 	@Override
 	public Mono<String> bgSave() {
 		return connection.execute(RedisServerReactiveCommands::bgsave).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#lastSave()
-	 */
 	@Override
 	public Mono<Long> lastSave() {
 		return connection.execute(RedisServerReactiveCommands::lastsave).next().map(Date::getTime);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#save()
-	 */
 	@Override
 	public Mono<String> save() {
 		return connection.execute(RedisServerReactiveCommands::save).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#dbSize()
-	 */
 	@Override
 	public Mono<Long> dbSize() {
 		return connection.execute(RedisServerReactiveCommands::dbsize).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#flushDb()
-	 */
 	@Override
 	public Mono<String> flushDb() {
 		return connection.execute(RedisServerReactiveCommands::flushdb).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#flushAll()
-	 */
 	@Override
 	public Mono<String> flushAll() {
 		return connection.execute(RedisServerReactiveCommands::flushall).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#info()
-	 */
 	@Override
 	public Mono<Properties> info() {
 
@@ -127,10 +95,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> info(String section) {
 
@@ -141,10 +105,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Mono<Properties> getConfig(String pattern) {
 
@@ -154,10 +114,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 				.map(LettuceConverters::toProperties).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Mono<String> setConfig(String param, String value) {
 
@@ -167,19 +123,11 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 		return connection.execute(c -> c.configSet(param, value)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#resetConfigStats()
-	 */
 	@Override
 	public Mono<String> resetConfigStats() {
 		return connection.execute(RedisServerReactiveCommands::configResetstat).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#time(TimeUnit)
-	 */
 	@Override
 	public Mono<Long> time(TimeUnit timeUnit) {
 
@@ -189,10 +137,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 				.map(LettuceConverters.toTimeConverter(timeUnit)::convert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#killClient(java.lang.String, int)
-	 */
 	@Override
 	public Mono<String> killClient(String host, int port) {
 
@@ -201,10 +145,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 		return connection.execute(c -> c.clientKill(String.format("%s:%s", host, port))).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#setClientName(java.lang.String)
-	 */
 	@Override
 	public Mono<String> setClientName(String name) {
 
@@ -213,10 +153,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 		return connection.execute(c -> c.clientSetname(ByteBuffer.wrap(LettuceConverters.toBytes(name)))).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#getClientName()
-	 */
 	@Override
 	public Mono<String> getClientName() {
 
@@ -226,10 +162,6 @@ class LettuceReactiveServerCommands implements ReactiveServerCommands {
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveServerCommands#getClientList()
-	 */
 	@Override
 	public Flux<RedisClientInfo> getClientList() {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommands.java
index 00bceee75..61f2a594e 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommands.java
@@ -54,10 +54,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sAdd(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SAddCommand, Long>> sAdd(Publisher<SAddCommand> commands) {
 
@@ -71,10 +67,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sRem(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SRemCommand, Long>> sRem(Publisher<SRemCommand> commands) {
 
@@ -88,10 +80,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sPop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<KeyCommand>> sPop(Publisher<KeyCommand> commands) {
 
@@ -103,10 +91,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sPop(org.springframework.data.redis.connection.ReactiveSetCommands.SPopCommand)
-	 */
 	@Override
 	public Flux<ByteBuffer> sPop(SPopCommand command) {
 
@@ -116,10 +100,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		return connection.execute(cmd -> cmd.spop(command.getKey(), command.getCount()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sMove(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SMoveCommand>> sMove(Publisher<SMoveCommand> commands) {
 
@@ -134,10 +114,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sCard(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> sCard(Publisher<KeyCommand> commands) {
 
@@ -149,10 +125,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sIsMember(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SIsMemberCommand>> sIsMember(Publisher<SIsMemberCommand> commands) {
 
@@ -165,10 +137,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sMIsMember(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<SMIsMemberCommand, Boolean>> sMIsMember(Publisher<SMIsMemberCommand> commands) {
 
@@ -182,10 +150,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInter(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SInterCommand, Flux<ByteBuffer>>> sInter(Publisher<SInterCommand> commands) {
 
@@ -198,10 +162,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SInterStoreCommand, Long>> sInterStore(Publisher<SInterStoreCommand> commands) {
 
@@ -215,10 +175,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInter(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SUnionCommand, Flux<ByteBuffer>>> sUnion(Publisher<SUnionCommand> commands) {
 
@@ -231,10 +187,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SUnionStoreCommand, Long>> sUnionStore(Publisher<SUnionStoreCommand> commands) {
 
@@ -248,10 +200,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInter(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SDiffCommand, Flux<ByteBuffer>>> sDiff(Publisher<SDiffCommand> commands) {
 
@@ -264,10 +212,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SDiffStoreCommand, Long>> sDiffStore(Publisher<SDiffStoreCommand> commands) {
 
@@ -281,10 +225,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sMembers(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<ByteBuffer>>> sMembers(Publisher<KeyCommand> commands) {
 
@@ -297,10 +237,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sScan(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<ByteBuffer>>> sScan(Publisher<KeyScanCommand> commands) {
 
@@ -316,10 +252,6 @@ class LettuceReactiveSetCommands implements ReactiveSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSetCommands#sRandMembers(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<SRandMembersCommand, Flux<ByteBuffer>>> sRandMember(
 			Publisher<SRandMembersCommand> commands) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommands.java
index 7fe6d0397..13d512ab7 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommands.java
@@ -73,10 +73,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xAck(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<AcknowledgeCommand, Long>> xAck(Publisher<AcknowledgeCommand> commands) {
 
@@ -92,10 +88,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xAdd(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<AddStreamRecord, RecordId>> xAdd(Publisher<AddStreamRecord> commands) {
 
@@ -118,10 +110,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xClaimJustId(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public Flux<CommandResponse<XClaimCommand, Flux<RecordId>>> xClaimJustId(Publisher<XClaimCommand> commands) {
 
@@ -136,10 +124,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xClaim(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public Flux<CommandResponse<XClaimCommand, Flux<ByteBufferRecord>>> xClaim(Publisher<XClaimCommand> commands) {
 
@@ -157,10 +141,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xDel(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<DeleteCommand, Long>> xDel(Publisher<DeleteCommand> commands) {
 
@@ -216,10 +196,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xLen(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> xLen(Publisher<KeyCommand> commands) {
 
@@ -231,10 +207,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xPendingSummary(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<PendingRecordsCommand, PendingMessagesSummary>> xPendingSummary(
 			Publisher<PendingRecordsCommand> commands) {
@@ -248,10 +220,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xPending(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<PendingRecordsCommand, PendingMessages>> xPending(
 			Publisher<PendingRecordsCommand> commands) {
@@ -275,10 +243,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<RangeCommand, Flux<ByteBufferRecord>>> xRange(Publisher<RangeCommand> commands) {
 
@@ -296,10 +260,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#read(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ReadCommand, Flux<ByteBufferRecord>>> read(Publisher<ReadCommand> commands) {
 
@@ -335,10 +295,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 				.map(it -> StreamRecords.newRecord().in(it.getStream()).withId(it.getId()).ofBuffer(it.getBody()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xInfo(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<XInfoCommand, XInfoStream>> xInfo(Publisher<XInfoCommand> commands) {
 
@@ -352,10 +308,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xInfoGroups(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<XInfoCommand, Flux<XInfoGroup>>> xInfoGroups(Publisher<XInfoCommand> commands) {
 
@@ -368,10 +320,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xInfoConsumers(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<XInfoCommand, Flux<XInfoConsumer>>> xInfoConsumers(Publisher<XInfoCommand> commands) {
 
@@ -385,10 +333,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xRevRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<RangeCommand, Flux<ByteBufferRecord>>> xRevRange(Publisher<RangeCommand> commands) {
 
@@ -406,10 +350,6 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveStreamCommands#xTrim(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> xTrim(Publisher<TrimCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommands.java
index abb05e072..74264c052 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommands.java
@@ -63,10 +63,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#mGet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<List<ByteBuffer>, ByteBuffer>> mGet(Publisher<List<ByteBuffer>> keyCollections) {
 
@@ -79,10 +75,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#set(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SetCommand>> set(Publisher<SetCommand> commands) {
 
@@ -105,10 +97,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#getSet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<SetCommand>> getSet(Publisher<SetCommand> commands) {
 
@@ -126,10 +114,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#get(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<KeyCommand>> get(Publisher<KeyCommand> commands) {
 
@@ -142,10 +126,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#getDel(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<KeyCommand>> getDel(Publisher<KeyCommand> commands) {
 
@@ -158,10 +138,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#getDel(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<GetExCommand>> getEx(Publisher<GetExCommand> commands) {
 
@@ -176,10 +152,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#setNX(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SetCommand>> setNX(Publisher<SetCommand> commands) {
 
@@ -192,10 +164,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#setEX(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SetCommand>> setEX(Publisher<SetCommand> commands) {
 		return connection.execute(cmd -> Flux.from(commands).concatMap(command -> {
@@ -209,10 +177,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#pSetEX(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SetCommand>> pSetEX(Publisher<SetCommand> commands) {
 
@@ -228,10 +192,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#mSet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<MSetCommand>> mSet(Publisher<MSetCommand> commands) {
 
@@ -244,10 +204,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#mSet(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<MSetCommand>> mSetNX(Publisher<MSetCommand> commands) {
 
@@ -259,10 +215,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#append(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<AppendCommand, Long>> append(Publisher<AppendCommand> commands) {
 
@@ -275,10 +227,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#getRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<ByteBufferResponse<RangeCommand>> getRange(Publisher<RangeCommand> commands) {
 
@@ -297,10 +245,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#setRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<SetRangeCommand, Long>> setRange(Publisher<SetRangeCommand> commands) {
 
@@ -315,10 +259,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#getBit(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<GetBitCommand>> getBit(Publisher<GetBitCommand> commands) {
 
@@ -332,10 +272,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#setBit(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<BooleanResponse<SetBitCommand>> setBit(Publisher<SetBitCommand> commands) {
 
@@ -350,10 +286,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#bitCount(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<BitCountCommand, Long>> bitCount(Publisher<BitCountCommand> commands) {
 
@@ -370,10 +302,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#bitField(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<BitFieldCommand, Long>> bitField(Publisher<BitFieldCommand> commands) {
 
@@ -388,10 +316,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#bitOp(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<BitOpCommand, Long>> bitOp(Publisher<BitOpCommand> commands) {
 
@@ -428,10 +352,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#bitPos(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<BitPosCommand, Long>> bitPos(Publisher<BitPosCommand> commands) {
 
@@ -458,10 +378,6 @@ class LettuceReactiveStringCommands implements ReactiveStringCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveRedisConnection.ReactiveStringCommands#strLen(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> strLen(Publisher<KeyCommand> commands) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscription.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscription.java
index 171af6efe..f153546ab 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscription.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscription.java
@@ -69,10 +69,6 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		this.channelState = new State(exceptionTranslator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#subscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> subscribe(ByteBuffer... channels) {
 
@@ -82,10 +78,6 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		return channelState.subscribe(channels, commands::subscribe);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#pSubscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> pSubscribe(ByteBuffer... patterns) {
 
@@ -95,19 +87,11 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		return patternState.subscribe(patterns, commands::psubscribe);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#unsubscribe()
-	 */
 	@Override
 	public Mono<Void> unsubscribe() {
 		return unsubscribe(channelState.getTargets().toArray(new ByteBuffer[channelState.getTargets().size()]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#unsubscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> unsubscribe(ByteBuffer... channels) {
 
@@ -117,19 +101,11 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		return ObjectUtils.isEmpty(channels) ? Mono.empty() : channelState.unsubscribe(channels, commands::unsubscribe);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#pUnsubscribe()
-	 */
 	@Override
 	public Mono<Void> pUnsubscribe() {
 		return pUnsubscribe(patternState.getTargets().toArray(new ByteBuffer[patternState.getTargets().size()]));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#pUnsubscribe(java.nio.ByteBuffer[])
-	 */
 	@Override
 	public Mono<Void> pUnsubscribe(ByteBuffer... patterns) {
 
@@ -139,28 +115,16 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		return ObjectUtils.isEmpty(patterns) ? Mono.empty() : patternState.unsubscribe(patterns, commands::punsubscribe);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#getChannels()
-	 */
 	@Override
 	public Set<ByteBuffer> getChannels() {
 		return channelState.getTargets();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#getPatterns()
-	 */
 	@Override
 	public Set<ByteBuffer> getPatterns() {
 		return patternState.getTargets();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#receive()
-	 */
 	@Override
 	public Flux<Message<ByteBuffer, ByteBuffer>> receive() {
 
@@ -175,10 +139,6 @@ class LettuceReactiveSubscription implements ReactiveSubscription {
 		return channelMessages.mergeWith(patternMessages);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveSubscription#terminate()
-	 */
 	@Override
 	public Mono<Void> cancel() {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java
index 48ba68b51..9e6736457 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommands.java
@@ -69,10 +69,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zAdd(org.reactivestreams.Publisher)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Flux<NumericResponse<ZAddCommand, Number>> zAdd(Publisher<ZAddCommand> commands) {
@@ -126,10 +122,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRem(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZRemCommand, Long>> zRem(Publisher<ZRemCommand> commands) {
 
@@ -143,10 +135,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zIncrBy(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZIncrByCommand, Double>> zIncrBy(Publisher<ZIncrByCommand> commands) {
 
@@ -161,10 +149,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRandMember(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZRandMemberCommand, Flux<ByteBuffer>>> zRandMember(
 			Publisher<ZRandMemberCommand> commands) {
@@ -177,10 +161,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRandMemberWithScore(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZRandMemberCommand, Flux<Tuple>>> zRandMemberWithScore(
 			Publisher<ZRandMemberCommand> commands) {
@@ -194,10 +174,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRank(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZRankCommand, Long>> zRank(Publisher<ZRankCommand> commands) {
 
@@ -214,10 +190,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZRangeCommand, Flux<Tuple>>> zRange(Publisher<ZRangeCommand> commands) {
 
@@ -253,10 +225,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRange(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZRangeByScoreCommand, Flux<Tuple>>> zRangeByScore(
 			Publisher<ZRangeByScoreCommand> commands) {
@@ -322,10 +290,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zScan(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<KeyCommand, Flux<Tuple>>> zScan(Publisher<KeyScanCommand> commands) {
 
@@ -341,10 +305,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zCount(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZCountCommand, Long>> zCount(Publisher<ZCountCommand> commands) {
 
@@ -360,10 +320,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zLexCount(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZLexCountCommand, Long>> zLexCount(Publisher<ZLexCountCommand> commands) {
 
@@ -378,10 +334,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zPop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZPopCommand, Flux<Tuple>>> zPop(Publisher<ZPopCommand> commands) {
 
@@ -402,10 +354,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#bZPop(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<BZPopCommand, Flux<Tuple>>> bZPop(Publisher<BZPopCommand> commands) {
 
@@ -435,10 +383,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zCard(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<KeyCommand, Long>> zCard(Publisher<KeyCommand> commands) {
 
@@ -450,10 +394,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zScore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZScoreCommand, Double>> zScore(Publisher<ZScoreCommand> commands) {
 
@@ -466,10 +406,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zMScore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<MultiValueResponse<ZMScoreCommand, Double>> zMScore(Publisher<ZMScoreCommand> commands) {
 
@@ -483,10 +419,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRemRangeByRank(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZRemRangeByRankCommand, Long>> zRemRangeByRank(
 			Publisher<ZRemRangeByRankCommand> commands) {
@@ -504,10 +436,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRemRangeByRank(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZRemRangeByScoreCommand, Long>> zRemRangeByScore(
 			Publisher<ZRemRangeByScoreCommand> commands) {
@@ -524,10 +452,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRemRangeByLex(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZRemRangeByLexCommand, Long>> zRemRangeByLex(Publisher<ZRemRangeByLexCommand> commands) {
 
@@ -542,10 +466,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zDiff(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZDiffCommand, Flux<ByteBuffer>>> zDiff(Publisher<? extends ZDiffCommand> commands) {
 
@@ -558,10 +478,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zDiffWithScores(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZDiffCommand, Flux<Tuple>>> zDiffWithScores(Publisher<? extends ZDiffCommand> commands) {
 
@@ -574,10 +490,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zDiffStore(Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZDiffStoreCommand, Long>> zDiffStore(Publisher<ZDiffStoreCommand> commands) {
 
@@ -591,10 +503,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zInter(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZAggregateCommand, Flux<ByteBuffer>>> zInter(
 			Publisher<? extends ZAggregateCommand> commands) {
@@ -615,10 +523,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zInterWithScores(Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZAggregateCommand, Flux<Tuple>>> zInterWithScores(
 			Publisher<? extends ZAggregateCommand> commands) {
@@ -640,10 +544,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zInterStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZAggregateStoreCommand, Long>> zInterStore(
 			Publisher<? extends ZAggregateStoreCommand> commands) {
@@ -666,10 +566,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zUnion(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZAggregateCommand, Flux<ByteBuffer>>> zUnion(
 			Publisher<? extends ZAggregateCommand> commands) {
@@ -690,10 +586,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zUnion(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZAggregateCommand, Flux<Tuple>>> zUnionWithScores(
 			Publisher<? extends ZAggregateCommand> commands) {
@@ -715,10 +607,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zUnionStore(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<NumericResponse<ZAggregateStoreCommand, Long>> zUnionStore(
 			Publisher<? extends ZAggregateStoreCommand> commands) {
@@ -741,10 +629,6 @@ class LettuceReactiveZSetCommands implements ReactiveZSetCommands {
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.ReactiveZSetCommands#zRangeByLex(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<CommandResponse<ZRangeByLexCommand, Flux<ByteBuffer>>> zRangeByLex(
 			Publisher<ZRangeByLexCommand> commands) {
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceResult.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceResult.java
index 2549248c2..f66f0f512 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceResult.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceResult.java
@@ -55,10 +55,6 @@ class LettuceResult<T, R> extends FutureResult<RedisCommand<?, T, ?>> {
 		this.convertPipelineAndTxResults = convertPipelineAndTxResults;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.FutureResult#get()
-	 */
 	@Nullable
 	@Override
 	@SuppressWarnings("unchecked")
@@ -66,10 +62,6 @@ class LettuceResult<T, R> extends FutureResult<RedisCommand<?, T, ?>> {
 		return (T) getResultHolder().getOutput().get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.FutureResult#conversionRequired()
-	 */
 	@Override
 	public boolean conversionRequired() {
 		return convertPipelineAndTxResults;
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java
index d53dd5bd2..66cb13ada 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScanCursor.java
@@ -45,10 +45,6 @@ abstract class LettuceScanCursor<T> extends ScanCursor<T> {
 		super(options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ScanCursor#doScan(long, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	protected ScanIteration<T> doScan(long cursorId, ScanOptions options) {
 
@@ -67,10 +63,6 @@ abstract class LettuceScanCursor<T> extends ScanCursor<T> {
 				state != null ? state.getCursor() : "(none)", cursorId));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ScanCursor#isFinished(long)
-	 */
 	@Override
 	protected boolean isFinished(long cursorId) {
 		return state != null && isMatchingCursor(cursorId) ? state.isFinished() : super.isFinished(cursorId);
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScriptingCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScriptingCommands.java
index 91aeaef75..4bc2d0401 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScriptingCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceScriptingCommands.java
@@ -37,19 +37,11 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptFlush()
-	 */
 	@Override
 	public void scriptFlush() {
 		connection.invoke().just(RedisScriptingAsyncCommands::scriptFlush);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptKill()
-	 */
 	@Override
 	public void scriptKill() {
 
@@ -60,10 +52,6 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 		connection.invoke().just(RedisScriptingAsyncCommands::scriptKill);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptLoad(byte[])
-	 */
 	@Override
 	public String scriptLoad(byte[] script) {
 
@@ -72,10 +60,6 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 		return connection.invoke().just(RedisScriptingAsyncCommands::scriptLoad, script);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#scriptExists(java.lang.String[])
-	 */
 	@Override
 	public List<Boolean> scriptExists(String... scriptSha1) {
 
@@ -85,10 +69,6 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 		return connection.invoke().just(RedisScriptingAsyncCommands::scriptExists, scriptSha1);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#eval(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T eval(byte[] script, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 
@@ -104,10 +84,6 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 				.get(new LettuceEvalResultsConverter<T>(returnType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(java.lang.String, org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(String scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 
@@ -122,10 +98,6 @@ class LettuceScriptingCommands implements RedisScriptingCommands {
 				.get(new LettuceEvalResultsConverter<T>(returnType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisScriptingCommands#evalSha(byte[], org.springframework.data.redis.connection.ReturnType, int, byte[][])
-	 */
 	@Override
 	public <T> T evalSha(byte[] scriptSha1, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnection.java
index bfe0ba19e..68c4fc771 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnection.java
@@ -146,10 +146,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 		init();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#failover(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public void failover(NamedNode master) {
 
@@ -158,10 +154,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 		getSentinelCommands().failover(master.getName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#masters()
-	 */
 	@Override
 	public List<RedisServer> masters() {
 		try {
@@ -171,10 +163,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#slaves(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public List<RedisServer> slaves(NamedNode master) {
 
@@ -197,10 +185,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#remove(org.springframework.data.redis.connection.NamedNode)
-	 */
 	@Override
 	public void remove(NamedNode master) {
 
@@ -218,10 +202,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 		getSentinelCommands().remove(masterName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSentinelCommands#monitor(org.springframework.data.redis.connection.RedisServer)
-	 */
 	@Override
 	public void monitor(RedisServer server) {
 
@@ -234,10 +214,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 				server.getQuorum().intValue());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	public void close() throws IOException {
 		provider.release(connection);
@@ -285,19 +261,11 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 			redisClient = RedisClient.create(clientResources, uri);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-		 */
 		@Override
 		public <T extends StatefulConnection<?, ?>> CompletableFuture<T> getConnectionAsync(Class<T> connectionType) {
 			return redisClient.connectSentinelAsync(StringCodec.UTF8, uri).thenApply(connectionType::cast);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#release(io.lettuce.core.api.StatefulConnection)
-		 */
 		@Override
 		public void release(StatefulConnection<?, ?> connection) {
 
@@ -305,10 +273,6 @@ public class LettuceSentinelConnection implements RedisSentinelConnection {
 			redisClient.shutdown();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#releaseAsync(io.lettuce.core.api.StatefulConnection)
-		 */
 		@Override
 		public CompletableFuture<Void> releaseAsync(StatefulConnection<?, ?> connection) {
 			return connection.closeAsync().exceptionally(LettuceFutureUtils.ignoreErrors())
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceServerCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceServerCommands.java
index 0e13eb87b..0326ddfbd 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceServerCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceServerCommands.java
@@ -44,82 +44,46 @@ class LettuceServerCommands implements RedisServerCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgReWriteAof()
-	 */
 	@Override
 	public void bgReWriteAof() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::bgrewriteaof);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#bgSave()
-	 */
 	@Override
 	public void bgSave() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::bgsave);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#lastSave()
-	 */
 	@Override
 	public Long lastSave() {
 		return connection.invoke().from(RedisServerAsyncCommands::lastsave).get(LettuceConverters::toLong);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#save()
-	 */
 	@Override
 	public void save() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::save);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#dbSize()
-	 */
 	@Override
 	public Long dbSize() {
 		return connection.invoke().just(RedisServerAsyncCommands::dbsize);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushDb()
-	 */
 	@Override
 	public void flushDb() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::flushdb);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#flushAll()
-	 */
 	@Override
 	public void flushAll() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::flushall);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info()
-	 */
 	@Override
 	public Properties info() {
 		return connection.invoke().from(RedisServerAsyncCommands::info).get(LettuceConverters.stringToProps());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#info(java.lang.String)
-	 */
 	@Override
 	public Properties info(String section) {
 
@@ -128,10 +92,6 @@ class LettuceServerCommands implements RedisServerCommands {
 		return connection.invoke().from(RedisServerAsyncCommands::info, section).get(LettuceConverters.stringToProps());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown()
-	 */
 	@Override
 	public void shutdown() {
 		connection.invokeStatus().just(it -> {
@@ -142,10 +102,6 @@ class LettuceServerCommands implements RedisServerCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#shutdown(org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption)
-	 */
 	@Override
 	public void shutdown(ShutdownOption option) {
 
@@ -164,10 +120,6 @@ class LettuceServerCommands implements RedisServerCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getConfig(java.lang.String)
-	 */
 	@Override
 	public Properties getConfig(String pattern) {
 
@@ -177,10 +129,6 @@ class LettuceServerCommands implements RedisServerCommands {
 				.get(LettuceConverters.mapToPropertiesConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setConfig(java.lang.String, java.lang.String)
-	 */
 	@Override
 	public void setConfig(String param, String value) {
 
@@ -190,28 +138,16 @@ class LettuceServerCommands implements RedisServerCommands {
 		connection.invokeStatus().just(RedisServerAsyncCommands::configSet, param, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void resetConfigStats() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::configResetstat);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#resetConfigStats()
-	 */
 	@Override
 	public void rewriteConfig() {
 		connection.invokeStatus().just(RedisServerAsyncCommands::configRewrite);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#time(TimeUnit)
-	 */
 	@Override
 	public Long time(TimeUnit timeUnit) {
 
@@ -220,10 +156,6 @@ class LettuceServerCommands implements RedisServerCommands {
 		return connection.invoke().from(RedisServerAsyncCommands::time).get(LettuceConverters.toTimeConverter(timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#killClient(java.lang.String, int)
-	 */
 	@Override
 	public void killClient(String host, int port) {
 
@@ -234,10 +166,6 @@ class LettuceServerCommands implements RedisServerCommands {
 		connection.invoke().just(RedisServerAsyncCommands::clientKill, client);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#setClientName(byte[])
-	 */
 	@Override
 	public void setClientName(byte[] name) {
 
@@ -246,19 +174,11 @@ class LettuceServerCommands implements RedisServerCommands {
 		connection.invoke().just(RedisServerAsyncCommands::clientSetname, name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
-	 */
 	@Override
 	public String getClientName() {
 		return connection.invoke().from(RedisServerAsyncCommands::clientGetname).get(LettuceConverters::toString);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 
@@ -270,10 +190,6 @@ class LettuceServerCommands implements RedisServerCommands {
 				.get(LettuceConverters.stringToRedisClientListConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
-	 */
 	@Override
 	public void slaveOf(String host, int port) {
 
@@ -282,28 +198,16 @@ class LettuceServerCommands implements RedisServerCommands {
 		connection.invoke().just(RedisServerAsyncCommands::slaveof, host, port);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 		connection.invoke().just(RedisServerAsyncCommands::slaveofNoOne);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option) {
 		migrate(key, target, dbIndex, option, Long.MAX_VALUE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisServerCommands#migrate(byte[], org.springframework.data.redis.connection.RedisNode, int, org.springframework.data.redis.connection.RedisServerCommands.MigrateOption, long)
-	 */
 	@Override
 	public void migrate(byte[] key, RedisNode target, int dbIndex, @Nullable MigrateOption option, long timeout) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java
index 68a3c5dc4..693ad2d48 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSetCommands.java
@@ -44,10 +44,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sAdd(byte[], byte[][])
-	 */
 	@Override
 	public Long sAdd(byte[] key, byte[]... values) {
 
@@ -58,10 +54,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sadd, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sCard(byte[])
-	 */
 	@Override
 	public Long sCard(byte[] key) {
 
@@ -70,10 +62,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::scard, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sDiff(byte[]... keys) {
 
@@ -83,10 +71,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sdiff, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sDiffStore(byte[] destKey, byte[]... keys) {
 
@@ -97,10 +81,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sdiffstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sInter(byte[]... keys) {
 
@@ -110,10 +90,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sinter, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sInterStore(byte[] destKey, byte[]... keys) {
 
@@ -124,10 +100,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sinterstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sIsMember(byte[], byte[])
-	 */
 	@Override
 	public Boolean sIsMember(byte[] key, byte[] value) {
 
@@ -137,10 +109,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sismember, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMIsMember(byte[], byte[]...)
-	 */
 	@Override
 	public List<Boolean> sMIsMember(byte[] key, byte[]... values) {
 
@@ -151,10 +119,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::smismember, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMembers(byte[])
-	 */
 	@Override
 	public Set<byte[]> sMembers(byte[] key) {
 
@@ -163,10 +127,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::smembers, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sMove(byte[], byte[], byte[])
-	 */
 	@Override
 	public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) {
 
@@ -177,10 +137,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::smove, srcKey, destKey, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[])
-	 */
 	@Override
 	public byte[] sPop(byte[] key) {
 
@@ -189,10 +145,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::spop, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sPop(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sPop(byte[] key, long count) {
 
@@ -201,10 +153,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().from(RedisSetAsyncCommands::spop, key, count).get(ArrayList::new);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[])
-	 */
 	@Override
 	public byte[] sRandMember(byte[] key) {
 
@@ -213,10 +161,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::srandmember, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> sRandMember(byte[] key, long count) {
 
@@ -225,10 +169,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::srandmember, key, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sRem(byte[], byte[][])
-	 */
 	@Override
 	public Long sRem(byte[] key, byte[]... values) {
 
@@ -239,10 +179,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::srem, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> sUnion(byte[]... keys) {
 
@@ -252,10 +188,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sunion, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long sUnionStore(byte[] destKey, byte[]... keys) {
 
@@ -266,10 +198,6 @@ class LettuceSetCommands implements RedisSetCommands {
 		return connection.invoke().just(RedisSetAsyncCommands::sunionstore, destKey, keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisSetCommands#sScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<byte[]> sScan(byte[] key, ScanOptions options) {
 		return sScan(key, 0, options);
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStreamCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStreamCommands.java
index 6f137850b..98bd5bb2c 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStreamCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStreamCommands.java
@@ -60,10 +60,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAck(byte[], byte[], java.lang.String[])
-	 */
 	@Override
 	public Long xAck(byte[] key, String group, RecordId... recordIds) {
 
@@ -76,10 +72,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().just(RedisStreamAsyncCommands::xack, key, LettuceConverters.toBytes(group), ids);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xAdd(byte[], MapRecord, XAddOptions)
-	 */
 	@Override
 	public RecordId xAdd(MapRecord<byte[], byte[], byte[]> record, XAddOptions options) {
 
@@ -97,10 +89,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.get(RecordId::of);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaimJustId(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<RecordId> xClaimJustId(byte[] key, String group, String newOwner, XClaimOptions options) {
 
@@ -113,10 +101,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(it -> RecordId.of(it.getId()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xClaim(byte[], java.lang.String, java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XClaimOptions)
-	 */
 	@Override
 	public List<ByteRecord> xClaim(byte[] key, String group, String newOwner, XClaimOptions options) {
 
@@ -129,10 +113,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(StreamConverters.byteRecordConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xDel(byte[], java.lang.String[])
-	 */
 	@Override
 	public Long xDel(byte[] key, RecordId... recordIds) {
 
@@ -142,19 +122,11 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().just(RedisStreamAsyncCommands::xdel, key, entryIdsToString(recordIds));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset) {
 		return xGroupCreate(key, groupName, readOffset, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupCreate(byte[], org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String, boolean)
-	 */
 	@Override
 	public String xGroupCreate(byte[] key, String groupName, ReadOffset readOffset, boolean mkSteam) {
 
@@ -168,10 +140,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				LettuceConverters.toBytes(groupName), XGroupCreateArgs.Builder.mkstream(mkSteam));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDelConsumer(byte[], org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean xGroupDelConsumer(byte[] key, Consumer consumer) {
 
@@ -184,10 +152,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.get(Objects::nonNull);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xGroupDestroy(byte[], java.lang.String)
-	 */
 	@Override
 	public Boolean xGroupDestroy(byte[] key, String groupName) {
 
@@ -197,10 +161,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().just(RedisStreamAsyncCommands::xgroupDestroy, key, LettuceConverters.toBytes(groupName));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfo(byte[])
-	 */
 	@Override
 	public XInfoStream xInfo(byte[] key) {
 
@@ -209,10 +169,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().from(RedisStreamAsyncCommands::xinfoStream, key).get(XInfoStream::fromList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoGroups(byte[])
-	 */
 	@Override
 	public XInfoGroups xInfoGroups(byte[] key) {
 
@@ -221,10 +177,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().from(RedisStreamAsyncCommands::xinfoGroups, key).get(XInfoGroups::fromList);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xInfoConsumers(byte[], java.lang.String)
-	 */
 	@Override
 	public XInfoConsumers xInfoConsumers(byte[] key, String groupName) {
 
@@ -235,10 +187,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.get(it -> XInfoConsumers.fromList(groupName, it));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xLen(byte[])
-	 */
 	@Override
 	public Long xLen(byte[] key) {
 
@@ -247,10 +195,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 		return connection.invoke().just(RedisStreamAsyncCommands::xlen, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary xPending(byte[] key, String groupName) {
 
@@ -260,10 +204,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.get(it -> StreamConverters.toPendingMessagesInfo(groupName, it));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xPending(byte[], java.lang.String, org.springframework.data.redis.connection.RedisStreamCommands.XPendingOptions)
-	 */
 	@Override
 	public PendingMessages xPending(byte[] key, String groupName, XPendingOptions options) {
 
@@ -285,10 +225,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.get(it -> StreamConverters.toPendingMessages(groupName, options.getRange(), it));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRange(byte[] key, Range<String> range, Limit limit) {
 
@@ -303,10 +239,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(StreamConverters.byteRecordConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRead(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xRead(StreamReadOptions readOptions, StreamOffset<byte[]>... streams) {
 
@@ -327,10 +259,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(StreamConverters.byteRecordConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xReadGroup(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<ByteRecord> xReadGroup(Consumer consumer, StreamReadOptions readOptions,
 			StreamOffset<byte[]>... streams) {
@@ -354,10 +282,6 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(StreamConverters.byteRecordConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xRevRange(byte[], org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<ByteRecord> xRevRange(byte[] key, Range<String> range, Limit limit) {
 
@@ -373,19 +297,11 @@ class LettuceStreamCommands implements RedisStreamCommands {
 				.toList(StreamConverters.byteRecordConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count) {
 		return xTrim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands#xTrim(byte[], long, boolean)
-	 */
 	@Override
 	public Long xTrim(byte[] key, long count, boolean approximateTrimming) {
 		Assert.notNull(key, "Key must not be null!");
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStringCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStringCommands.java
index 52ad1d62e..122d215fc 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStringCommands.java
@@ -43,10 +43,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#get(byte[])
-	 */
 	@Override
 	public byte[] get(byte[] key) {
 
@@ -55,10 +51,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::get, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getDel(byte[])
-	 */
 	@Nullable
 	@Override
 	public byte[] getDel(byte[] key) {
@@ -68,10 +60,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::getdel, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getEx(byte[], org.springframework.data.redis.core.types.Expiration)
-	 */
 	@Nullable
 	@Override
 	public byte[] getEx(byte[] key, Expiration expiration) {
@@ -82,10 +70,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::getex, key, LettuceConverters.toGetExArgs(expiration));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getSet(byte[], byte[])
-	 */
 	@Override
 	public byte[] getSet(byte[] key, byte[] value) {
 
@@ -95,10 +79,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::getset, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mGet(byte[][])
-	 */
 	@Override
 	public List<byte[]> mGet(byte[]... keys) {
 
@@ -109,10 +89,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.toList(source -> source.getValueOrElse(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[])
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value) {
 
@@ -123,10 +99,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#set(byte[], byte[], org.springframework.data.redis.core.types.Expiration, org.springframework.data.redis.connection.RedisStringCommands.SetOption)
-	 */
 	@Override
 	public Boolean set(byte[] key, byte[] value, Expiration expiration, SetOption option) {
 
@@ -140,10 +112,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.orElse(LettuceConverters.stringToBooleanConverter(), false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setNX(byte[], byte[])
-	 */
 	@Override
 	public Boolean setNX(byte[] key, byte[] value) {
 
@@ -153,10 +121,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::setnx, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean setEx(byte[] key, long seconds, byte[] value) {
 
@@ -167,10 +131,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#pSetEx(byte[], long, byte[])
-	 */
 	@Override
 	public Boolean pSetEx(byte[] key, long milliseconds, byte[] value) {
 
@@ -181,10 +141,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSet(java.util.Map)
-	 */
 	@Override
 	public Boolean mSet(Map<byte[], byte[]> tuples) {
 
@@ -193,10 +149,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().from(RedisStringAsyncCommands::mset, tuples).get(Converters.stringToBooleanConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#mSetNX(java.util.Map)
-	 */
 	@Override
 	public Boolean mSetNX(Map<byte[], byte[]> tuples) {
 
@@ -205,10 +157,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::msetnx, tuples);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incr(byte[])
-	 */
 	@Override
 	public Long incr(byte[] key) {
 
@@ -217,10 +165,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::incr, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], long)
-	 */
 	@Override
 	public Long incrBy(byte[] key, long value) {
 
@@ -229,10 +173,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::incrby, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#incrBy(byte[], double)
-	 */
 	@Override
 	public Double incrBy(byte[] key, double value) {
 
@@ -241,10 +181,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::incrbyfloat, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decr(byte[])
-	 */
 	@Override
 	public Long decr(byte[] key) {
 
@@ -253,10 +189,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::decr, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#decrBy(byte[], long)
-	 */
 	@Override
 	public Long decrBy(byte[] key, long value) {
 
@@ -265,10 +197,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::decrby, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#append(byte[], byte[])
-	 */
 	@Override
 	public Long append(byte[] key, byte[] value) {
 
@@ -278,10 +206,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::append, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getRange(byte[], long, long)
-	 */
 	@Override
 	public byte[] getRange(byte[] key, long start, long end) {
 
@@ -290,10 +214,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::getrange, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setRange(byte[], byte[], long)
-	 */
 	@Override
 	public void setRange(byte[] key, byte[] value, long offset) {
 
@@ -303,10 +223,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		connection.invokeStatus().just(RedisStringAsyncCommands::setrange, key, offset, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#getBit(byte[], long)
-	 */
 	@Override
 	public Boolean getBit(byte[] key, long offset) {
 
@@ -316,10 +232,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.get(LettuceConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#setBit(byte[], long, boolean)
-	 */
 	@Override
 	public Boolean setBit(byte[] key, long offset, boolean value) {
 
@@ -329,10 +241,6 @@ class LettuceStringCommands implements RedisStringCommands {
 				.get(LettuceConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[])
-	 */
 	@Override
 	public Long bitCount(byte[] key) {
 
@@ -341,10 +249,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::bitcount, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitCount(byte[], long, long)
-	 */
 	@Override
 	public Long bitCount(byte[] key, long start, long end) {
 
@@ -353,10 +257,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::bitcount, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitfield(byte[], BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitField(byte[] key, BitFieldSubCommands subCommands) {
 
@@ -368,10 +268,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::bitfield, key, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitOp(org.springframework.data.redis.connection.RedisStringCommands.BitOperation, byte[], byte[][])
-	 */
 	@Override
 	public Long bitOp(BitOperation op, byte[] destination, byte[]... keys) {
 
@@ -402,10 +298,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#bitPos(byte[], boolean, org.springframework.data.domain.Range)
-	 */
 	@Nullable
 	@Override
 	public Long bitPos(byte[] key, boolean bit, Range<Long> range) {
@@ -426,10 +318,6 @@ class LettuceStringCommands implements RedisStringCommands {
 		return connection.invoke().just(RedisStringAsyncCommands::bitpos, key, bit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStringCommands#strLen(byte[])
-	 */
 	@Override
 	public Long strLen(byte[] key) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java
index 74aaa7fcb..8e2020164 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java
@@ -72,10 +72,6 @@ public class LettuceSubscription extends AbstractSubscription {
 		return connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doClose()
-	 */
 	@Override
 	protected void doClose() {
 
@@ -105,19 +101,11 @@ public class LettuceSubscription extends AbstractSubscription {
 		connectionProvider.release(connection);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doPsubscribe(byte[][])
-	 */
 	@Override
 	protected void doPsubscribe(byte[]... patterns) {
 		pubsub.psubscribe(patterns);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doPUnsubscribe(boolean, byte[][])
-	 */
 	@Override
 	protected void doPUnsubscribe(boolean all, byte[]... patterns) {
 
@@ -128,19 +116,11 @@ public class LettuceSubscription extends AbstractSubscription {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doSubscribe(byte[][])
-	 */
 	@Override
 	protected void doSubscribe(byte[]... channels) {
 		pubsub.subscribe(channels);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.util.AbstractSubscription#doUnsubscribe(boolean, byte[][])
-	 */
 	@Override
 	protected void doUnsubscribe(boolean all, byte[]... channels) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java
index 87e768e78..6468ae461 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceZSetCommands.java
@@ -52,10 +52,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		this.connection = connection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], double, byte[], org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Boolean zAdd(byte[] key, double score, byte[] value, ZAddArgs args) {
 
@@ -67,10 +63,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.get(LettuceConverters.longToBoolean());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zAdd(byte[], java.util.Set, org.springframework.data.redis.connection.RedisZSetCommands.ZAddArgs)
-	 */
 	@Override
 	public Long zAdd(byte[] key, Set<Tuple> tuples, ZAddArgs args) {
 
@@ -81,10 +73,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.toObjects(tuples).toArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRem(byte[], byte[][])
-	 */
 	@Override
 	public Long zRem(byte[] key, byte[]... values) {
 
@@ -95,10 +83,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zrem, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zIncrBy(byte[], double, byte[])
-	 */
 	@Override
 	public Double zIncrBy(byte[] key, double increment, byte[] value) {
 
@@ -108,10 +92,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zincrby, key, increment, value);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[])
-	 */
 	@Override
 	public byte[] zRandMember(byte[] key) {
 
@@ -120,10 +100,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zrandmember, key);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMember(byte[], long)
-	 */
 	@Override
 	public List<byte[]> zRandMember(byte[] key, long count) {
 
@@ -132,10 +108,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zrandmember, key, count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[])
-	 */
 	@Override
 	public Tuple zRandMemberWithScore(byte[] key) {
 
@@ -145,10 +117,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.get(LettuceConverters::toTuple);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRandMemberWithScore(byte[], long)
-	 */
 	@Override
 	public List<Tuple> zRandMemberWithScore(byte[] key, long count) {
 
@@ -158,10 +126,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toList(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRank(byte[] key, byte[] value) {
 
@@ -171,10 +135,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zrank, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRank(byte[], byte[])
-	 */
 	@Override
 	public Long zRevRank(byte[] key, byte[] value) {
 
@@ -183,10 +143,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zrevrank, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRange(byte[] key, long start, long end) {
 
@@ -195,10 +151,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().fromMany(RedisSortedSetAsyncCommands::zrange, key, start, end).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRangeWithScores(byte[] key, long start, long end) {
 
@@ -208,10 +160,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -231,10 +179,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRange(byte[], long, long)
-	 */
 	@Override
 	public Set<byte[]> zRevRange(byte[] key, long start, long end) {
 
@@ -244,10 +188,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(Converters.identityConverter());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeWithScores(byte[], long, long)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeWithScores(byte[] key, long start, long end) {
 
@@ -257,10 +197,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -280,10 +216,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByScoreWithScores(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<Tuple> zRevRangeByScoreWithScores(byte[] key, Range range, Limit limit) {
 
@@ -303,10 +235,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zCount(byte[] key, Range range) {
 
@@ -316,10 +244,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<Number> toRange(range));
 	}
 
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.redis.connection.RedisZSetCommands#zLexCount(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	*/
 	@Override
 	public Long zLexCount(byte[] key, Range range) {
 
@@ -330,10 +254,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<byte[]> toRange(range, true));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMin(byte[] key) {
@@ -343,10 +263,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().from(RedisSortedSetAsyncCommands::zpopmin, key).get(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMin(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMin(byte[] key, long count) {
@@ -357,10 +273,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMin(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMin(byte[] key, long timeout, TimeUnit unit) {
@@ -380,10 +292,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.get(it -> it.map(LettuceConverters::toTuple).getValueOrElse(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[])
-	 */
 	@Nullable
 	@Override
 	public Tuple zPopMax(byte[] key) {
@@ -393,10 +301,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().from(RedisSortedSetAsyncCommands::zpopmax, key).get(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zPopMax(byte[], long)
-	 */
 	@Nullable
 	@Override
 	public Set<Tuple> zPopMax(byte[] key, long count) {
@@ -407,10 +311,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#bZPopMax(byte[], long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Tuple bZPopMax(byte[] key, long timeout, TimeUnit unit) {
@@ -430,10 +330,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.get(it -> it.map(LettuceConverters::toTuple).getValueOrElse(null));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zCard(byte[])
-	 */
 	@Override
 	public Long zCard(byte[] key) {
 
@@ -442,10 +338,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zcard, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScore(byte[], byte[])
-	 */
 	@Override
 	public Double zScore(byte[] key, byte[] value) {
 
@@ -455,10 +347,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zscore, key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zMScore(byte[], byte[][])
-	 */
 	@Override
 	public List<Double> zMScore(byte[] key, byte[][] values) {
 
@@ -468,10 +356,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zmscore, key, values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRange(byte[], long, long)
-	 */
 	@Override
 	public Long zRemRange(byte[] key, long start, long end) {
 
@@ -480,10 +364,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zremrangebyrank, key, start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByLex(byte[] key, Range range) {
 
@@ -494,10 +374,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<byte[]> toRange(range, true));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRemRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long zRemRangeByScore(byte[] key, Range range) {
 
@@ -508,10 +384,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<Number> toRange(range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiff(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zDiff(byte[]... sets) {
 
@@ -520,10 +392,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().fromMany(RedisSortedSetAsyncCommands::zdiff, sets).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zDiffWithScores(byte[]... sets) {
 
@@ -533,10 +401,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zDiffStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zDiffStore(byte[] destKey, byte[]... sets) {
 
@@ -546,10 +410,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zdiffstore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInter(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zInter(byte[]... sets) {
 
@@ -558,10 +418,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().fromMany(RedisSortedSetAsyncCommands::zinter, sets).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(byte[]... sets) {
 
@@ -571,10 +427,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zInterWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -589,10 +441,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -607,10 +455,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zinterstore, destKey, storeArgs, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zInterStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zInterStore(byte[] destKey, byte[]... sets) {
 
@@ -621,10 +465,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zinterstore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnion(byte[][])
-	 */
 	@Override
 	public Set<byte[]> zUnion(byte[]... sets) {
 
@@ -633,10 +473,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().fromMany(RedisSortedSetAsyncCommands::zunion, sets).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(byte[]... sets) {
 
@@ -646,10 +482,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionWithScores(org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Set<Tuple> zUnionWithScores(Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -664,10 +496,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet(LettuceConverters::toTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights, byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
 
@@ -682,10 +510,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zunionstore, destKey, storeArgs, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zUnionStore(byte[], byte[][])
-	 */
 	@Override
 	public Long zUnionStore(byte[] destKey, byte[]... sets) {
 
@@ -696,10 +520,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().just(RedisSortedSetAsyncCommands::zunionstore, destKey, sets);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zScan(byte[], org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Tuple> zScan(byte[] key, ScanOptions options) {
 		return zScan(key, 0L, options);
@@ -746,10 +566,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		}.open();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max) {
 
@@ -758,10 +574,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 		return connection.invoke().fromMany(RedisSortedSetAsyncCommands::zrangebyscore, key, min, max).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], java.lang.String, java.lang.String, long, long)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, String min, String max, long offset, long count) {
 
@@ -771,10 +583,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				.toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByScore(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByScore(byte[] key, Range range, Limit limit) {
 
@@ -791,10 +599,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<Number> toRange(range), LettuceConverters.toLimit(limit)).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRangeByLex(byte[] key, Range range, Limit limit) {
 
@@ -812,10 +616,6 @@ class LettuceZSetCommands implements RedisZSetCommands {
 				LettuceConverters.<byte[]> toRange(range, true), LettuceConverters.toLimit(limit)).toSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisZSetCommands#zRevRangeByLex(byte[], org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java
index c25bc3c2a..e1e849bf7 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/StandaloneConnectionProvider.java
@@ -94,10 +94,6 @@ class StandaloneConnectionProvider implements LettuceConnectionProvider, TargetA
 		};
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType) {
 
@@ -118,19 +114,11 @@ class StandaloneConnectionProvider implements LettuceConnectionProvider, TargetA
 		throw new UnsupportedOperationException("Connection type " + connectionType + " not supported!");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType) {
 		return getConnectionAsync(connectionType, redisURISupplier.get());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider.TargetAware#getConnectionAsync(java.lang.Class, io.lettuce.core.RedisURI)
-	 */
 	@SuppressWarnings({ "null", "unchecked", "rawtypes" })
 	@Override
 	public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType,
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java
index bb4f828c8..2d73b4469 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java
@@ -64,10 +64,6 @@ class StaticMasterReplicaConnectionProvider implements LettuceConnectionProvider
 		this.nodes = nodes;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> T getConnection(Class<T> connectionType) {
 
@@ -86,10 +82,6 @@ class StaticMasterReplicaConnectionProvider implements LettuceConnectionProvider
 		throw new UnsupportedOperationException(String.format("Connection type %s not supported!", connectionType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
-	 */
 	@Override
 	public <T extends StatefulConnection<?, ?>> CompletionStage<T> getConnectionAsync(Class<T> connectionType) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/StreamConverters.java b/src/main/java/org/springframework/data/redis/connection/lettuce/StreamConverters.java
index 58436d69c..18915ee27 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/StreamConverters.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/StreamConverters.java
@@ -188,10 +188,6 @@ class StreamConverters {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public XReadArgs convert(StreamReadOptions source) {
 
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/ByteBufferRecord.java b/src/main/java/org/springframework/data/redis/connection/stream/ByteBufferRecord.java
index 4ad32de0e..2dc3e5b33 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/ByteBufferRecord.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/ByteBufferRecord.java
@@ -33,10 +33,6 @@ import org.springframework.lang.Nullable;
  */
 public interface ByteBufferRecord extends MapRecord<ByteBuffer, ByteBuffer, ByteBuffer> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withId(org.springframework.data.redis.connection.RedisStreamCommands.RecordId)
-	 */
 	@Override
 	ByteBufferRecord withId(RecordId id);
 
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/ByteRecord.java b/src/main/java/org/springframework/data/redis/connection/stream/ByteRecord.java
index 6c1011dfe..56c22e628 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/ByteRecord.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/ByteRecord.java
@@ -29,10 +29,6 @@ import org.springframework.lang.Nullable;
  */
 public interface ByteRecord extends MapRecord<byte[], byte[], byte[]> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withId(org.springframework.data.redis.connection.RedisStreamCommands.RecordId)
-	 */
 	@Override
 	ByteRecord withId(RecordId id);
 
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/MapRecord.java b/src/main/java/org/springframework/data/redis/connection/stream/MapRecord.java
index acf1f8d00..c1749fd38 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/MapRecord.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/MapRecord.java
@@ -54,17 +54,9 @@ public interface MapRecord<S, K, V> extends Record<S, Map<K, V>>, Iterable<Map.E
 		return new MapBackedRecord<>(stream, RecordId.autoGenerate(), map);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withId(org.springframework.data.redis.connection.RedisStreamCommands.RecordId)
-	 */
 	@Override
 	MapRecord<S, K, V> withId(RecordId id);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withStreamKey(java.lang.Object)
-	 */
 	@Override
 	<SK> MapRecord<SK, K, V> withStreamKey(SK key);
 
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/ObjectRecord.java b/src/main/java/org/springframework/data/redis/connection/stream/ObjectRecord.java
index aaaacc1e8..4ffa38fcc 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/ObjectRecord.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/ObjectRecord.java
@@ -45,17 +45,9 @@ public interface ObjectRecord<S, V> extends Record<S, V> {
 		return new ObjectBackedRecord<>(stream, RecordId.autoGenerate(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withId(org.springframework.data.redis.connection.RedisStreamCommands.RecordId)
-	 */
 	@Override
 	ObjectRecord<S, V> withId(RecordId id);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withStreamKey(java.lang.Object)
-	 */
 	<SK> ObjectRecord<SK, V> withStreamKey(SK key);
 
 	/**
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/PendingMessages.java b/src/main/java/org/springframework/data/redis/connection/stream/PendingMessages.java
index af1ea6e0d..fb17b8ece 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/PendingMessages.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/PendingMessages.java
@@ -102,10 +102,6 @@ public class PendingMessages implements Streamable<PendingMessage> {
 		return pendingMessages.get(index);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<PendingMessage> iterator() {
 		return pendingMessages.iterator();
diff --git a/src/main/java/org/springframework/data/redis/connection/stream/StringRecord.java b/src/main/java/org/springframework/data/redis/connection/stream/StringRecord.java
index 1fa0d6191..3c25ece03 100644
--- a/src/main/java/org/springframework/data/redis/connection/stream/StringRecord.java
+++ b/src/main/java/org/springframework/data/redis/connection/stream/StringRecord.java
@@ -23,10 +23,6 @@ package org.springframework.data.redis.connection.stream;
  */
 public interface StringRecord extends MapRecord<String, String, String> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisStreamCommands.Record#withId(org.springframework.data.redis.connection.RedisStreamCommands.RecordId)
-	 */
 	@Override
 	StringRecord withId(RecordId id);
 
diff --git a/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java b/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java
index 29c7fd4f7..19cb4a997 100644
--- a/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java
+++ b/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java
@@ -97,10 +97,6 @@ public abstract class AbstractSubscription implements Subscription {
 	 */
 	protected abstract void doPUnsubscribe(boolean all, byte[]... patterns);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#close()
-	 */
 	@Override
 	public void close() {
 		doClose();
@@ -111,19 +107,11 @@ public abstract class AbstractSubscription implements Subscription {
 	 */
 	protected abstract void doClose();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#getListener()
-	 */
 	@Override
 	public MessageListener getListener() {
 		return listener;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#getChannels()
-	 */
 	@Override
 	public Collection<byte[]> getChannels() {
 		synchronized (channels) {
@@ -131,10 +119,6 @@ public abstract class AbstractSubscription implements Subscription {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#getPatterns()
-	 */
 	@Override
 	public Collection<byte[]> getPatterns() {
 		synchronized (patterns) {
@@ -142,10 +126,6 @@ public abstract class AbstractSubscription implements Subscription {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#pSubscribe(byte[][])
-	 */
 	@Override
 	public void pSubscribe(byte[]... patterns) {
 		checkPulse();
@@ -159,19 +139,11 @@ public abstract class AbstractSubscription implements Subscription {
 		doPsubscribe(patterns);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#pUnsubscribe()
-	 */
 	@Override
 	public void pUnsubscribe() {
 		pUnsubscribe((byte[][]) null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#subscribe(byte[][])
-	 */
 	@Override
 	public void subscribe(byte[]... channels) {
 		checkPulse();
@@ -185,19 +157,11 @@ public abstract class AbstractSubscription implements Subscription {
 		doSubscribe(channels);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#unsubscribe()
-	 */
 	@Override
 	public void unsubscribe() {
 		unsubscribe((byte[][]) null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#pUnsubscribe(byte[][])
-	 */
 	@Override
 	public void pUnsubscribe(@Nullable byte[]... patts) {
 		if (!isAlive()) {
@@ -226,10 +190,6 @@ public abstract class AbstractSubscription implements Subscription {
 		closeIfUnsubscribed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#unsubscribe(byte[][])
-	 */
 	@Override
 	public void unsubscribe(@Nullable byte[]... chans) {
 		if (!isAlive()) {
@@ -258,10 +218,6 @@ public abstract class AbstractSubscription implements Subscription {
 		closeIfUnsubscribed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.Subscription#isAlive()
-	 */
 	@Override
 	public boolean isAlive() {
 		return alive.get();
diff --git a/src/main/java/org/springframework/data/redis/core/ConvertingCursor.java b/src/main/java/org/springframework/data/redis/core/ConvertingCursor.java
index 8b44a85ee..267a861f5 100644
--- a/src/main/java/org/springframework/data/redis/core/ConvertingCursor.java
+++ b/src/main/java/org/springframework/data/redis/core/ConvertingCursor.java
@@ -46,75 +46,43 @@ public class ConvertingCursor<S, T> implements Cursor<T> {
 		this.converter = converter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#hasNext()
-	 */
 	@Override
 	public boolean hasNext() {
 		return delegate.hasNext();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#next()
-	 */
 	@Override
 	@Nullable
 	public T next() {
 		return converter.convert(delegate.next());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#remove()
-	 */
 	@Override
 	public void remove() {
 		delegate.remove();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	public void close() {
 		delegate.close();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#getCursorId()
-	 */
 	@Override
 	public long getCursorId() {
 		return delegate.getCursorId();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return delegate.isClosed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#open()
-	 */
 	@Override
 	public Cursor<T> open() {
 		this.delegate = delegate.open();
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#getPosition()
-	 */
 	@Override
 	public long getPosition() {
 		return delegate.getPosition();
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java
index a528f7d0e..4f8deac14 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundGeoOperations.java
@@ -54,156 +54,88 @@ class DefaultBoundGeoOperations<K, M> extends DefaultBoundKeyOperations<K> imple
 		this.ops = operations.opsForGeo();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#add(org.springframework.data.geo.Point, java.lang.Object)
-	 */
 	@Override
 	public Long add(Point point, M member) {
 		return ops.add(getKey(), point, member);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#add(org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation)
-	 */
 	@Override
 	public Long add(GeoLocation<M> location) {
 		return ops.add(getKey(), location);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#add(java.util.Map)
-	 */
 	@Override
 	public Long add(Map<M, Point> memberCoordinateMap) {
 		return ops.add(getKey(), memberCoordinateMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#add(java.lang.Iterable)
-	 */
 	@Override
 	public Long add(Iterable<GeoLocation<M>> locations) {
 		return ops.add(getKey(), locations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#distance(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Distance distance(M member1, M member2) {
 		return ops.distance(getKey(), member1, member2);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#distance(java.lang.Object, java.lang.Object, org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance distance(M member1, M member2, Metric unit) {
 		return ops.distance(getKey(), member1, member2, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#hash(java.lang.Object[])
-	 */
 	@Override
 	public List<String> hash(M... members) {
 		return ops.hash(getKey(), members);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#position(java.lang.Object[])
-	 */
 	@Override
 	public List<Point> position(M... members) {
 		return ops.position(getKey(), members);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#radius(org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(Circle within) {
 		return ops.radius(getKey(), within);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#radius(org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(Circle within, GeoRadiusCommandArgs param) {
 		return ops.radius(getKey(), within, param);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#radius(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, M member, double radius) {
 		return ops.radius(getKey(), member, radius);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#radius(java.lang.Object, org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(M member, Distance distance) {
 		return ops.radius(getKey(), member, distance);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#radius(java.lang.Object, org.springframework.data.geo.Distance, org.springframework.data.redis.core.radiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(M member, Distance distance, GeoRadiusCommandArgs param) {
 		return ops.radius(getKey(), member, distance, param);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#remove(java.lang.Object[])
-	 */
 	@Override
 	public Long remove(M... members) {
 		return ops.remove(getKey(), members);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#search(org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> search(GeoReference<M> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchCommandArgs args) {
 		return ops.search(getKey(), reference, geoPredicate, args);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundGeoOperations#searchAndStore(java.lang.Object, org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long searchAndStore(K destKey, GeoReference<M> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchStoreCommandArgs args) {
 		return ops.searchAndStore(getKey(), destKey, reference, geoPredicate, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.ZSET;
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java
index fcab7066f..fe5678f1e 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java
@@ -47,195 +47,111 @@ class DefaultBoundHashOperations<H, HK, HV> extends DefaultBoundKeyOperations<H>
 		this.ops = operations.opsForHash();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#delete(java.lang.Object[])
-	 */
 	@Override
 	public Long delete(Object... keys) {
 		return ops.delete(getKey(), keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#get(java.lang.Object)
-	 */
 	@Override
 	public HV get(Object key) {
 		return ops.get(getKey(), key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#multiGet(java.util.Collection)
-	 */
 	@Override
 	public List<HV> multiGet(Collection<HK> hashKeys) {
 		return ops.multiGet(getKey(), hashKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#getOperations()
-	 */
 	@Override
 	public RedisOperations<H, ?> getOperations() {
 		return ops.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#hasKey(java.lang.Object)
-	 */
 	@Override
 	public Boolean hasKey(Object key) {
 		return ops.hasKey(getKey(), key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Long increment(HK key, long delta) {
 		return ops.increment(getKey(), key, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#increment(java.lang.Object, double)
-	 */
 	@Override
 	public Double increment(HK key, double delta) {
 		return ops.increment(getKey(), key, delta);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#randomField()
-	 */
 	@Nullable
 	@Override
 	public HK randomKey() {
 		return ops.randomKey(getKey());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#randomValue()
-	 */
 	@Nullable
 	@Override
 	public Entry<HK, HV> randomEntry() {
 		return ops.randomEntry(getKey());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#randomFields(long)
-	 */
 	@Nullable
 	@Override
 	public List<HK> randomKeys(long count) {
 		return ops.randomKeys(getKey(), count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#randomValues(long)
-	 */
 	@Nullable
 	@Override
 	public Map<HK, HV> randomEntries(long count) {
 		return ops.randomEntries(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#keys()
-	 */
 	@Override
 	public Set<HK> keys() {
 		return ops.keys(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#lengthOfValue(java.lang.Object, java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Long lengthOfValue(HK hashKey) {
 		return ops.lengthOfValue(getKey(), hashKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#size()
-	 */
 	@Override
 	public Long size() {
 		return ops.size(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#putAll(java.util.Map)
-	 */
 	@Override
 	public void putAll(Map<? extends HK, ? extends HV> m) {
 		ops.putAll(getKey(), m);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#put(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void put(HK key, HV value) {
 		ops.put(getKey(), key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#putIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean putIfAbsent(HK key, HV value) {
 		return ops.putIfAbsent(getKey(), key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#values()
-	 */
 	@Override
 	public List<HV> values() {
 		return ops.values(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#entries()
-	 */
 	@Override
 	public Map<HK, HV> entries() {
 		return ops.entries(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.HASH;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundHashOperations#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<HK, HV>> scan(ScanOptions options) {
 		return ops.scan(getKey(), options);
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java
index 7038b29e7..4c0b2cd32 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java
@@ -35,55 +35,31 @@ abstract class DefaultBoundKeyOperations<K> implements BoundKeyOperations<K> {
 		this.ops = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public K getKey() {
 		return key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return ops.expire(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return ops.expireAt(key, date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return ops.getExpire(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return ops.persist(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(K newKey) {
 		if (ops.hasKey(key)) {
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java
index f06d5091d..277a40bf0 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java
@@ -49,235 +49,131 @@ class DefaultBoundListOperations<K, V> extends DefaultBoundKeyOperations<K> impl
 		return ops.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#index(long)
-	 */
 	@Override
 	public V index(long index) {
 		return ops.index(getKey(), index);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#indexOf(java.lang.Object)
-	 */
 	@Override
 	public Long indexOf(V value) {
 		return ops.indexOf(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#lastIndexOf(java.lang.Object)
-	 */
 	@Override
 	public Long lastIndexOf(V value) {
 		return ops.lastIndexOf(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPop()
-	 */
 	@Override
 	public V leftPop() {
 		return ops.leftPop(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPop(long)
-	 */
 	@Override
 	public List<V> leftPop(long count) {
 		return ops.leftPop(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPop(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V leftPop(long timeout, TimeUnit unit) {
 		return ops.leftPop(getKey(), timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPush(java.lang.Object)
-	 */
 	@Override
 	public Long leftPush(V value) {
 		return ops.leftPush(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPushAll(java.lang.Object[])
-	 */
 	@Override
 	public Long leftPushAll(V... values) {
 		return ops.leftPushAll(getKey(), values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPushIfPresent(java.lang.Object)
-	 */
 	@Override
 	public Long leftPushIfPresent(V value) {
 		return ops.leftPushIfPresent(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#leftPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long leftPush(V pivot, V value) {
 		return ops.leftPush(getKey(), pivot, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#size()
-	 */
 	@Override
 	public Long size() {
 		return ops.size(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#range(long, long)
-	 */
 	@Override
 	public List<V> range(long start, long end) {
 		return ops.range(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#remove(long, java.lang.Object)
-	 */
 	@Override
 	public Long remove(long i, Object value) {
 		return ops.remove(getKey(), i, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPop()
-	 */
 	@Override
 	public V rightPop() {
 		return ops.rightPop(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPop(long)
-	 */
 	@Override
 	public List<V> rightPop(long count) {
 		return ops.rightPop(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPop(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V rightPop(long timeout, TimeUnit unit) {
 		return ops.rightPop(getKey(), timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPushIfPresent(java.lang.Object)
-	 */
 	@Override
 	public Long rightPushIfPresent(V value) {
 		return ops.rightPushIfPresent(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPush(java.lang.Object)
-	 */
 	@Override
 	public Long rightPush(V value) {
 		return ops.rightPush(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPushAll(java.lang.Object[])
-	 */
 	@Override
 	public Long rightPushAll(V... values) {
 		return ops.rightPushAll(getKey(), values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#rightPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long rightPush(V pivot, V value) {
 		return ops.rightPush(getKey(), pivot, value);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#move(org.springframework.data.redis.connection.RedisListCommands.Direction, java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public V move(Direction from, K destinationKey, Direction to) {
 		return ops.move(getKey(), from, destinationKey, to);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#move(org.springframework.data.redis.connection.RedisListCommands.Direction, java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction, java.time.Duration)
-	 */
 	@Override
 	public V move(Direction from, K destinationKey, Direction to, Duration timeout) {
 		return ops.move(getKey(), from, destinationKey, to, timeout);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#move(org.springframework.data.redis.connection.RedisListCommands.Direction, java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V move(Direction from, K destinationKey, Direction to, long timeout, TimeUnit unit) {
 		return ops.move(getKey(), from, destinationKey, to, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#trim(long, long)
-	 */
 	@Override
 	public void trim(long start, long end) {
 		ops.trim(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundListOperations#set(long, java.lang.Object)
-	 */
 	@Override
 	public void set(long index, V value) {
 		ops.set(getKey(), index, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.LIST;
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java
index 2033e8c83..3112d383a 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java
@@ -45,235 +45,131 @@ class DefaultBoundSetOperations<K, V> extends DefaultBoundKeyOperations<K> imple
 		this.ops = operations.opsForSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#add(java.lang.Object[])
-	 */
 	@Override
 	public Long add(V... values) {
 		return ops.add(getKey(), values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#diff(java.lang.Object)
-	 */
 	@Override
 	public Set<V> diff(K key) {
 		return ops.difference(getKey(), key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#diff(java.util.Collection)
-	 */
 	@Override
 	public Set<V> diff(Collection<K> keys) {
 		return ops.difference(getKey(), keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#diffAndStore(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void diffAndStore(K key, K destKey) {
 		ops.differenceAndStore(getKey(), key, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#diffAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public void diffAndStore(Collection<K> keys, K destKey) {
 		ops.differenceAndStore(getKey(), keys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#getOperations()
-	 */
 	@Override
 	public RedisOperations<K, V> getOperations() {
 		return ops.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#intersect(java.lang.Object)
-	 */
 	@Override
 	public Set<V> intersect(K key) {
 		return ops.intersect(getKey(), key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#intersect(java.util.Collection)
-	 */
 	@Override
 	public Set<V> intersect(Collection<K> keys) {
 		return ops.intersect(getKey(), keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#intersectAndStore(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void intersectAndStore(K key, K destKey) {
 		ops.intersectAndStore(getKey(), key, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#intersectAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public void intersectAndStore(Collection<K> keys, K destKey) {
 		ops.intersectAndStore(getKey(), keys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#isMember(java.lang.Object)
-	 */
 	@Override
 	public Boolean isMember(Object o) {
 		return ops.isMember(getKey(), o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#isMember(java.lang.Object...)
-	 */
 	@Override
 	public Map<Object, Boolean> isMember(Object... objects) {
 		return ops.isMember(getKey(), objects);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#members()
-	 */
 	@Override
 	public Set<V> members() {
 		return ops.members(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#move(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean move(K destKey, V value) {
 		return ops.move(getKey(), value, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#randomMember()
-	 */
 	@Override
 	public V randomMember() {
 		return ops.randomMember(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#distinctRandomMembers(long)
-	 */
 	@Override
 	public Set<V> distinctRandomMembers(long count) {
 		return ops.distinctRandomMembers(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#randomMembers(long)
-	 */
 	@Override
 	public List<V> randomMembers(long count) {
 		return ops.randomMembers(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#remove(java.lang.Object[])
-	 */
 	@Override
 	public Long remove(Object... values) {
 		return ops.remove(getKey(), values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#pop()
-	 */
 	@Override
 	public V pop() {
 		return ops.pop(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#size()
-	 */
 	@Override
 	public Long size() {
 		return ops.size(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#union(java.lang.Object)
-	 */
 	@Override
 	public Set<V> union(K key) {
 		return ops.union(getKey(), key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#union(java.util.Collection)
-	 */
 	@Override
 	public Set<V> union(Collection<K> keys) {
 		return ops.union(getKey(), keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#unionAndStore(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void unionAndStore(K key, K destKey) {
 		ops.unionAndStore(getKey(), key, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#unionAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public void unionAndStore(Collection<K> keys, K destKey) {
 		ops.unionAndStore(getKey(), keys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.SET;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundSetOperations#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<V> scan(ScanOptions options) {
 		return ops.scan(getKey(), options);
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundStreamOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundStreamOperations.java
index 31cf616fb..a343a469d 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundStreamOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundStreamOperations.java
@@ -53,140 +53,84 @@ class DefaultBoundStreamOperations<K, HK, HV> extends DefaultBoundKeyOperations<
 		this.ops = operations.opsForStream();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#acknowledge(java.lang.String, java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Long acknowledge(String group, String... recordIds) {
 		return ops.acknowledge(getKey(), group, recordIds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#add(java.util.Map)
-	 */
 	@Nullable
 	@Override
 	public RecordId add(Map<HK, HV> body) {
 		return ops.add(getKey(), body);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#delete(java.lang.String[])
-	 */
 	@Nullable
 	@Override
 	public Long delete(String... recordIds) {
 		return ops.delete(getKey(), recordIds);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#createGroup(org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Nullable
 	@Override
 	public String createGroup(ReadOffset readOffset, String group) {
 		return ops.createGroup(getKey(), readOffset, group);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#deleteConsumer(org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Nullable
 	@Override
 	public Boolean deleteConsumer(Consumer consumer) {
 		return ops.deleteConsumer(getKey(), consumer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#destroyGroup(java.lang.String)
-	 */
 	@Nullable
 	@Override
 	public Boolean destroyGroup(String group) {
 		return ops.destroyGroup(getKey(), group);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#size()
-	 */
 	@Nullable
 	@Override
 	public Long size() {
 		return ops.size(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#range(org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Nullable
 	@Override
 	public List<MapRecord<K, HK, HV>> range(Range<String> range, Limit limit) {
 		return ops.range(getKey(), range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset)
-	 */
 	@Nullable
 	@Override
 	public List<MapRecord<K, HK, HV>> read(StreamReadOptions readOptions, ReadOffset readOffset) {
 		return ops.read(readOptions, StreamOffset.create(getKey(), readOffset));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset)
-	 */
 	@Nullable
 	@Override
 	public List<MapRecord<K, HK, HV>> read(Consumer consumer, StreamReadOptions readOptions, ReadOffset readOffset) {
 		return ops.read(consumer, readOptions, StreamOffset.create(getKey(), readOffset));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#reverseRange(org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Nullable
 	@Override
 	public List<MapRecord<K, HK, HV>> reverseRange(Range<String> range, Limit limit) {
 		return ops.reverseRange(getKey(), range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#trim(long)
-	 */
 	@Nullable
 	@Override
 	public Long trim(long count) {
 		return trim(count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundStreamOperations#trim(long,boolean)
-	 */
 	@Nullable
 	@Override
 	public Long trim(long count, boolean approximateTrimming) {
 		return ops.trim(getKey(), count, approximateTrimming);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Nullable
 	@Override
 	public DataType getType() {
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java
index cd533485c..3129429c3 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java
@@ -42,214 +42,122 @@ class DefaultBoundValueOperations<K, V> extends DefaultBoundKeyOperations<K> imp
 		this.ops = operations.opsForValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#get()
-	 */
 	@Override
 	public V get() {
 		return ops.get(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#get()
-	 */
 	@Nullable
 	@Override
 	public V getAndDelete() {
 		return ops.getAndDelete(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#get(long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public V getAndExpire(long timeout, TimeUnit unit) {
 		return ops.getAndExpire(getKey(), timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#get(java.time.Duration)
-	 */
 	@Nullable
 	@Override
 	public V getAndExpire(Duration timeout) {
 		return ops.getAndExpire(getKey(), timeout);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#getAndPersist()
-	 */
 	@Nullable
 	@Override
 	public V getAndPersist() {
 		return ops.getAndPersist(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#getAndSet(java.lang.Object)
-	 */
 	@Override
 	public V getAndSet(V value) {
 		return ops.getAndSet(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#increment()
-	 */
 	@Override
 	public Long increment() {
 		return ops.increment(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#increment(long)
-	 */
 	@Override
 	public Long increment(long delta) {
 		return ops.increment(getKey(), delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#increment(double)
-	 */
 	@Override
 	public Double increment(double delta) {
 		return ops.increment(getKey(), delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#decrement()
-	 */
 	@Override
 	public Long decrement() {
 		return ops.decrement(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#decrement(double)
-	 */
 	@Override
 	public Long decrement(long delta) {
 		return ops.decrement(getKey(), delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#append(java.lang.String)
-	 */
 	@Override
 	public Integer append(String value) {
 		return ops.append(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#get(long, long)
-	 */
 	@Override
 	public String get(long start, long end) {
 		return ops.get(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#set(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public void set(V value, long timeout, TimeUnit unit) {
 		ops.set(getKey(), value, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#set(java.lang.Object)
-	 */
 	@Override
 	public void set(V value) {
 		ops.set(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#setIfAbsent(java.lang.Object)
-	 */
 	@Override
 	public Boolean setIfAbsent(V value) {
 		return ops.setIfAbsent(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#setIfAbsent(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean setIfAbsent(V value, long timeout, TimeUnit unit) {
 		return ops.setIfAbsent(getKey(), value, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#setIfPresent(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Boolean setIfPresent(V value) {
 		return ops.setIfPresent(getKey(), value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#setIfPresent(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Boolean setIfPresent(V value, long timeout, TimeUnit unit) {
 		return ops.setIfPresent(getKey(), value, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#set(java.lang.Object, long)
-	 */
 	@Override
 	public void set(V value, long offset) {
 		ops.set(getKey(), value, offset);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#size()
-	 */
 	@Override
 	public Long size() {
 		return ops.size(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundValueOperations#getOperations()
-	 */
 	@Override
 	public RedisOperations<K, V> getOperations() {
 		return ops.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.STRING;
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java
index 103979efc..941e5aeee 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java
@@ -54,551 +54,315 @@ class DefaultBoundZSetOperations<K, V> extends DefaultBoundKeyOperations<K> impl
 		this.ops = operations.opsForZSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#add(java.lang.Object, double)
-	 */
 	@Override
 	public Boolean add(V value, double score) {
 		return ops.add(getKey(), value, score);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#addIfAbsent(java.lang.Object, double)
-	 */
 	@Override
 	public Boolean addIfAbsent(V value, double score) {
 		return ops.addIfAbsent(getKey(), value, score);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#add(java.util.Set)
-	 */
 	@Override
 	public Long add(Set<TypedTuple<V>> tuples) {
 		return ops.add(getKey(), tuples);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#addIfAbsent(java.util.Set)
-	 */
 	@Override
 	public Long addIfAbsent(Set<TypedTuple<V>> tuples) {
 		return ops.addIfAbsent(getKey(), tuples);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#incrementScore(java.lang.Object, double)
-	 */
 	@Override
 	public Double incrementScore(V value, double delta) {
 		return ops.incrementScore(getKey(), value, delta);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#randomMember()
-	 */
 	@Override
 	public V randomMember() {
 		return ops.randomMember(getKey());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#distinctRandomMembers(long)
-	 */
 	@Nullable
 	@Override
 	public Set<V> distinctRandomMembers(long count) {
 		return ops.distinctRandomMembers(getKey(), count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#randomMembers(long)
-	 */
 	@Nullable
 	@Override
 	public List<V> randomMembers(long count) {
 		return ops.randomMembers(getKey(), count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#randomMemberWithScore()
-	 */
 	@Override
 	public TypedTuple<V> randomMemberWithScore() {
 		return ops.randomMemberWithScore(getKey());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#distinctRandomMembersWithScore(long)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> distinctRandomMembersWithScore(long count) {
 		return ops.distinctRandomMembersWithScore(getKey(), count);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#randomMembersWithScore(long)
-	 */
 	@Nullable
 	@Override
 	public List<TypedTuple<V>> randomMembersWithScore(long count) {
 		return ops.randomMembersWithScore(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#getOperations()
-	 */
 	@Override
 	public RedisOperations<K, V> getOperations() {
 		return ops.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#range(long, long)
-	 */
 	@Override
 	public Set<V> range(long start, long end) {
 		return ops.range(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#rangeByScore(double, double)
-	 */
 	@Override
 	public Set<V> rangeByScore(double min, double max) {
 		return ops.rangeByScore(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#rangeByScoreWithScores(double, double)
-	 */
 	@Override
 	public Set<TypedTuple<V>> rangeByScoreWithScores(double min, double max) {
 		return ops.rangeByScoreWithScores(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#rangeWithScores(long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> rangeWithScores(long start, long end) {
 		return ops.rangeWithScores(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRangeByScore(double, double)
-	 */
 	@Override
 	public Set<V> reverseRangeByScore(double min, double max) {
 		return ops.reverseRangeByScore(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRangeByScoreWithScores(double, double)
-	 */
 	@Override
 	public Set<TypedTuple<V>> reverseRangeByScoreWithScores(double min, double max) {
 		return ops.reverseRangeByScoreWithScores(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRangeWithScores(long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> reverseRangeWithScores(long start, long end) {
 		return ops.reverseRangeWithScores(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#rangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<V> rangeByLex(Range range, Limit limit) {
 		return ops.rangeByLex(getKey(), range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<V> reverseRangeByLex(Range range, Limit limit) {
 		return ops.reverseRangeByLex(getKey(), range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#rank(java.lang.Object)
-	 */
 	@Override
 	public Long rank(Object o) {
 		return ops.rank(getKey(), o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRank(java.lang.Object)
-	 */
 	@Override
 	public Long reverseRank(Object o) {
 		return ops.reverseRank(getKey(), o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#score(java.lang.Object)
-	 */
 	@Override
 	public Double score(Object o) {
 		return ops.score(getKey(), o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#score(java.lang.Object[])
-	 */
 	@Override
 	public List<Double> score(Object... o) {
 		return ops.score(getKey(), o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#remove(java.lang.Object[])
-	 */
 	@Override
 	public Long remove(Object... values) {
 		return ops.remove(getKey(), values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#removeRange(long, long)
-	 */
 	@Override
 	public Long removeRange(long start, long end) {
 		return ops.removeRange(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#removeRangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long removeRangeByLex(Range range) {
 		return ops.removeRangeByLex(getKey(), range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#removeRangeByScore(double, double)
-	 */
 	@Override
 	public Long removeRangeByScore(double min, double max) {
 		return ops.removeRangeByScore(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#reverseRange(long, long)
-	 */
 	@Override
 	public Set<V> reverseRange(long start, long end) {
 		return ops.reverseRange(getKey(), start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#count(double, double)
-	 */
 	@Override
 	public Long count(double min, double max) {
 		return ops.count(getKey(), min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#lexCount(org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long lexCount(Range range) {
 		return ops.lexCount(getKey(), range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMin()
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMin() {
 		return ops.popMin(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMin(long)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> popMin(long count) {
 		return ops.popMin(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMin(long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMin(long timeout, TimeUnit unit) {
 		return ops.popMin(getKey(), timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMax()
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMax() {
 		return ops.popMax(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMax(long)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> popMax(long count) {
 		return ops.popMax(getKey(), count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#popMax(long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMax(long timeout, TimeUnit unit) {
 		return ops.popMax(getKey(), timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#size()
-	 */
 	@Override
 	public Long size() {
 		return zCard();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#zCard()
-	 */
 	@Override
 	public Long zCard() {
 		return ops.zCard(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#difference(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<V> difference(Collection<K> otherKeys) {
 		return ops.difference(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#differenceWithScores(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> differenceWithScores(Collection<K> otherKeys) {
 		return ops.differenceWithScores(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#differenceAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Long differenceAndStore(Collection<K> otherKeys, K destKey) {
 		return ops.differenceAndStore(getKey(), otherKeys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersect(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<V> intersect(Collection<K> otherKeys) {
 		return ops.intersect(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectWithScores(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> intersectWithScores(Collection<K> otherKeys) {
 		return ops.intersectWithScores(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectWithScores(java.util.Collection, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> intersectWithScores(Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 		return ops.intersectWithScores(getKey(), otherKeys, aggregate, weights);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectAndStore(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(K otherKey, K destKey) {
 		return ops.intersectAndStore(getKey(), otherKey, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(Collection<K> otherKeys, K destKey) {
 		return ops.intersectAndStore(getKey(), otherKeys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectAndStore(java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate)
-	 */
 	@Override
 	public Long intersectAndStore(Collection<K> otherKeys, K destKey, Aggregate aggregate) {
 		return ops.intersectAndStore(getKey(), otherKeys, destKey, aggregate);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#intersectAndStore(java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Long intersectAndStore(Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 		return ops.intersectAndStore(getKey(), otherKeys, destKey, aggregate, weights);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#union(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<V> union(Collection<K> otherKeys) {
 		return ops.union(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionWithScores(java.util.Collection)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> unionWithScores(Collection<K> otherKeys) {
 		return ops.unionWithScores(getKey(), otherKeys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionWithScores(java.util.Collection, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> unionWithScores(Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 		return ops.unionWithScores(getKey(), otherKeys, aggregate, weights);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionAndStore(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(K otherKey, K destKey) {
 		return ops.unionAndStore(getKey(), otherKey, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(Collection<K> otherKeys, K destKey) {
 		return ops.unionAndStore(getKey(), otherKeys, destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionAndStore(java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate)
-	 */
 	@Override
 	public Long unionAndStore(Collection<K> otherKeys, K destKey, Aggregate aggregate) {
 		return ops.unionAndStore(getKey(), otherKeys, destKey, aggregate);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#unionAndStore(java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Long unionAndStore(Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 		return ops.unionAndStore(getKey(), otherKeys, destKey, aggregate, weights);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.ZSET;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundZSetOperations#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<TypedTuple<V>> scan(ScanOptions options) {
 		return ops.scan(getKey(), options);
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultClusterOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultClusterOperations.java
index 41d9538ac..0cfe06d06 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultClusterOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultClusterOperations.java
@@ -50,10 +50,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		this.template = template;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#keys(org.springframework.data.redis.connection.RedisNode, byte[])
-	 */
 	@Override
 	public Set<K> keys(final RedisClusterNode node, final K pattern) {
 
@@ -62,10 +58,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		return doInCluster(connection -> deserializeKeys(connection.keys(node, rawKey(pattern))));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#randomKey(org.springframework.data.redis.connection.RedisNode)
-	 */
 	@Override
 	public K randomKey(final RedisClusterNode node) {
 
@@ -74,10 +66,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		return doInCluster(connection -> deserializeKey(connection.randomKey(node)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#ping(org.springframework.data.redis.connection.RedisNode)
-	 */
 	@Override
 	public String ping(final RedisClusterNode node) {
 
@@ -86,10 +74,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		return doInCluster(connection -> connection.ping(node));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#addSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
-	 */
 	@Override
 	public void addSlots(final RedisClusterNode node, final int... slots) {
 
@@ -101,10 +85,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#addSlots(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode.SlotRange)
-	 */
 	@Override
 	public void addSlots(RedisClusterNode node, SlotRange range) {
 
@@ -114,10 +94,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		addSlots(node, range.getSlotsArray());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#bgReWriteAof(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgReWriteAof(final RedisClusterNode node) {
 
@@ -129,10 +105,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#bgSave(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void bgSave(final RedisClusterNode node) {
 
@@ -144,10 +116,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#meet(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void meet(final RedisClusterNode node) {
 
@@ -159,10 +127,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#forget(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void forget(final RedisClusterNode node) {
 
@@ -174,10 +138,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#flushDb(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void flushDb(final RedisClusterNode node) {
 
@@ -189,10 +149,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#getSlaves(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public Collection<RedisClusterNode> getSlaves(final RedisClusterNode node) {
 
@@ -201,10 +157,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		return doInCluster(connection -> connection.clusterGetSlaves(node));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#save(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void save(final RedisClusterNode node) {
 
@@ -216,10 +168,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisClusterOperations#shutdown(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void shutdown(final RedisClusterNode node) {
 
@@ -231,10 +179,6 @@ class DefaultClusterOperations<K, V> extends AbstractOperations<K, V> implements
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ClusterOperations#reshard(org.springframework.data.redis.connection.RedisClusterNode, int, org.springframework.data.redis.connection.RedisClusterNode)
-	 */
 	@Override
 	public void reshard(final RedisClusterNode source, final int slot, final RedisClusterNode target) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java
index cb10bd26e..5b253ff54 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultGeoOperations.java
@@ -51,10 +51,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#add(java.lang.Object, org.springframework.data.geo.Point, java.lang.Object)
-	 */
 	@Override
 	public Long add(K key, Point point, M member) {
 
@@ -64,19 +60,11 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoAdd(rawKey, point, rawMember));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#add(java.lang.Object, org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation)
-	 */
 	@Override
 	public Long add(K key, GeoLocation<M> location) {
 		return add(key, location.getPoint(), location.getName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#add(java.lang.Object, java.util.Map)
-	 */
 	@Override
 	public Long add(K key, Map<M, Point> memberCoordinateMap) {
 
@@ -91,10 +79,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoAdd(rawKey, rawMemberCoordinateMap));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#add(java.lang.Object, java.lang.Iterable)
-	 */
 	@Override
 	public Long add(K key, Iterable<GeoLocation<M>> locations) {
 
@@ -106,10 +90,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return add(key, memberCoordinateMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#distance(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Distance distance(K key, M member1, M member2) {
 
@@ -120,10 +100,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoDist(rawKey, rawMember1, rawMember2));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#distance(java.lang.Object, java.lang.Object, java.lang.Object, org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Distance distance(K key, M member1, M member2, Metric metric) {
 
@@ -134,10 +110,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoDist(rawKey, rawMember1, rawMember2, metric));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#hash(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public List<String> hash(K key, M... members) {
 
@@ -147,10 +119,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoHash(rawKey, rawMembers));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#position(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public List<Point> position(K key, M... members) {
 		byte[] rawKey = rawKey(key);
@@ -159,10 +127,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.geoPos(rawKey, rawMembers));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#radius(java.lang.Object, org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, Circle within) {
 
@@ -173,10 +137,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#radius(java.lang.Object, org.springframework.data.geo.Circle, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, Circle within, GeoRadiusCommandArgs args) {
 
@@ -187,10 +147,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#radius(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, M member, double radius) {
 
@@ -202,10 +158,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#radius(java.lang.Object, java.lang.Object, org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, M member, Distance distance) {
 
@@ -218,10 +170,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#radius(java.lang.Object, java.lang.Object, double, org.springframework.data.geo.Metric, org.springframework.data.redis.core.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> radius(K key, M member, Distance distance, GeoRadiusCommandArgs param) {
 
@@ -234,10 +182,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long remove(K key, M... members) {
 
@@ -246,10 +190,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return execute(connection -> connection.zRem(rawKey, rawMembers));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#search(java.lang.Object, org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchCommandArgs)
-	 */
 	@Override
 	public GeoResults<GeoLocation<M>> search(K key, GeoReference<M> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchCommandArgs args) {
@@ -263,10 +203,6 @@ class DefaultGeoOperations<K, M> extends AbstractOperations<K, M> implements Geo
 		return deserializeGeoResults(raw);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.GeoOperations#searchAndStore(java.lang.Object, java.lang.Object, org.springframework.data.redis.connection.RedisGeoCommands.GeoReference, org.springframework.data.redis.connection.RedisGeoCommands.GeoShape, org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Long searchAndStore(K key, K destKey, GeoReference<M> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchStoreCommandArgs args) {
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java
index 86868f792..b163683e0 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java
@@ -42,10 +42,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		super((RedisTemplate<K, Object>) template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#get(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public HV get(K key, Object hashKey) {
@@ -57,10 +53,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return (HV) rawHashValue != null ? deserializeHashValue(rawHashValue) : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#hasKey(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean hasKey(K key, Object hashKey) {
 
@@ -69,10 +61,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hExists(rawKey, rawHashKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#increment(java.lang.Object, java.lang.Object, long)
-	 */
 	@Override
 	public Long increment(K key, HK hashKey, long delta) {
 
@@ -81,10 +69,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hIncrBy(rawKey, rawHashKey, delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#increment(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Double increment(K key, HK hashKey, double delta) {
 
@@ -93,10 +77,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hIncrBy(rawKey, rawHashKey, delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#randomField(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public HK randomKey(K key) {
@@ -105,10 +85,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return deserializeHashKey(execute(connection -> connection.hRandField(rawKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#randomValue(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Entry<HK, HV> randomEntry(K key) {
@@ -119,10 +95,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 				: Converters.entryOf(deserializeHashKey(rawEntry.getKey()), deserializeHashValue(rawEntry.getValue()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#randomFields(java.lang.Object, long)
-	 */
 	@Nullable
 	@Override
 	public List<HK> randomKeys(K key, long count) {
@@ -132,10 +104,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return deserializeHashKeys(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#randomValues(java.lang.Object, long)
-	 */
 	@Nullable
 	@Override
 	public Map<HK, HV> randomEntries(K key, long count) {
@@ -153,10 +121,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return deserializeHashMap(rawMap);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#keys(java.lang.Object)
-	 */
 	@Override
 	public Set<HK> keys(K key) {
 
@@ -166,10 +130,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return rawValues != null ? deserializeHashKeys(rawValues) : Collections.emptySet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 
@@ -177,10 +137,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hLen(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#lengthOfValue(java.lang.Object, java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Long lengthOfValue(K key, HK hashKey) {
@@ -190,10 +146,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hStrLen(rawKey, rawHashKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#putAll(java.lang.Object, java.util.Map)
-	 */
 	@Override
 	public void putAll(K key, Map<? extends HK, ? extends HV> m) {
 
@@ -215,10 +167,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#multiGet(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public List<HV> multiGet(K key, Collection<HK> fields) {
 
@@ -239,10 +187,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return deserializeHashValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#put(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void put(K key, HK hashKey, HV value) {
 
@@ -256,10 +200,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#putIfAbsent(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean putIfAbsent(K key, HK hashKey, HV value) {
 
@@ -270,10 +210,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hSetNX(rawKey, rawHashKey, rawHashValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#values(java.lang.Object)
-	 */
 	@Override
 	public List<HV> values(K key) {
 
@@ -283,10 +219,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return rawValues != null ? deserializeHashValues(rawValues) : Collections.emptyList();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#delete(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long delete(K key, Object... hashKeys) {
 
@@ -296,10 +228,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return execute(connection -> connection.hDel(rawKey, rawHashKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#entries(java.lang.Object)
-	 */
 	@Override
 	public Map<HK, HV> entries(K key) {
 
@@ -309,10 +237,6 @@ class DefaultHashOperations<K, HK, HV> extends AbstractOperations<K, Object> imp
 		return entries != null ? deserializeHashMap(entries) : Collections.emptyMap();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HashOperations#scan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<Entry<HK, HV>> scan(K key, ScanOptions options) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultHyperLogLogOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultHyperLogLogOperations.java
index a39eb3106..be3918b73 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultHyperLogLogOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultHyperLogLogOperations.java
@@ -29,10 +29,6 @@ class DefaultHyperLogLogOperations<K, V> extends AbstractOperations<K, V> implem
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HyperLogLogOperations#add(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long add(K key, V... values) {
 
@@ -41,10 +37,6 @@ class DefaultHyperLogLogOperations<K, V> extends AbstractOperations<K, V> implem
 		return execute(connection -> connection.pfAdd(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HyperLogLogOperations#size(java.lang.Object[])
-	 */
 	@Override
 	public Long size(K... keys) {
 
@@ -52,10 +44,6 @@ class DefaultHyperLogLogOperations<K, V> extends AbstractOperations<K, V> implem
 		return execute(connection -> connection.pfCount(rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HyperLogLogOperations#union(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long union(K destination, K... sourceKeys) {
 
@@ -68,10 +56,6 @@ class DefaultHyperLogLogOperations<K, V> extends AbstractOperations<K, V> implem
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.HyperLogLogOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public void delete(K key) {
 		template.delete(key);
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java
index 105115a8e..1d661c6f3 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java
@@ -39,10 +39,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#index(java.lang.Object, long)
-	 */
 	@Override
 	public V index(K key, long index) {
 
@@ -55,10 +51,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#indexOf(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long indexOf(K key, V value) {
 
@@ -67,10 +59,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lPos(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#lastIndexOf(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long lastIndexOf(K key, V value) {
 
@@ -83,10 +71,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPop(java.lang.Object)
-	 */
 	@Override
 	public V leftPop(K key) {
 
@@ -99,20 +83,12 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPop(java.lang.Object, long)
-	 */
 	@Override
 	public List<V> leftPop(K key, long count) {
 		byte[] rawKey = rawKey(key);
 		return execute(connection -> deserializeValues(connection.lPop(rawKey, count)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPop(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V leftPop(K key, long timeout, TimeUnit unit) {
 
@@ -127,10 +103,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long leftPush(K key, V value) {
 
@@ -139,10 +111,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lPush(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPushAll(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long leftPushAll(K key, V... values) {
 
@@ -151,10 +119,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lPush(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPushAll(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Long leftPushAll(K key, Collection<V> values) {
 
@@ -164,10 +128,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lPush(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPushIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long leftPushIfPresent(K key, V value) {
 
@@ -176,10 +136,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lPushX(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#leftPush(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long leftPush(K key, V pivot, V value) {
 
@@ -189,10 +145,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lInsert(rawKey, Position.BEFORE, rawPivot, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 
@@ -200,10 +152,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lLen(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#range(java.lang.Object, long, long)
-	 */
 	@Override
 	public List<V> range(K key, long start, long end) {
 
@@ -211,10 +159,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> deserializeValues(connection.lRange(rawKey, start, end)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#remove(java.lang.Object, long, java.lang.Object)
-	 */
 	@Override
 	public Long remove(K key, long count, Object value) {
 
@@ -223,10 +167,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lRem(rawKey, count, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPop(java.lang.Object)
-	 */
 	@Override
 	public V rightPop(K key) {
 
@@ -239,20 +179,12 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPop(java.lang.Object, long)
-	 */
 	@Override
 	public List<V> rightPop(K key, long count) {
 		byte[] rawKey = rawKey(key);
 		return execute(connection -> deserializeValues(connection.rPop(rawKey, count)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPop(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V rightPop(K key, long timeout, TimeUnit unit) {
 
@@ -268,10 +200,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long rightPush(K key, V value) {
 
@@ -280,10 +208,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.rPush(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPushAll(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long rightPushAll(K key, V... values) {
 
@@ -292,10 +216,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.rPush(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPushAll(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Long rightPushAll(K key, Collection<V> values) {
 
@@ -304,10 +224,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.rPush(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPushIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long rightPushIfPresent(K key, V value) {
 
@@ -316,10 +232,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.rPushX(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPush(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long rightPush(K key, V pivot, V value) {
 
@@ -329,10 +241,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		return execute(connection -> connection.lInsert(rawKey, Position.AFTER, rawPivot, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPopAndLeftPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public V rightPopAndLeftPush(K sourceKey, K destinationKey) {
 
@@ -346,10 +254,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#rightPopAndLeftPush(java.lang.Object, java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V rightPopAndLeftPush(K sourceKey, K destinationKey, long timeout, TimeUnit unit) {
 
@@ -364,10 +268,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#move(java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction, java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public V move(K sourceKey, Direction from, K destinationKey, Direction to) {
 
@@ -381,10 +281,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#move(java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction, java.lang.Object, org.springframework.data.redis.connection.RedisListCommands.Direction, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public V move(K sourceKey, Direction from, K destinationKey, Direction to, long timeout, TimeUnit unit) {
 
@@ -398,10 +294,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#set(java.lang.Object, long, java.lang.Object)
-	 */
 	@Override
 	public void set(K key, long index, V value) {
 
@@ -416,10 +308,6 @@ class DefaultListOperations<K, V> extends AbstractOperations<K, V> implements Li
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ListOperations#trim(java.lang.Object, long, long)
-	 */
 	@Override
 	public void trim(K key, long start, long end) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java
index 8444aa256..af4cf01b2 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveGeoOperations.java
@@ -61,10 +61,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		this.serializationContext = serializationContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#add(java.lang.Object, org.springframework.data.geo.Point, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> add(K key, Point point, V member) {
 
@@ -75,10 +71,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createMono(connection -> connection.geoAdd(rawKey(key), point, rawValue(member)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#add(java.lang.Object, org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation)
-	 */
 	@Override
 	public Mono<Long> add(K key, GeoLocation<V> location) {
 
@@ -89,10 +81,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				new GeoLocation<>(rawValue(location.getName()), location.getPoint())));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#add(java.lang.Object, java.util.Map)
-	 */
 	@Override
 	public Mono<Long> add(K key, Map<V, Point> memberCoordinateMap) {
 
@@ -109,10 +97,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#add(java.lang.Object, java.lang.Iterable)
-	 */
 	@Override
 	public Mono<Long> add(K key, Iterable<GeoLocation<V>> geoLocations) {
 
@@ -128,10 +112,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#add(java.lang.Object, org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<Long> add(K key, Publisher<? extends Collection<GeoLocation<V>>> locations) {
 
@@ -145,10 +125,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.flatMap(list -> connection.geoAdd(rawKey(key), list)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#distance(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Distance> distance(K key, V member1, V member2) {
 
@@ -159,10 +135,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createMono(connection -> connection.geoDist(rawKey(key), rawValue(member1), rawValue(member2)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#distance(java.lang.Object, java.lang.Object, java.lang.Object, org.springframework.data.geo.Metric)
-	 */
 	@Override
 	public Mono<Distance> distance(K key, V member1, V member2, Metric metric) {
 
@@ -174,10 +146,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createMono(connection -> connection.geoDist(rawKey(key), rawValue(member1), rawValue(member2), metric));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#hash(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<String> hash(K key, V member) {
 
@@ -187,10 +155,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createMono(connection -> connection.geoHash(rawKey(key), rawValue(member)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#hash(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<List<String>> hash(K key, V... members) {
@@ -205,10 +169,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.flatMap(serialized -> connection.geoHash(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#position(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Point> position(K key, V member) {
 
@@ -218,10 +178,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createMono(connection -> connection.geoPos(rawKey(key), rawValue(member)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#position(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<List<Point>> position(K key, V... members) {
@@ -236,10 +192,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.flatMap(serialized -> connection.geoPos(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#radius(java.lang.Object, org.springframework.data.geo.Circle)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> radius(K key, Circle within) {
 
@@ -249,10 +201,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return createFlux(connection -> connection.geoRadius(rawKey(key), within).map(this::readGeoResult));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#radius(java.lang.Object, org.springframework.data.geo.Circle, org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> radius(K key, Circle within, GeoRadiusCommandArgs args) {
 
@@ -264,10 +212,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.map(this::readGeoResult));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#radius(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> radius(K key, V member, double radius) {
 
@@ -278,10 +222,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.map(this::readGeoResult));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#radius(java.lang.Object, java.lang.Object, org.springframework.data.geo.Distance)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> radius(K key, V member, Distance distance) {
 
@@ -293,10 +233,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.map(this::readGeoResult));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#radius(java.lang.Object, java.lang.Object, org.springframework.data.geo.Distance, org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> radius(K key, V member, Distance distance, GeoRadiusCommandArgs args) {
 
@@ -309,10 +245,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.map(this::readGeoResult);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> remove(K key, V... members) {
@@ -327,10 +259,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.flatMap(serialized -> connection.zSetCommands().zRem(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
@@ -339,10 +267,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 		return template.doCreateMono(connection -> connection.keyCommands().del(rawKey(key))).map(l -> l != 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#search(K, RedisGeoCommands.GeoReference, GeoShape, GeoSearchCommandArgs)
-	 */
 	@Override
 	public Flux<GeoResult<GeoLocation<V>>> search(K key, GeoReference<V> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchCommandArgs args) {
@@ -355,10 +279,6 @@ class DefaultReactiveGeoOperations<K, V> implements ReactiveGeoOperations<K, V>
 				.geoSearch(rawKey(key), rawReference, geoPredicate, args).map(this::readGeoResult));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveGeoOperations#searchAndStore(K, K, RedisGeoCommands.GeoReference, GeoShape, GeoSearchStoreCommandArgs)
-	 */
 	@Override
 	public Mono<Long> searchAndStore(K key, K destKey, GeoReference<V> reference,
 			GeoShape geoPredicate, RedisGeoCommands.GeoSearchStoreCommandArgs args) {
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveHashOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveHashOperations.java
index 54f863770..da14141c7 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveHashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveHashOperations.java
@@ -51,10 +51,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		this.serializationContext = serializationContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#delete(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> remove(H key, Object... hashKeys) {
@@ -70,10 +66,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.flatMap(hks -> connection.hDel(rawKey(key), hks)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#hasKey(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Boolean> hasKey(H key, Object hashKey) {
@@ -84,10 +76,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		return createMono(connection -> connection.hExists(rawKey(key), rawHashKey((HK) hashKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#get(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<HV> get(H key, Object hashKey) {
@@ -98,10 +86,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		return createMono(connection -> connection.hGet(rawKey(key), rawHashKey((HK) hashKey)).map(this::readHashValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#multiGet(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Mono<List<HV>> multiGet(H key, Collection<HK> hashKeys) {
 
@@ -115,10 +99,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.flatMap(hks -> connection.hMGet(rawKey(key), hks)).map(this::deserializeHashValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#increment(java.lang.Object, java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Long> increment(H key, HK hashKey, long delta) {
 
@@ -130,10 +110,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hIncrBy(rawKey(key), rawHashKey(hashKey), delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#increment(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Mono<Double> increment(H key, HK hashKey, double delta) {
 
@@ -145,10 +121,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hIncrBy(rawKey(key), rawHashKey(hashKey), delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#randomField(H)
-	 */
 	@Override
 	public Mono<HK> randomKey(H key) {
 
@@ -158,10 +130,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hashCommands().hRandField(rawKey(key))).map(this::readHashKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#randomValue(H)
-	 */
 	@Override
 	public Mono<Map.Entry<HK, HV>> randomEntry(H key) {
 
@@ -171,10 +139,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hashCommands().hRandFieldWithValues(rawKey(key))).map(this::deserializeHashEntry);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#randomFields(H, long)
-	 */
 	@Override
 	public Flux<HK> randomKeys(H key, long count) {
 
@@ -184,10 +148,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hashCommands().hRandField(rawKey(key), count)).map(this::readHashKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#randomValues(H, long)
-	 */
 	@Override
 	public Flux<Map.Entry<HK, HV>> randomEntries(H key, long count) {
 
@@ -197,10 +157,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.hashCommands().hRandFieldWithValues(rawKey(key), count)).map(this::deserializeHashEntry);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#keys(java.lang.Object)
-	 */
 	@Override
 	public Flux<HK> keys(H key) {
 
@@ -210,10 +166,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.map(this::readHashKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(H key) {
 
@@ -222,10 +174,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		return createMono(connection -> connection.hLen(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#putAll(java.lang.Object, java.util.Map)
-	 */
 	@Override
 	public Mono<Boolean> putAll(H key, Map<? extends HK, ? extends HV> map) {
 
@@ -237,10 +185,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.flatMap(serialized -> connection.hMSet(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#put(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> put(H key, HK hashKey, HV value) {
 
@@ -251,10 +195,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		return createMono(connection -> connection.hSet(rawKey(key), rawHashKey(hashKey), rawHashValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#putIfAbsent(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> putIfAbsent(H key, HK hashKey, HV value) {
 
@@ -265,10 +205,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 		return createMono(connection -> connection.hSetNX(rawKey(key), rawHashKey(hashKey), rawHashValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#values(java.lang.Object)
-	 */
 	@Override
 	public Flux<HV> values(H key) {
 
@@ -278,10 +214,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.map(this::readHashValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#entries(java.lang.Object)
-	 */
 	@Override
 	public Flux<Map.Entry<HK, HV>> entries(H key) {
 
@@ -291,10 +223,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.map(this::deserializeHashEntry));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#scan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Flux<Map.Entry<HK, HV>> scan(H key, ScanOptions options) {
 
@@ -305,10 +233,6 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
 				.map(this::deserializeHashEntry));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHashOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(H key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperations.java
index 98f899365..c5c5195b7 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveHyperLogLogOperations.java
@@ -45,9 +45,6 @@ class DefaultReactiveHyperLogLogOperations<K, V> implements ReactiveHyperLogLogO
 		this.serializationContext = serializationContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHyperLogLogOperations#add(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> add(K key, V... values) {
@@ -62,9 +59,6 @@ class DefaultReactiveHyperLogLogOperations<K, V> implements ReactiveHyperLogLogO
 				.flatMap(serializedValues -> connection.pfAdd(rawKey(key), serializedValues)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHyperLogLogOperations#size(java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> size(K... keys) {
@@ -78,9 +72,6 @@ class DefaultReactiveHyperLogLogOperations<K, V> implements ReactiveHyperLogLogO
 				.flatMap(connection::pfCount));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHyperLogLogOperations#union(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Boolean> union(K destination, K... sourceKeys) {
@@ -95,9 +86,6 @@ class DefaultReactiveHyperLogLogOperations<K, V> implements ReactiveHyperLogLogO
 				.flatMap(serialized -> connection.pfMerge(rawKey(destination), serialized)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveHyperLogLogOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveListOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveListOperations.java
index 248178591..369332de8 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveListOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveListOperations.java
@@ -53,9 +53,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		this.serializationContext = serializationContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#range(java.lang.Object, long, long)
-	 */
 	@Override
 	public Flux<V> range(K key, long start, long end) {
 
@@ -64,9 +61,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createFlux(connection -> connection.lRange(rawKey(key), start, end).map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#trim(java.lang.Object, long, long)
-	 */
 	@Override
 	public Mono<Boolean> trim(K key, long start, long end) {
 
@@ -75,9 +69,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lTrim(rawKey(key), start, end));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(K key) {
 
@@ -86,17 +77,11 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lLen(rawKey(key)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> leftPush(K key, V value) {
 		return leftPushAll(key, value);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPushAll(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> leftPushAll(K key, V... values) {
@@ -106,9 +91,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return leftPushAll(key, Arrays.asList(values));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPushAll(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Mono<Long> leftPushAll(K key, Collection<V> values) {
 
@@ -121,9 +103,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				.flatMap(serialized -> connection.lPush(rawKey(key), serialized)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPushIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> leftPushIfPresent(K key, V value) {
 
@@ -132,9 +111,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lPushX(rawKey(key), rawValue(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPush(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> leftPush(K key, V pivot, V value) {
 
@@ -143,17 +119,11 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lInsert(rawKey(key), Position.BEFORE, rawValue(pivot), rawValue(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> rightPush(K key, V value) {
 		return rightPushAll(key, value);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPushAll(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> rightPushAll(K key, V... values) {
@@ -163,9 +133,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return rightPushAll(key, Arrays.asList(values));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPushAll(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Mono<Long> rightPushAll(K key, Collection<V> values) {
 
@@ -178,9 +145,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				.flatMap(serialized -> connection.rPush(rawKey(key), serialized)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPushIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> rightPushIfPresent(K key, V value) {
 
@@ -189,9 +153,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.rPushX(rawKey(key), rawValue(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPush(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> rightPush(K key, V pivot, V value) {
 
@@ -200,10 +161,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lInsert(rawKey(key), Position.AFTER, rawValue(pivot), rawValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#move(K, Direction, K, Direction)
-	 */
 	@Override
 	public Mono<V> move(K sourceKey, Direction from, K destinationKey, Direction to) {
 
@@ -216,10 +173,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				connection -> connection.lMove(rawKey(sourceKey), rawKey(destinationKey), from, to).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#move(K, Direction, K, Direction, Duration)
-	 */
 	@Override
 	public Mono<V> move(K sourceKey, Direction from, K destinationKey, Direction to, Duration timeout) {
 
@@ -233,9 +186,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#set(java.lang.Object, long, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> set(K key, long index, V value) {
 
@@ -244,9 +194,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lSet(rawKey(key), index, rawValue(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#remove(java.lang.Object, long, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> remove(K key, long count, Object value) {
@@ -256,9 +203,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lRem(rawKey(key), count, rawValue((V) value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#index(java.lang.Object, long)
-	 */
 	@Override
 	public Mono<V> index(K key, long index) {
 
@@ -267,10 +211,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lIndex(rawKey(key), index).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#indexOf(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> indexOf(K key, V value) {
 
@@ -279,10 +219,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lPos(rawKey(key), rawValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#lastIndexOf(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> lastIndexOf(K key, V value) {
 
@@ -291,9 +227,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.lPos(LPosCommand.lPosOf(rawValue(value)).from(rawKey(key)).rank(-1)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPop(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> leftPop(K key) {
 
@@ -303,9 +236,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#leftPop(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<V> leftPop(K key, Duration timeout) {
 
@@ -317,9 +247,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				.map(popResult -> readValue(popResult.getValue())));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPop(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> rightPop(K key) {
 
@@ -328,9 +255,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 		return createMono(connection -> connection.rPop(rawKey(key)).map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPop(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<V> rightPop(K key, Duration timeout) {
 
@@ -342,9 +266,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				.map(popResult -> readValue(popResult.getValue())));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPopAndLeftPush(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<V> rightPopAndLeftPush(K sourceKey, K destinationKey) {
 
@@ -355,9 +276,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				connection -> connection.rPopLPush(rawKey(sourceKey), rawKey(destinationKey)).map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#rightPopAndLeftPush(java.lang.Object, java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<V> rightPopAndLeftPush(K sourceKey, K destinationKey, Duration timeout) {
 
@@ -370,9 +288,6 @@ class DefaultReactiveListOperations<K, V> implements ReactiveListOperations<K, V
 				connection -> connection.bRPopLPush(rawKey(sourceKey), rawKey(destinationKey), timeout).map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveListOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveSetOperations.java
index 6d287c36e..1d3cb73aa 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveSetOperations.java
@@ -52,10 +52,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		this.serializationContext = serializationContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#add(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Mono<Long> add(K key, V... values) {
 
@@ -71,10 +67,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.flatMap(serialized -> connection.sAdd(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> remove(K key, Object... values) {
@@ -91,10 +83,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.flatMap(serialized -> connection.sRem(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#pop(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> pop(K key) {
 
@@ -103,10 +91,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createMono(connection -> connection.sPop(rawKey(key)).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#pop(java.lang.Object, long)
-	 */
 	@Override
 	public Flux<V> pop(K key, long count) {
 
@@ -115,10 +99,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createFlux(connection -> connection.sPop(rawKey(key), count).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#move(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> move(K sourceKey, V value, K destKey) {
 
@@ -128,10 +108,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createMono(connection -> connection.sMove(rawKey(sourceKey), rawKey(destKey), rawValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(K key) {
 
@@ -140,10 +116,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createMono(connection -> connection.sCard(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#isMember(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Boolean> isMember(K key, Object o) {
@@ -153,10 +125,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createMono(connection -> connection.sIsMember(rawKey(key), rawValue((V) o)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#isMember(java.lang.Object, java.lang.Object...)
-	 */
 	@Override
 	public Mono<Map<Object, Boolean>> isMember(K key, Object... objects) {
 
@@ -181,10 +149,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersect(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Flux<V> intersect(K key, K otherKey) {
 
@@ -194,10 +158,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return intersect(key, Collections.singleton(otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersect(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Flux<V> intersect(K key, Collection<K> otherKeys) {
 
@@ -207,10 +167,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return intersect(getKeys(key, otherKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersect(java.util.Collection)
-	 */
 	@Override
 	public Flux<V> intersect(Collection<K> keys) {
 
@@ -223,9 +179,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersectAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> intersectAndStore(K key, K otherKey, K destKey) {
 
@@ -236,10 +189,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return intersectAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> intersectAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -250,10 +199,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return intersectAndStore(getKeys(key, otherKeys), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#intersectAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> intersectAndStore(Collection<K> keys, K destKey) {
 
@@ -266,10 +211,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.flatMap(rawKeys -> connection.sInterStore(rawKey(destKey), rawKeys)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#union(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Flux<V> union(K key, K otherKey) {
 
@@ -279,10 +220,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return union(key, Collections.singleton(otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#union(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Flux<V> union(K key, Collection<K> otherKeys) {
 
@@ -292,10 +229,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return union(getKeys(key, otherKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#union(java.util.Collection)
-	 */
 	@Override
 	public Flux<V> union(Collection<K> keys) {
 
@@ -308,10 +241,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#unionAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(K key, K otherKey, K destKey) {
 
@@ -322,10 +251,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return unionAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -336,10 +261,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return unionAndStore(getKeys(key, otherKeys), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#unionAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(Collection<K> keys, K destKey) {
 
@@ -352,10 +273,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.flatMap(rawKeys -> connection.sUnionStore(rawKey(destKey), rawKeys)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#difference(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Flux<V> difference(K key, K otherKey) {
 
@@ -365,10 +282,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return difference(key, Collections.singleton(otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#difference(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Flux<V> difference(K key, Collection<K> otherKeys) {
 
@@ -378,10 +291,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return difference(getKeys(key, otherKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#difference(java.util.Collection)
-	 */
 	@Override
 	public Flux<V> difference(Collection<K> keys) {
 
@@ -394,10 +303,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#differenceAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> differenceAndStore(K key, K otherKey, K destKey) {
 
@@ -408,10 +313,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return differenceAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#differenceAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> differenceAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -422,10 +323,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return differenceAndStore(getKeys(key, otherKeys), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#differenceAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> differenceAndStore(Collection<K> keys, K destKey) {
 
@@ -438,10 +335,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 				.flatMap(rawKeys -> connection.sDiffStore(rawKey(destKey), rawKeys)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#members(java.lang.Object)
-	 */
 	@Override
 	public Flux<V> members(K key) {
 
@@ -450,10 +343,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createFlux(connection -> connection.sMembers(rawKey(key)).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#scan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Flux<V> scan(K key, ScanOptions options) {
 
@@ -463,10 +352,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createFlux(connection -> connection.sScan(rawKey(key), options).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#randomMember(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> randomMember(K key) {
 
@@ -475,10 +360,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createMono(connection -> connection.sRandMember(rawKey(key)).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#distinctRandomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public Flux<V> distinctRandomMembers(K key, long count) {
 
@@ -487,10 +368,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createFlux(connection -> connection.sRandMember(rawKey(key), count).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#randomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public Flux<V> randomMembers(K key, long count) {
 
@@ -499,10 +376,6 @@ class DefaultReactiveSetOperations<K, V> implements ReactiveSetOperations<K, V>
 		return createFlux(connection -> connection.sRandMember(rawKey(key), -count).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveSetOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveStreamOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveStreamOperations.java
index 1ecbd97c9..bb4bf5a20 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveStreamOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveStreamOperations.java
@@ -119,10 +119,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		};
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#acknowledge(java.lang.Object, java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Mono<Long> acknowledge(K key, String group, RecordId... recordIds) {
 
@@ -134,10 +130,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xAck(rawKey(key), group, recordIds));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#add(java.lang.Object, java.util.Map)
-	 */
 	@Override
 	public Mono<RecordId> add(Record<K, ?> record) {
 
@@ -149,10 +141,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xAdd(serializeRecord(input)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#delete(java.lang.Object, java.lang.String[])
-	 */
 	@Override
 	public Mono<Long> delete(K key, RecordId... recordIds) {
 
@@ -190,10 +178,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xGroupDestroy(rawKey(key), group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#consumers(java.lang.Object)
-	 */
 	@Override
 	public Flux<XInfoConsumer> consumers(K key, String group) {
 
@@ -203,10 +187,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createFlux(connection -> connection.xInfoConsumers(rawKey(key), group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#info(java.lang.Object)
-	 */
 	@Override
 	public Mono<XInfoStream> info(K key) {
 
@@ -215,10 +195,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xInfo(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#groups(java.lang.Object)
-	 */
 	@Override
 	public Flux<XInfoGroup> groups(K key) {
 
@@ -227,10 +203,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createFlux(connection -> connection.xInfoGroups(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, java.lang.String, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public Mono<PendingMessages> pending(K key, String group, Range<?> range, long count) {
 
@@ -238,10 +210,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xPending(rawKey, group, range, count));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, org.springframework.data.redis.connection.stream.Consumer, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public Mono<PendingMessages> pending(K key, Consumer consumer, Range<?> range, long count) {
 
@@ -249,10 +217,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xPending(rawKey, consumer, range, count));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Mono<PendingMessagesSummary> pending(K key, String group) {
 
@@ -260,10 +224,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xPending(rawKey, group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(K key) {
 
@@ -272,10 +232,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createMono(connection -> connection.xLen(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#range(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<MapRecord<K, HK, HV>> range(K key, Range<String> range, Limit limit) {
 
@@ -286,10 +242,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createFlux(connection -> connection.xRange(rawKey(key), range, limit).map(this::deserializeRecord));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public Flux<MapRecord<K, HK, HV>> read(StreamReadOptions readOptions, StreamOffset<K>... streams) {
 
@@ -304,10 +256,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public Flux<MapRecord<K, HK, HV>> read(Consumer consumer, StreamReadOptions readOptions, StreamOffset<K>... streams) {
 
@@ -323,10 +271,6 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#reverseRange(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<MapRecord<K, HK, HV>> reverseRange(K key, Range<String> range, Limit limit) {
 
@@ -337,19 +281,11 @@ class DefaultReactiveStreamOperations<K, HK, HV> implements ReactiveStreamOperat
 		return createFlux(connection -> connection.xRevRange(rawKey(key), range, limit).map(this::deserializeRecord));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#trim(java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Long> trim(K key, long count) {
 		return trim(key, count, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveStreamOperations#trim(java.lang.Object, long, boolean)
-	 */
 	@Override
 	public Mono<Long> trim(K key, long count, boolean approximateTrimming) {
 		Assert.notNull(key, "Key must not be null!");
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveValueOperations.java
index a64e50116..e7c99f082 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveValueOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveValueOperations.java
@@ -55,9 +55,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		this.serializationContext = serializationContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#set(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> set(K key, V value) {
 
@@ -66,9 +63,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.set(rawKey(key), rawValue(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#set(java.lang.Object, java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Mono<Boolean> set(K key, V value, Duration timeout) {
 
@@ -79,9 +73,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.set(rawKey(key), rawValue(value), Expiration.from(timeout), SetOption.UPSERT));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#setIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> setIfAbsent(K key, V value) {
 
@@ -91,9 +82,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.set(rawKey(key), rawValue(value), Expiration.persistent(), SetOption.SET_IF_ABSENT));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#setIfAbsent(java.lang.Object, java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<Boolean> setIfAbsent(K key, V value, Duration timeout) {
 
@@ -104,9 +92,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.set(rawKey(key), rawValue(value), Expiration.from(timeout), SetOption.SET_IF_ABSENT));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#setIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> setIfPresent(K key, V value) {
 
@@ -116,9 +101,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.set(rawKey(key), rawValue(value), Expiration.persistent(), SetOption.SET_IF_PRESENT));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#setIfPresent(java.lang.Object, java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<Boolean> setIfPresent(K key, V value, Duration timeout) {
 
@@ -129,9 +111,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.set(rawKey(key), rawValue(value), Expiration.from(timeout), SetOption.SET_IF_PRESENT));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#multiSet(java.util.Map)
-	 */
 	@Override
 	public Mono<Boolean> multiSet(Map<? extends K, ? extends V> map) {
 
@@ -146,9 +125,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#multiSetIfAbsent(java.util.Map)
-	 */
 	@Override
 	public Mono<Boolean> multiSetIfAbsent(Map<? extends K, ? extends V> map) {
 
@@ -163,9 +139,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#get(java.lang.Object)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public Mono<V> get(Object key) {
@@ -176,9 +149,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#getAndDelete(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> getAndDelete(K key) {
 
@@ -188,9 +158,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#getAndExpire(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<V> getAndExpire(K key, Duration timeout) {
 
@@ -201,9 +168,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#getAndPersist(java.lang.Object)
-	 */
 	@Override
 	public Mono<V> getAndPersist(K key) {
 
@@ -213,9 +177,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(this::readValue));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#getAndSet(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<V> getAndSet(K key, V value) {
 
@@ -224,9 +185,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.getSet(rawKey(key), rawValue(value)).map(value()::read));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#multiGet(java.util.Collection)
-	 */
 	@Override
 	public Mono<List<V>> multiGet(Collection<K> keys) {
 
@@ -236,9 +194,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(this::deserializeValues));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#increment(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> increment(K key) {
 
@@ -247,9 +202,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return template.doCreateMono(connection -> connection.numberCommands().incr(rawKey(key)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Long> increment(K key, long delta) {
 
@@ -258,9 +210,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return template.doCreateMono(connection -> connection.numberCommands().incrBy(rawKey(key), delta));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#increment(java.lang.Object, double)
-	 */
 	@Override
 	public Mono<Double> increment(K key, double delta) {
 
@@ -269,9 +218,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return template.doCreateMono(connection -> connection.numberCommands().incrBy(rawKey(key), delta));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#decrement(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> decrement(K key) {
 
@@ -280,9 +226,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return template.doCreateMono(connection -> connection.numberCommands().decr(rawKey(key)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#decrement(java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Long> decrement(K key, long delta) {
 
@@ -291,9 +234,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return template.doCreateMono(connection -> connection.numberCommands().decrBy(rawKey(key), delta));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#append(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Mono<Long> append(K key, String value) {
 
@@ -304,9 +244,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				connection -> connection.append(rawKey(key), serializationContext.getStringSerializationPair().write(value)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#get(java.lang.Object, long, long)
-	 */
 	@Override
 	public Mono<String> get(K key, long start, long end) {
 
@@ -316,9 +253,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 				.map(stringSerializationPair()::read));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#set(java.lang.Object, java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Long> set(K key, V value, long offset) {
 
@@ -327,9 +261,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.setRange(rawKey(key), rawValue(value), offset));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(K key) {
 
@@ -338,9 +269,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.strLen(rawKey(key)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#setBit(java.lang.Object, long, boolean)
-	 */
 	@Override
 	public Mono<Boolean> setBit(K key, long offset, boolean value) {
 
@@ -349,9 +277,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.setBit(rawKey(key), offset, value));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#getBit(java.lang.Object, long)
-	 */
 	@Override
 	public Mono<Boolean> getBit(K key, long offset) {
 
@@ -360,9 +285,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.getBit(rawKey(key), offset));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#bitField(java.lang.Object, org.springframework.data.redis.connection.BitFieldSubCommands)
-	 */
 	@Override
 	public Mono<List<Long>> bitField(K key, BitFieldSubCommands subCommands) {
 
@@ -372,9 +294,6 @@ class DefaultReactiveValueOperations<K, V> implements ReactiveValueOperations<K,
 		return createMono(connection -> connection.bitField(rawKey(key), subCommands));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveValueOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultReactiveZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultReactiveZSetOperations.java
index ced2d5afa..b8e79d4ce 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultReactiveZSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultReactiveZSetOperations.java
@@ -59,10 +59,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		this.serializationContext = serializationContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#add(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Mono<Boolean> add(K key, V value, double score) {
 
@@ -71,10 +67,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zAdd(rawKey(key), score, rawValue(value)).map(l -> l != 0));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#add(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Mono<Long> addAll(K key, Collection<? extends TypedTuple<V>> tuples) {
 
@@ -87,10 +79,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zAdd(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> remove(K key, Object... values) {
@@ -108,10 +96,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zRem(rawKey(key), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#incrementScore(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Mono<Double> incrementScore(K key, V value, double delta) {
 
@@ -120,10 +104,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zIncrBy(rawKey(key), delta, rawValue(value)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#randomMember(K)
-	 */
 	@Override
 	public Mono<V> randomMember(K key) {
 
@@ -132,10 +112,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRandMember(rawKey(key))).map(this::readValue);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#distinctRandomMembers(K, long)
-	 */
 	@Override
 	public Flux<V> distinctRandomMembers(K key, long count) {
 
@@ -145,10 +121,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRandMember(rawKey(key), count)).map(this::readValue);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#randomMembers(K, long)
-	 */
 	@Override
 	public Flux<V> randomMembers(K key, long count) {
 
@@ -158,10 +130,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRandMember(rawKey(key), -count)).map(this::readValue);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#randomMemberWithScore(K)
-	 */
 	@Override
 	public Mono<TypedTuple<V>> randomMemberWithScore(K key) {
 
@@ -170,10 +138,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRandMemberWithScore(rawKey(key))).map(this::readTypedTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#distinctRandomMembersWithScore(K, long)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> distinctRandomMembersWithScore(K key, long count) {
 
@@ -183,10 +147,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRandMemberWithScore(rawKey(key), count)).map(this::readTypedTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#randomMembersWithScore(K, long)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> randomMembersWithScore(K key, long count) {
 
@@ -196,10 +156,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRandMemberWithScore(rawKey(key), -count)).map(this::readTypedTuple);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rank(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> rank(K key, Object o) {
@@ -209,10 +165,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRank(rawKey(key), rawValue((V) o)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRank(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Long> reverseRank(K key, Object o) {
@@ -222,10 +174,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRevRank(rawKey(key), rawValue((V) o)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#range(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> range(K key, Range<Long> range) {
 
@@ -235,10 +183,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRange(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeWithScores(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> rangeWithScores(K key, Range<Long> range) {
 
@@ -248,10 +192,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeWithScores(rawKey(key), range).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByScore(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> rangeByScore(K key, Range<Double> range) {
 
@@ -261,10 +201,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeByScore(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByScoreWithScores(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> rangeByScoreWithScores(K key, Range<Double> range) {
 
@@ -274,10 +210,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeByScoreWithScores(rawKey(key), range).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByScore(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<V> rangeByScore(K key, Range<Double> range, Limit limit) {
 
@@ -287,10 +219,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeByScore(rawKey(key), range, limit).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByScoreWithScores(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> rangeByScoreWithScores(K key, Range<Double> range, Limit limit) {
 
@@ -302,10 +230,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				connection -> connection.zRangeByScoreWithScores(rawKey(key), range, limit).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRange(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> reverseRange(K key, Range<Long> range) {
 
@@ -315,10 +239,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRange(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeWithScores(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> reverseRangeWithScores(K key, Range<Long> range) {
 
@@ -328,10 +248,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRangeWithScores(rawKey(key), range).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByScore(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> reverseRangeByScore(K key, Range<Double> range) {
 
@@ -341,10 +257,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRangeByScore(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByScoreWithScores(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> reverseRangeByScoreWithScores(K key, Range<Double> range) {
 
@@ -355,10 +267,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				connection -> connection.zRevRangeByScoreWithScores(rawKey(key), range).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByScore(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<V> reverseRangeByScore(K key, Range<Double> range, Limit limit) {
 
@@ -368,10 +276,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRangeByScore(rawKey(key), range, limit).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByScoreWithScores(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> reverseRangeByScoreWithScores(K key, Range<Double> range, Limit limit) {
 
@@ -383,10 +287,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				connection -> connection.zRevRangeByScoreWithScores(rawKey(key), range, limit).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#scan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> scan(K key, ScanOptions options) {
 
@@ -396,10 +296,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zScan(rawKey(key), options).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#count(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Mono<Long> count(K key, Range<Double> range) {
 
@@ -409,10 +305,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zCount(rawKey(key), range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#lexCount(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Mono<Long> lexCount(K key, Range<String> range) {
 
@@ -422,10 +314,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zLexCount(rawKey(key), range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMin(java.lang.Object)
-	 */
 	@Override
 	public Mono<TypedTuple<V>> popMin(K key) {
 
@@ -434,10 +322,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zPopMin(rawKey(key)).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMin(java.lang.Object, long)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> popMin(K key, long count) {
 
@@ -446,10 +330,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zPopMin(rawKey(key), count).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMin(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<TypedTuple<V>> popMin(K key, Duration timeout) {
 
@@ -459,10 +339,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.bZPopMin(rawKey(key), timeout).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMax(java.lang.Object)
-	 */
 	@Override
 	public Mono<TypedTuple<V>> popMax(K key) {
 
@@ -471,10 +347,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zPopMax(rawKey(key)).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMax(java.lang.Object, long)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> popMax(K key, long count) {
 
@@ -483,10 +355,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zPopMax(rawKey(key), count).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#popMax(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<TypedTuple<V>> popMax(K key, Duration timeout) {
 
@@ -496,10 +364,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.bZPopMax(rawKey(key), timeout).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> size(K key) {
 
@@ -508,10 +372,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zCard(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#score(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<Double> score(K key, Object o) {
@@ -521,10 +381,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zScore(rawKey(key), rawValue((V) o)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#score(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Mono<List<Double>> score(K key, Object... o) {
@@ -537,10 +393,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(values -> connection.zMScore(rawKey(key), values)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#removeRange(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Mono<Long> removeRange(K key, Range<Long> range) {
 
@@ -550,10 +402,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRemRangeByRank(rawKey(key), range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#removeRangebyLex(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Mono<Long> removeRangeByLex(K key, Range<String> range) {
 
@@ -563,10 +411,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRemRangeByLex(rawKey(key), range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#removeRangeByScore(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Mono<Long> removeRangeByScore(K key, Range<Double> range) {
 
@@ -576,10 +420,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createMono(connection -> connection.zRemRangeByScore(rawKey(key), range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#difference(K, Collection)
-	 */
 	@Override
 	public Flux<V> difference(K key, Collection<K> otherKeys) {
 
@@ -592,10 +432,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zDiff).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#differenceWithScores(K, Collection)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> differenceWithScores(K key, Collection<K> otherKeys) {
 
@@ -608,10 +444,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zDiffWithScores).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#differenceAndStore(K, Collection, K)
-	 */
 	@Override
 	public Mono<Long> differenceAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -626,10 +458,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#intersect(K, Collection)
-	 */
 	@Override
 	public Flux<V> intersect(K key, Collection<K> otherKeys) {
 
@@ -642,10 +470,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zInter).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#intersectWithScores(K, Collection)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> intersectWithScores(K key, Collection<K> otherKeys) {
 
@@ -658,10 +482,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zInterWithScores).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#intersectWithScores(K, Collection, Aggregate, Weights)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> intersectWithScores(K key, Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 
@@ -678,10 +498,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(sets -> connection.zInterWithScores(sets, weights, aggregate)).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> intersectAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -695,10 +511,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zInterStore(rawKey(destKey), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Mono<Long> intersectAndStore(K key, Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 
@@ -714,10 +526,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zInterStore(rawKey(destKey), serialized, weights, aggregate)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#union(K, Collection)
-	 */
 	@Override
 	public Flux<V> union(K key, Collection<K> otherKeys) {
 
@@ -730,10 +538,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zUnion).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#unionWithScores(K, Collection)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> unionWithScores(K key, Collection<K> otherKeys) {
 
@@ -746,10 +550,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(connection::zUnionWithScores).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#unionWithScores(K, Collection, Aggregate, Weights)
-	 */
 	@Override
 	public Flux<TypedTuple<V>> unionWithScores(K key, Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 
@@ -764,10 +564,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMapMany(sets -> connection.zUnionWithScores(sets, weights, aggregate)).map(this::readTypedTuple));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#unionAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(K key, K otherKey, K destKey) {
 
@@ -778,10 +574,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return unionAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -795,10 +587,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zUnionStore(rawKey(destKey), serialized)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Mono<Long> unionAndStore(K key, Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 
@@ -814,10 +602,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 				.flatMap(serialized -> connection.zUnionStore(rawKey(destKey), serialized, weights, aggregate)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByLex(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> rangeByLex(K key, Range<String> range) {
 
@@ -827,10 +611,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeByLex(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#rangeByLex(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<V> rangeByLex(K key, Range<String> range, Limit limit) {
 
@@ -841,10 +621,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRangeByLex(rawKey(key), range, limit).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByLex(java.lang.Object, org.springframework.data.domain.Range)
-	 */
 	@Override
 	public Flux<V> reverseRangeByLex(K key, Range<String> range) {
 
@@ -854,10 +630,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRangeByLex(rawKey(key), range).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#reverseRangeByLex(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Flux<V> reverseRangeByLex(K key, Range<String> range, Limit limit) {
 
@@ -868,10 +640,6 @@ class DefaultReactiveZSetOperations<K, V> implements ReactiveZSetOperations<K, V
 		return createFlux(connection -> connection.zRevRangeByLex(rawKey(key), range, limit).map(this::readValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveZSetOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> delete(K key) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java
index d4f7d00b4..1c12b9474 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java
@@ -40,10 +40,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#add(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long add(K key, V... values) {
 
@@ -52,19 +48,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sAdd(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#difference(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Set<V> difference(K key, K otherKey) {
 		return difference(Arrays.asList(key, otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#difference(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> difference(K key, Collection<K> otherKeys) {
 
@@ -74,10 +62,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#difference(java.util.Collection)
-	 */
 	@Override
 	public Set<V> difference(Collection<K> keys) {
 
@@ -87,19 +71,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#differenceAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long differenceAndStore(K key, K otherKey, K destKey) {
 		return differenceAndStore(Arrays.asList(key, otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#differenceAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long differenceAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -109,10 +85,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sDiffStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#differenceAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long differenceAndStore(Collection<K> keys, K destKey) {
 
@@ -122,19 +94,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sDiffStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersect(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Set<V> intersect(K key, K otherKey) {
 		return intersect(Arrays.asList(key, otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersect(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> intersect(K key, Collection<K> otherKeys) {
 
@@ -144,10 +108,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersect(java.util.Collection)
-	 */
 	@Override
 	public Set<V> intersect(Collection<K> keys) {
 
@@ -157,19 +117,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersectAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(K key, K otherKey, K destKey) {
 		return intersectAndStore(Arrays.asList(key, otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -179,10 +131,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sInterStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#intersectAndStore(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(Collection<K> keys, K destKey) {
 
@@ -192,10 +140,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sInterStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#isMember(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean isMember(K key, Object o) {
 
@@ -205,10 +149,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sIsMember(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#isMember(java.lang.Object, java.lang.Object...)
-	 */
 	@Override
 	public Map<Object, Boolean> isMember(K key, Object... objects) {
 
@@ -233,10 +173,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#members(java.lang.Object)
-	 */
 	@Override
 	public Set<V> members(K key) {
 
@@ -246,10 +182,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#move(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean move(K key, V value, K destKey) {
 
@@ -260,10 +192,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sMove(rawKey, rawDestKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#randomMember(java.lang.Object)
-	 */
 	@Override
 	public V randomMember(K key) {
 
@@ -276,10 +204,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#distinctRandomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public Set<V> distinctRandomMembers(K key, long count) {
 
@@ -292,10 +216,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#randomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public List<V> randomMembers(K key, long count) {
 
@@ -308,10 +228,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long remove(K key, Object... values) {
 
@@ -320,10 +236,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sRem(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#pop(java.lang.Object)
-	 */
 	@Override
 	public V pop(K key) {
 
@@ -336,10 +248,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations(java.lang.Object, long)
-	 */
 	@Override
 	public List<V> pop(K key, long count) {
 
@@ -349,10 +257,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 
@@ -360,19 +264,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sCard(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#union(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Set<V> union(K key, K otherKey) {
 		return union(Arrays.asList(key, otherKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#union(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> union(K key, Collection<K> otherKeys) {
 
@@ -382,10 +278,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#union(java.util.Collection)
-	 */
 	@Override
 	public Set<V> union(Collection<K> keys) {
 
@@ -395,19 +287,11 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#union(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(K key, K otherKey, K destKey) {
 		return unionAndStore(Arrays.asList(key, otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -417,10 +301,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sUnionStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#union(java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(Collection<K> keys, K destKey) {
 
@@ -430,10 +310,6 @@ class DefaultSetOperations<K, V> extends AbstractOperations<K, V> implements Set
 		return execute(connection -> connection.sUnionStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SetOperations#sScan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<V> scan(K key, ScanOptions options) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultStreamOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultStreamOperations.java
index d03baa726..7bdcf9b19 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultStreamOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultStreamOperations.java
@@ -111,10 +111,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		};
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#acknowledge(java.lang.Object, java.lang.String, java.lang.String[])
-	 */
 	@Override
 	public Long acknowledge(K key, String group, String... recordIds) {
 
@@ -122,10 +118,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xAck(rawKey, group, recordIds));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#add(org.springframework.data.redis.connection.stream.Record)
-	 */
 	@Nullable
 	@Override
 	@SuppressWarnings("unchecked")
@@ -140,10 +132,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xAdd(binaryRecord));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#delete(java.lang.Object, java.lang.String[])
-	 */
 	@Override
 	public Long delete(K key, RecordId... recordIds) {
 
@@ -151,10 +139,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xDel(rawKey, recordIds));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#createGroup(java.lang.Object, org.springframework.data.redis.connection.RedisStreamCommands.ReadOffset, java.lang.String)
-	 */
 	@Override
 	public String createGroup(K key, ReadOffset readOffset, String group) {
 
@@ -162,10 +146,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xGroupCreate(rawKey, group, readOffset, true));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#deleteConsumer(java.lang.Object, org.springframework.data.redis.connection.RedisStreamCommands.Consumer)
-	 */
 	@Override
 	public Boolean deleteConsumer(K key, Consumer consumer) {
 
@@ -173,10 +153,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xGroupDelConsumer(rawKey, consumer));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#destroyGroup(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Boolean destroyGroup(K key, String group) {
 
@@ -184,10 +160,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xGroupDestroy(rawKey, group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#info(java.lang.Object)
-	 */
 	@Override
 	public XInfoStream info(K key) {
 
@@ -195,10 +167,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xInfo(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#consumers(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public XInfoConsumers consumers(K key, String group) {
 
@@ -206,10 +174,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xInfoConsumers(rawKey, group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#groups(java.lang.Object)
-	 */
 	@Override
 	public XInfoGroups groups(K key) {
 
@@ -217,10 +181,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xInfoGroups(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, java.lang.String, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public PendingMessages pending(K key, String group, Range<?> range, long count) {
 
@@ -228,10 +188,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xPending(rawKey, group, range, count));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, org.springframework.data.redis.connection.stream.Consumer, org.springframework.data.domain.Range, java.lang.Long)
-	 */
 	@Override
 	public PendingMessages pending(K key, Consumer consumer, Range<?> range, long count) {
 
@@ -239,10 +195,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xPending(rawKey, consumer, range, count));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#pending(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public PendingMessagesSummary pending(K key, String group) {
 
@@ -250,10 +202,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xPending(rawKey, group));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 
@@ -261,10 +209,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		return execute(connection -> connection.xLen(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#range(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<MapRecord<K, HK, HV>> range(K key, Range<String> range, Limit limit) {
 
@@ -278,10 +222,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<MapRecord<K, HK, HV>> read(StreamReadOptions readOptions, StreamOffset<K>... streams) {
 
@@ -295,10 +235,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#read(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamReadOptions, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset[])
-	 */
 	@Override
 	public List<MapRecord<K, HK, HV>> read(Consumer consumer, StreamReadOptions readOptions, StreamOffset<K>... streams) {
 
@@ -312,10 +248,6 @@ class DefaultStreamOperations<K, HK, HV> extends AbstractOperations<K, Object> i
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.StreamOperations#reverseRange(java.lang.Object, org.springframework.data.domain.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public List<MapRecord<K, HK, HV>> reverseRange(K key, Range<String> range, Limit limit) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java
index fb29c59b9..de13ba602 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java
@@ -44,10 +44,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#get(java.lang.Object)
-	 */
 	@Override
 	public V get(Object key) {
 
@@ -60,10 +56,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getAndDelete(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public V getAndDelete(K key) {
@@ -77,10 +69,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getAndPersist(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public V getAndExpire(K key, long timeout, TimeUnit unit) {
@@ -94,10 +82,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getAndPersist(java.lang.Object, java.time.Duration)
-	 */
 	@Nullable
 	@Override
 	public V getAndExpire(K key, Duration timeout) {
@@ -111,10 +95,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getAndPersist(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public V getAndPersist(K key) {
@@ -128,10 +108,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getAndSet(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public V getAndSet(K key, V newValue) {
 
@@ -145,10 +121,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#increment(java.lang.Object)
-	 */
 	@Override
 	public Long increment(K key) {
 
@@ -156,10 +128,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.incr(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Long increment(K key, long delta) {
 
@@ -167,10 +135,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.incrBy(rawKey, delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#increment(java.lang.Object, double)
-	 */
 	@Override
 	public Double increment(K key, double delta) {
 
@@ -178,10 +142,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.incrBy(rawKey, delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#decrement(java.lang.Object)
-	 */
 	@Override
 	public Long decrement(K key) {
 
@@ -189,10 +149,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.decr(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Long decrement(K key, long delta) {
 
@@ -200,10 +156,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.decrBy(rawKey, delta));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#append(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Integer append(K key, String value) {
 
@@ -216,10 +168,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#get(java.lang.Object, long, long)
-	 */
 	@Override
 	public String get(K key, long start, long end) {
 		byte[] rawKey = rawKey(key);
@@ -228,10 +176,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return deserializeString(rawReturn);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#multiGet(java.util.Collection)
-	 */
 	@Override
 	public List<V> multiGet(Collection<K> keys) {
 
@@ -251,10 +195,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#multiSet(java.util.Map)
-	 */
 	@Override
 	public void multiSet(Map<? extends K, ? extends V> m) {
 
@@ -274,10 +214,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#multiSetIfAbsent(java.util.Map)
-	 */
 	@Override
 	public Boolean multiSetIfAbsent(Map<? extends K, ? extends V> m) {
 
@@ -294,10 +230,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.mSetNX(rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#set(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void set(K key, V value) {
 
@@ -312,10 +244,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#set(java.lang.Object, java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public void set(K key, V value, long timeout, TimeUnit unit) {
 
@@ -353,10 +281,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#setIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean setIfAbsent(K key, V value) {
 
@@ -365,10 +289,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.setNX(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#setIfAbsent(java.lang.Object, java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean setIfAbsent(K key, V value, long timeout, TimeUnit unit) {
 
@@ -379,10 +299,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.set(rawKey, rawValue, expiration, SetOption.ifAbsent()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#setIfPresent(java.lang.Object, java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public Boolean setIfPresent(K key, V value) {
@@ -393,10 +309,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.set(rawKey, rawValue, Expiration.persistent(), SetOption.ifPresent()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#setIfPresent(java.lang.Object, java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public Boolean setIfPresent(K key, V value, long timeout, TimeUnit unit) {
@@ -408,10 +320,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.set(rawKey, rawValue, expiration, SetOption.ifPresent()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#set(java.lang.Object, java.lang.Object, long)
-	 */
 	@Override
 	public void set(K key, V value, long offset) {
 
@@ -424,10 +332,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 
@@ -435,10 +339,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.strLen(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#setBit(java.lang.Object, long, boolean)
-	 */
 	@Override
 	public Boolean setBit(K key, long offset, boolean value) {
 
@@ -446,10 +346,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.setBit(rawKey, offset, value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#getBit(java.lang.Object, long)
-	 */
 	@Override
 	public Boolean getBit(K key, long offset) {
 
@@ -457,10 +353,6 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
 		return execute(connection -> connection.getBit(rawKey, offset));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ValueOperations#bitfield(Object, RedisStringCommands.BitfieldCommand)
-	 */
 	@Override
 	public List<Long> bitField(K key, final BitFieldSubCommands subCommands) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java
index 196500c61..441adee48 100644
--- a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java
@@ -48,10 +48,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		super(template);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#add(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Boolean add(K key, V value, double score) {
 
@@ -60,10 +56,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zAdd(rawKey, score, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#addIfAbsent(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Boolean addIfAbsent(K key, V value, double score) {
 		return add(key, value, score, ZAddArgs.ifNotExists());
@@ -84,10 +76,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zAdd(rawKey, score, rawValue, args));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#add(java.lang.Object, java.util.Set)
-	 */
 	@Override
 	public Long add(K key, Set<TypedTuple<V>> tuples) {
 
@@ -96,10 +84,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zAdd(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#addIfAbsent(java.lang.Object, java.util.Set)
-	 */
 	@Override
 	public Long addIfAbsent(K key, Set<TypedTuple<V>> tuples) {
 		return add(key, tuples, ZAddArgs.ifNotExists());
@@ -120,10 +104,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zAdd(rawKey, rawValues, args));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#incrementScore(java.lang.Object, java.lang.Object, double)
-	 */
 	@Override
 	public Double incrementScore(K key, V value, double delta) {
 
@@ -132,10 +112,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zIncrBy(rawKey, delta, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#randomMember(java.lang.Object)
-	 */
 	@Override
 	public V randomMember(K key) {
 
@@ -144,10 +120,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValue(execute(connection -> connection.zRandMember(rawKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#distinctRandomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public Set<V> distinctRandomMembers(K key, long count) {
 
@@ -159,10 +131,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return result != null ? deserializeValues(new LinkedHashSet<>(result)) : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#randomMembers(java.lang.Object, long)
-	 */
 	@Override
 	public List<V> randomMembers(K key, long count) {
 
@@ -174,10 +142,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#randomMemberWithScore(java.lang.Object)
-	 */
 	@Override
 	public TypedTuple<V> randomMemberWithScore(K key) {
 
@@ -186,10 +150,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTuple(execute(connection -> connection.zRandMemberWithScore(rawKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#distinctRandomMembersWithScore(java.lang.Object, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> distinctRandomMembersWithScore(K key, long count) {
 
@@ -201,10 +161,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return result != null ? deserializeTupleValues(new LinkedHashSet<>(result)) : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#randomMembersWithScore(java.lang.Object, long)
-	 */
 	@Override
 	public List<TypedTuple<V>> randomMembersWithScore(K key, long count) {
 
@@ -216,10 +172,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return result != null ? deserializeTupleValues(result) : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#range(java.lang.Object, long, long)
-	 */
 	@Override
 	public Set<V> range(K key, long start, long end) {
 
@@ -229,10 +181,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRange(java.lang.Object, long, long)
-	 */
 	@Override
 	public Set<V> reverseRange(K key, long start, long end) {
 
@@ -242,10 +190,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeWithScores(java.lang.Object, long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> rangeWithScores(K key, long start, long end) {
 
@@ -255,10 +199,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeWithScores(java.lang.Object, long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> reverseRangeWithScores(K key, long start, long end) {
 
@@ -268,10 +208,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeByLex(java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<V> rangeByLex(K key, Range range, Limit limit) {
 
@@ -281,10 +217,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeByLex(java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<V> reverseRangeByLex(K key, Range range, Limit limit) {
 
@@ -294,10 +226,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeByScore(java.lang.Object, double, double)
-	 */
 	@Override
 	public Set<V> rangeByScore(K key, double min, double max) {
 
@@ -307,10 +235,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeByScore(java.lang.Object, double, double, long, long)
-	 */
 	@Override
 	public Set<V> rangeByScore(K key, double min, double max, long offset, long count) {
 
@@ -320,10 +244,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeByScore(java.lang.Object, double, double)
-	 */
 	@Override
 	public Set<V> reverseRangeByScore(K key, double min, double max) {
 
@@ -333,10 +253,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeByScore(java.lang.Object, double, double, long, long)
-	 */
 	@Override
 	public Set<V> reverseRangeByScore(K key, double min, double max, long offset, long count) {
 
@@ -346,10 +262,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeByScoreWithScores(java.lang.Object, double, double)
-	 */
 	@Override
 	public Set<TypedTuple<V>> rangeByScoreWithScores(K key, double min, double max) {
 
@@ -359,10 +271,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rangeByScoreWithScores(java.lang.Object, double, double, long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> rangeByScoreWithScores(K key, double min, double max, long offset, long count) {
 
@@ -372,10 +280,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeByScoreWithScores(java.lang.Object, double, double)
-	 */
 	@Override
 	public Set<TypedTuple<V>> reverseRangeByScoreWithScores(K key, double min, double max) {
 
@@ -385,10 +289,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRangeByScoreWithScores(java.lang.Object, double, double, long, long)
-	 */
 	@Override
 	public Set<TypedTuple<V>> reverseRangeByScoreWithScores(K key, double min, double max, long offset, long count) {
 
@@ -399,10 +299,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#rank(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long rank(K key, Object o) {
 
@@ -415,10 +311,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#reverseRank(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long reverseRank(K key, Object o) {
 
@@ -431,10 +323,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#remove(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public Long remove(K key, Object... values) {
 
@@ -444,10 +332,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zRem(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#removeRange(java.lang.Object, long, long)
-	 */
 	@Override
 	public Long removeRange(K key, long start, long end) {
 
@@ -455,10 +339,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zRemRange(rawKey, start, end));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#removeRangeByLex(java.lang.Object, Range)
-	 */
 	@Override
 	public Long removeRangeByLex(K key, Range range) {
 
@@ -466,10 +346,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zRemRangeByLex(rawKey, range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#removeRangeByScore(java.lang.Object, double, double)
-	 */
 	@Override
 	public Long removeRangeByScore(K key, double min, double max) {
 
@@ -477,10 +353,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zRemRangeByScore(rawKey, min, max));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#score(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Double score(K key, Object o) {
 
@@ -489,10 +361,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zScore(rawKey, rawValue));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#score(java.lang.Object, java.lang.Object[])
-	 */
 	@Override
 	public List<Double> score(K key, Object... o) {
 
@@ -501,10 +369,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zMScore(rawKey, rawValues));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#count(java.lang.Object, double, double)
-	 */
 	@Override
 	public Long count(K key, double min, double max) {
 
@@ -512,10 +376,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zCount(rawKey, min, max));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#lexCount(java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long lexCount(K key, Range range) {
 
@@ -523,10 +383,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zLexCount(rawKey, range));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMin(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMin(K key) {
@@ -535,10 +391,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTuple(execute(connection -> connection.zPopMin(rawKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMin(java.lang.Object, long)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> popMin(K key, long count) {
@@ -548,10 +400,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(new LinkedHashSet<> (result));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMin(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMin(K key, long timeout, TimeUnit unit) {
@@ -560,10 +408,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTuple(execute(connection -> connection.bZPopMin(rawKey, timeout, unit)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMax(java.lang.Object)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMax(K key) {
@@ -572,10 +416,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTuple(execute(connection -> connection.zPopMax(rawKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMax(java.lang.Object, long)
-	 */
 	@Nullable
 	@Override
 	public Set<TypedTuple<V>> popMax(K key, long count) {
@@ -585,10 +425,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(new LinkedHashSet<>(result));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#popMax(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Nullable
 	@Override
 	public TypedTuple<V> popMax(K key, long timeout, TimeUnit unit) {
@@ -597,19 +433,11 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTuple(execute(connection -> connection.bZPopMax(rawKey, timeout, unit)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#size(java.lang.Object)
-	 */
 	@Override
 	public Long size(K key) {
 		return zCard(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#zCard(java.lang.Object)
-	 */
 	@Override
 	public Long zCard(K key) {
 
@@ -617,10 +445,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zCard(rawKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#difference(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> difference(K key, Collection<K> otherKeys) {
 
@@ -629,10 +453,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#differenceWithScores(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<V>> differenceWithScores(K key, Collection<K> otherKeys) {
 
@@ -641,10 +461,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(new LinkedHashSet<>(result));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#differenceAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long differenceAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -654,10 +470,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zDiffStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersect(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> intersect(K key, Collection<K> otherKeys) {
 
@@ -666,10 +478,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersectWithScores(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<V>> intersectWithScores(K key, Collection<K> otherKeys) {
 
@@ -678,10 +486,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersectWithScores(java.lang.Object, java.util.Collection, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Set<TypedTuple<V>> intersectWithScores(K key, Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 
@@ -690,19 +494,11 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersectAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(K key, K otherKey, K destKey) {
 		return intersectAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long intersectAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -712,10 +508,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zInterStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#intersectAndStore(java.lang.Object, java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Long intersectAndStore(K key, Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 
@@ -725,10 +517,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zInterStore(rawDestKey, aggregate, weights, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#union(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<V> union(K key, Collection<K> otherKeys) {
 
@@ -737,10 +525,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeValues(rawValues);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#unionWithScores(java.lang.Object, java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<V>> unionWithScores(K key, Collection<K> otherKeys) {
 
@@ -749,10 +533,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return deserializeTupleValues(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#unionWithScores(java.lang.Object, java.util.Collection, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Set<TypedTuple<V>> unionWithScores(K key, Collection<K> otherKeys, Aggregate aggregate, Weights weights) {
 
@@ -762,19 +542,11 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 				result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#unionAndStore(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(K key, K otherKey, K destKey) {
 		return unionAndStore(key, Collections.singleton(otherKey), destKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object)
-	 */
 	@Override
 	public Long unionAndStore(K key, Collection<K> otherKeys, K destKey) {
 
@@ -784,10 +556,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zUnionStore(rawDestKey, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#unionAndStore(java.lang.Object, java.util.Collection, java.lang.Object, org.springframework.data.redis.connection.RedisZSetCommands.Aggregate, org.springframework.data.redis.connection.RedisZSetCommands.Weights)
-	 */
 	@Override
 	public Long unionAndStore(K key, Collection<K> otherKeys, K destKey, Aggregate aggregate, Weights weights) {
 
@@ -797,10 +565,6 @@ class DefaultZSetOperations<K, V> extends AbstractOperations<K, V> implements ZS
 		return execute(connection -> connection.zUnionStore(rawDestKey, aggregate, weights, rawKeys));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ZSetOperations#scan(java.lang.Object, org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Cursor<TypedTuple<V>> scan(K key, ScanOptions options) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java b/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
index 0997e8452..49fa6519e 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
@@ -261,10 +261,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return Mono.fromSupplier(() -> preProcessConnection(factory.getReactiveConnection(), false));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#convertAndSend(java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public Mono<Long> convertAndSend(String destination, V message) {
 
@@ -276,10 +272,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 				getSerializationContext().getValueSerializationPair().write(message)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#listenTo(org.springframework.data.redis.listener.Topic[])
-	 */
 	@Override
 	public Flux<? extends Message<String, V>> listenTo(Topic... topics) {
 
@@ -291,10 +283,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 				.doFinally((signalType) -> container.destroyLater().subscribe());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#listenToLater(org.springframework.data.redis.listener.Topic[])
-	 */
 	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Mono<Flux<? extends Message<String, V>>> listenToLater(Topic... topics) {
@@ -310,10 +298,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 	// Methods dealing with Redis keys
 	// -------------------------------------------------------------------------
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#copy(java.lang.Object, java.lang.Object, boolean)
-	 */
 	@Override
 	public Mono<Boolean> copy(K sourceKey, K targetKey, boolean replace) {
 
@@ -323,10 +307,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().copy(rawKey(sourceKey), rawKey(targetKey), replace));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#hasKey(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> hasKey(K key) {
 
@@ -335,10 +315,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().exists(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#type(java.lang.Object)
-	 */
 	@Override
 	public Mono<DataType> type(K key) {
 
@@ -347,10 +323,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().type(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#keys(java.lang.Object)
-	 */
 	@Override
 	public Flux<K> keys(K pattern) {
 
@@ -361,10 +333,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 				.map(this::readKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#scan(org.springframework.data.redis.core.ScanOptions)
-	 */
 	@Override
 	public Flux<K> scan(ScanOptions options) {
 
@@ -374,19 +342,11 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 				.map(this::readKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#randomKey()
-	 */
 	@Override
 	public Mono<K> randomKey() {
 		return doCreateMono(connection -> connection.keyCommands().randomKey()).map(this::readKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#rename(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> rename(K oldKey, K newKey) {
 
@@ -396,10 +356,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().rename(rawKey(oldKey), rawKey(newKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#renameIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> renameIfAbsent(K oldKey, K newKey) {
 
@@ -409,10 +365,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().renameNX(rawKey(oldKey), rawKey(newKey)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#delete(java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> delete(K... keys) {
@@ -429,10 +381,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> listOfKeys.flatMap(rawKeys -> connection.keyCommands().mDel(rawKeys)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#delete(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Mono<Long> delete(Publisher<K> keys) {
 
@@ -444,10 +392,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 						.collect(Collectors.summingLong(value -> value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#unlink(java.lang.Object[])
-	 */
 	@Override
 	@SafeVarargs
 	public final Mono<Long> unlink(K... keys) {
@@ -464,10 +408,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> listOfKeys.flatMap(rawKeys -> connection.keyCommands().mUnlink(rawKeys)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#unlink(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Mono<Long> unlink(Publisher<K> keys) {
 
@@ -479,10 +419,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 						.collect(Collectors.summingLong(value -> value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#expire(java.lang.Object, java.time.Duration)
-	 */
 	@Override
 	public Mono<Boolean> expire(K key, Duration timeout) {
 
@@ -497,10 +433,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().pExpire(rawKey(key), timeout));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#expireAt(java.lang.Object, java.time.Instant)
-	 */
 	@Override
 	public Mono<Boolean> expireAt(K key, Instant expireAt) {
 
@@ -515,10 +447,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().pExpireAt(rawKey(key), expireAt));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#persist(java.lang.Object)
-	 */
 	@Override
 	public Mono<Boolean> persist(K key) {
 
@@ -527,10 +455,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return doCreateMono(connection -> connection.keyCommands().persist(rawKey(key)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#getExpire(java.lang.Object)
-	 */
 	@Override
 	public Mono<Duration> getExpire(K key) {
 
@@ -550,10 +474,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		}));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#move(java.lang.Object, int)
-	 */
 	@Override
 	public Mono<Boolean> move(K key, int dbIndex) {
 
@@ -575,10 +495,6 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return reactiveScriptExecutor.execute(script, keys, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#execute(org.springframework.data.redis.core.script.RedisScript, java.util.List, java.util.List, org.springframework.data.redis.serializer.RedisElementWriter, org.springframework.data.redis.serializer.RedisElementReader)
-	 */
 	@Override
 	public <T> Flux<T> execute(RedisScript<T> script, List<K> keys, List<?> args, RedisElementWriter<?> argsWriter,
 			RedisElementReader<T> resultReader) {
@@ -622,123 +538,71 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 				new CloseSuppressingInvocationHandler(reactiveRedisConnection));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForGeo()
-	 */
 	@Override
 	public ReactiveGeoOperations<K, V> opsForGeo() {
 		return geoOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForGeo(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveGeoOperations<K1, V1> opsForGeo(RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveGeoOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForHash()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <HK, HV> ReactiveHashOperations<K, HK, HV> opsForHash() {
 		return (ReactiveHashOperations<K, HK, HV>) hashOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForHash(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, HK, HV> ReactiveHashOperations<K1, HK, HV> opsForHash(
 			RedisSerializationContext<K1, ?> serializationContext) {
 		return new DefaultReactiveHashOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForHyperLogLog()
-	 */
 	@Override
 	public ReactiveHyperLogLogOperations<K, V> opsForHyperLogLog() {
 		return hllOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForHyperLogLog(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveHyperLogLogOperations<K1, V1> opsForHyperLogLog(
 			RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveHyperLogLogOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForList()
-	 */
 	@Override
 	public ReactiveListOperations<K, V> opsForList() {
 		return listOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForList(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveListOperations<K1, V1> opsForList(RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveListOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForSet()
-	 */
 	@Override
 	public ReactiveSetOperations<K, V> opsForSet() {
 		return setOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForSet(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveSetOperations<K1, V1> opsForSet(RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveSetOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForStream()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <HK, HV> ReactiveStreamOperations<K, HK, HV> opsForStream() {
 		return (ReactiveStreamOperations<K, HK, HV>) streamOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForStream(HashMapper)
-	 */
 	@Override
 	public <HK, HV> ReactiveStreamOperations<K, HK, HV> opsForStream(
 			HashMapper<? super K, ? super HK, ? super HV> hashMapper) {
 		return opsForStream(serializationContext, hashMapper);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForStream(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@SuppressWarnings("unchecked")
 	public <HK, HV> ReactiveStreamOperations<K, HK, HV> opsForStream(
 			RedisSerializationContext<K, ?> serializationContext) {
@@ -751,46 +615,26 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
 		return new DefaultReactiveStreamOperations<>(this, serializationContext, hashMapper);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForValue()
-	 */
 	@Override
 	public ReactiveValueOperations<K, V> opsForValue() {
 		return valueOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForValue(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveValueOperations<K1, V1> opsForValue(RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveValueOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForZSet()
-	 */
 	@Override
 	public ReactiveZSetOperations<K, V> opsForZSet() {
 		return zsetOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#opsForZSet(org.springframework.data.redis.serializer.RedisSerializationContext)
-	 */
 	@Override
 	public <K1, V1> ReactiveZSetOperations<K1, V1> opsForZSet(RedisSerializationContext<K1, V1> serializationContext) {
 		return new DefaultReactiveZSetOperations<>(this, serializationContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.ReactiveRedisOperations#serialization()
-	 */
 	@Override
 	public RedisSerializationContext<K, V> getSerializationContext() {
 		return serializationContext;
diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java b/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java
index 5c5cf68b6..1e3b8ed2f 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java
@@ -107,10 +107,6 @@ public class RedisKeyExpiredEvent<T> extends RedisKeyspaceEvent {
 		return value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.EventObject#toString()
-	 */
 	@Override
 	public String toString() {
 
diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java b/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java
index 0ceafd485..08e3ae75d 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java
@@ -203,10 +203,6 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 	 */
 	protected RedisKeyValueAdapter() {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#put(java.lang.Object, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object put(Object id, Object item, String keyspace) {
 
@@ -270,10 +266,6 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		return item;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#contains(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean contains(Object id, String keyspace) {
 
@@ -283,20 +275,12 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		return exists != null ? exists : false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#get(java.lang.Object, java.lang.String)
-	 */
 	@Nullable
 	@Override
 	public Object get(Object id, String keyspace) {
 		return get(id, keyspace, Object.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#get(java.lang.Object, java.lang.String, java.lang.Class)
-	 */
 	@Nullable
 	@Override
 	public <T> T get(Object id, String keyspace, Class<T> type) {
@@ -320,19 +304,11 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		return readBackTimeToLiveIfSet(binId, converter.read(type, data));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#delete(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object delete(Object id, String keyspace) {
 		return delete(id, keyspace, Object.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.AbstractKeyValueAdapter#delete(java.lang.Object, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <T> T delete(Object id, String keyspace, Class<T> type) {
 
@@ -367,19 +343,11 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		return o;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#getAllOf(java.lang.String)
-	 */
 	@Override
 	public List<?> getAllOf(String keyspace) {
 		return getAllOf(keyspace, Object.class, -1, -1);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#getAllOf(java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <T> Iterable<T> getAllOf(String keyspace, Class<T> type) {
 		return getAllOf(keyspace, type, -1, -1);
@@ -420,10 +388,6 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#deleteAllOf(java.lang.String)
-	 */
 	@Override
 	public void deleteAllOf(String keyspace) {
 
@@ -435,19 +399,11 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#entries(java.lang.String)
-	 */
 	@Override
 	public CloseableIterator<Entry<Object, Object>> entries(String keyspace) {
 		throw new UnsupportedOperationException("Not yet implemented");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#count(java.lang.String)
-	 */
 	@Override
 	public long count(String keyspace) {
 
@@ -736,10 +692,6 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	public void destroy() throws Exception {
 
 		if (this.expirationListener.get() != null) {
@@ -751,19 +703,11 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-	 */
 	@Override
 	public void onApplicationEvent(RedisKeyspaceEvent event) {
 		// just a customization hook
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.eventPublisher = applicationContext;
@@ -823,10 +767,6 @@ public class RedisKeyValueAdapter extends AbstractKeyValueAdapter
 			this.converter = converter;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.listener.KeyspaceEventMessageListener#onMessage(org.springframework.data.redis.connection.Message, byte[])
-		 */
 		@Override
 		public void onMessage(Message message, @Nullable byte[] pattern) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyValueTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisKeyValueTemplate.java
index b4417c7c8..0b9a904bd 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisKeyValueTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisKeyValueTemplate.java
@@ -63,10 +63,6 @@ public class RedisKeyValueTemplate extends KeyValueTemplate {
 		return adapter.getConverter();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueTemplate#getMappingContext()
-	 */
 	@Override
 	public RedisMappingContext getMappingContext() {
 		return (RedisMappingContext) super.getMappingContext();
@@ -125,10 +121,6 @@ public class RedisKeyValueTemplate extends KeyValueTemplate {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueTemplate#insert(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public <T> T insert(Object id, T objectToInsert) {
 
@@ -157,10 +149,6 @@ public class RedisKeyValueTemplate extends KeyValueTemplate {
 		return super.insert(id, objectToInsert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueTemplate#update(java.lang.Object)
-	 */
 	@Override
 	public <T> T update(T objectToUpdate) {
 
@@ -200,10 +188,6 @@ public class RedisKeyValueTemplate extends KeyValueTemplate {
 	 */
 	public static abstract class RedisKeyValueCallback<T> implements KeyValueCallback<T> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.keyvalue.core.KeyValueCallback#doInKeyValue(org.springframework.data.keyvalue.core.KeyValueAdapter)
-		 */
 		@Override
 		public T doInKeyValue(KeyValueAdapter adapter) {
 			return doInRedis((RedisKeyValueAdapter) adapter);
diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyspaceEvent.java b/src/main/java/org/springframework/data/redis/core/RedisKeyspaceEvent.java
index d1d6ff3c5..298a93a35 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisKeyspaceEvent.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisKeyspaceEvent.java
@@ -50,10 +50,6 @@ public class RedisKeyspaceEvent extends ApplicationEvent {
 		this.channel = channel;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.EventObject#getSource()
-	 */
 	public byte[] getSource() {
 		return (byte[]) super.getSource();
 	}
diff --git a/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java b/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java
index 77de56d92..ee52f8315 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java
@@ -70,10 +70,6 @@ class RedisQueryEngine extends QueryEngine<RedisKeyValueAdapter, RedisOperationC
 		super(criteriaAccessor, sortAccessor);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.QueryEngine#execute(java.lang.Object, java.lang.Object, int, int, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Collection<T> execute(RedisOperationChain criteria, Comparator<?> sort, long offset, int rows,
@@ -156,20 +152,12 @@ class RedisQueryEngine extends QueryEngine<RedisKeyValueAdapter, RedisOperationC
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.QueryEngine#execute(java.lang.Object, java.lang.Object, int, int, java.lang.String)
-	 */
 	@Override
 	public Collection<?> execute(RedisOperationChain criteria, Comparator<?> sort, long offset, int rows,
 			String keyspace) {
 		return execute(criteria, sort, offset, rows, keyspace, Object.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.QueryEngine#count(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public long count(RedisOperationChain criteria, String keyspace) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
index 9075f9693..af5bc2c6c 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
@@ -119,10 +119,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	 */
 	public RedisTemplate() {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisAccessor#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
@@ -167,10 +163,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		initialized = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#execute(org.springframework.data.redis.core.RedisCallback)
-	 */
 	@Override
 	@Nullable
 	public <T> T execute(RedisCallback<T> action) {
@@ -233,10 +225,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#execute(org.springframework.data.redis.core.SessionCallback)
-	 */
 	@Override
 	public <T> T execute(SessionCallback<T> session) {
 
@@ -253,19 +241,11 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#executePipelined(org.springframework.data.redis.core.SessionCallback)
-	 */
 	@Override
 	public List<Object> executePipelined(SessionCallback<?> session) {
 		return executePipelined(session, valueSerializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#executePipelined(org.springframework.data.redis.core.SessionCallback, org.springframework.data.redis.serializer.RedisSerializer)
-	 */
 	@Override
 	public List<Object> executePipelined(SessionCallback<?> session, @Nullable RedisSerializer<?> resultSerializer) {
 
@@ -299,19 +279,11 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#executePipelined(org.springframework.data.redis.core.RedisCallback)
-	 */
 	@Override
 	public List<Object> executePipelined(RedisCallback<?> action) {
 		return executePipelined(action, valueSerializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#executePipelined(org.springframework.data.redis.core.RedisCallback, org.springframework.data.redis.serializer.RedisSerializer)
-	 */
 	@Override
 	public List<Object> executePipelined(RedisCallback<?> action, @Nullable RedisSerializer<?> resultSerializer) {
 
@@ -335,29 +307,17 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#execute(org.springframework.data.redis.core.script.RedisScript, java.util.List, java.lang.Object[])
-	 */
 	@Override
 	public <T> T execute(RedisScript<T> script, List<K> keys, Object... args) {
 		return scriptExecutor.execute(script, keys, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#execute(org.springframework.data.redis.core.script.RedisScript, org.springframework.data.redis.serializer.RedisSerializer, org.springframework.data.redis.serializer.RedisSerializer, java.util.List, java.lang.Object[])
-	 */
 	@Override
 	public <T> T execute(RedisScript<T> script, RedisSerializer<?> argsSerializer, RedisSerializer<T> resultSerializer,
 			List<K> keys, Object... args) {
 		return scriptExecutor.execute(script, argsSerializer, resultSerializer, keys, args);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#executeWithStickyConnection(org.springframework.data.redis.core.RedisCallback)
-	 */
 	@Override
 	public <T extends Closeable> T executeWithStickyConnection(RedisCallback<T> callback) {
 
@@ -682,10 +642,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#exec(org.springframework.data.redis.serializer.RedisSerializer)
-	 */
 	@Override
 	public List<Object> exec(RedisSerializer<?> valueSerializer) {
 		return deserializeMixedResults(execRaw(), valueSerializer, valueSerializer, valueSerializer);
@@ -697,10 +653,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return raw == null ? Collections.emptyList() : raw;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#delete(java.lang.Object, java.lang.Object, boolean)
-	 */
 	@Override
 	public Boolean copy(K source, K target, boolean replace) {
 
@@ -710,10 +662,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.copy(sourceKey, targetKey, replace), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#delete(java.lang.Object)
-	 */
 	@Override
 	public Boolean delete(K key) {
 
@@ -723,10 +671,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return result != null && result.intValue() == 1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#delete(java.util.Collection)
-	 */
 	@Override
 	public Long delete(Collection<K> keys) {
 
@@ -739,10 +683,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.del(rawKeys), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#unlink(java.lang.Object)
-	 */
 	@Override
 	public Boolean unlink(K key) {
 
@@ -753,10 +693,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return result != null && result.intValue() == 1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#unlink(java.util.Collection)
-	 */
 	@Override
 	public Long unlink(Collection<K> keys) {
 
@@ -769,10 +705,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.unlink(rawKeys), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#hasKey(java.lang.Object)
-	 */
 	@Override
 	public Boolean hasKey(K key) {
 
@@ -781,10 +713,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.exists(rawKey), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#countExistingKeys(java.util.Collection)
-	 */
 	@Override
 	public Long countExistingKeys(Collection<K> keys) {
 
@@ -794,10 +722,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.exists(rawKeys), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#expire(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(K key, final long timeout, final TimeUnit unit) {
 
@@ -814,10 +738,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#expireAt(java.lang.Object, java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(K key, final Date date) {
 
@@ -832,10 +752,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#convertAndSend(java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public void convertAndSend(String channel, Object message) {
 
@@ -854,10 +770,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	// Value operations
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#getExpire(java.lang.Object)
-	 */
 	@Override
 	public Long getExpire(K key) {
 
@@ -865,10 +777,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.ttl(rawKey), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#getExpire(java.lang.Object, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Long getExpire(K key, final TimeUnit timeUnit) {
 
@@ -883,10 +791,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#keys(java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Set<K> keys(K pattern) {
@@ -897,10 +801,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return keySerializer != null ? SerializationUtils.deserialize(rawKeys, keySerializer) : (Set<K>) rawKeys;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#persist(java.lang.Object)
-	 */
 	@Override
 	public Boolean persist(K key) {
 
@@ -908,10 +808,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.persist(rawKey), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#move(java.lang.Object, int)
-	 */
 	@Override
 	public Boolean move(K key, final int dbIndex) {
 
@@ -919,10 +815,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.move(rawKey, dbIndex), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#randomKey()
-	 */
 	@Override
 	public K randomKey() {
 
@@ -930,10 +822,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return deserializeKey(rawKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#rename(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void rename(K oldKey, K newKey) {
 
@@ -946,10 +834,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#renameIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Boolean renameIfAbsent(K oldKey, K newKey) {
 
@@ -958,10 +842,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.renameNX(rawOldKey, rawNewKey), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#type(java.lang.Object)
-	 */
 	@Override
 	public DataType type(K key) {
 
@@ -1008,10 +888,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#multi()
-	 */
 	@Override
 	public void multi() {
 		execute(connection -> {
@@ -1020,10 +896,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#discard()
-	 */
 	@Override
 	public void discard() {
 
@@ -1033,10 +905,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#watch(java.lang.Object)
-	 */
 	@Override
 	public void watch(K key) {
 
@@ -1048,10 +916,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#watch(java.util.Collection)
-	 */
 	@Override
 	public void watch(Collection<K> keys) {
 
@@ -1063,10 +927,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#unwatch()
-	 */
 	@Override
 	public void unwatch() {
 
@@ -1078,20 +938,12 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 
 	// Sort operations
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#sort(org.springframework.data.redis.core.query.SortQuery)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public List<V> sort(SortQuery<K> query) {
 		return sort(query, valueSerializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#sort(org.springframework.data.redis.core.query.SortQuery, org.springframework.data.redis.serializer.RedisSerializer)
-	 */
 	@Override
 	public <T> List<T> sort(SortQuery<K> query, @Nullable RedisSerializer<T> resultSerializer) {
 
@@ -1103,20 +955,12 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return SerializationUtils.deserialize(vals, resultSerializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#sort(org.springframework.data.redis.core.query.SortQuery, org.springframework.data.redis.core.BulkMapper)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> List<T> sort(SortQuery<K> query, BulkMapper<T, V> bulkMapper) {
 		return sort(query, bulkMapper, valueSerializer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#sort(org.springframework.data.redis.core.query.SortQuery, org.springframework.data.redis.core.BulkMapper, org.springframework.data.redis.serializer.RedisSerializer)
-	 */
 	@Override
 	public <T, S> List<T> sort(SortQuery<K> query, BulkMapper<T, S> bulkMapper,
 			@Nullable RedisSerializer<S> resultSerializer) {
@@ -1144,10 +988,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#sort(org.springframework.data.redis.core.query.SortQuery, java.lang.Object)
-	 */
 	@Override
 	public Long sort(SortQuery<K> query, K storeKey) {
 
@@ -1158,10 +998,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		return execute(connection -> connection.sort(rawKey, params, rawStoreKey), true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#killClient(java.lang.Object)
-	 */
 	@Override
 	public void killClient(final String host, final int port) {
 
@@ -1171,10 +1007,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#getClientList()
-	 */
 	@Override
 	public List<RedisClientInfo> getClientList() {
 		return execute(RedisServerCommands::getClientList);
@@ -1193,10 +1025,6 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#slaveOfNoOne()
-	 */
 	@Override
 	public void slaveOfNoOne() {
 
@@ -1206,155 +1034,87 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForCluster()
-	 */
 	@Override
 	public ClusterOperations<K, V> opsForCluster() {
 		return clusterOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForGeo()
-	 */
 	@Override
 	public GeoOperations<K, V> opsForGeo() {
 		return geoOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundGeoOps(java.lang.Object)
-	 */
 	@Override
 	public BoundGeoOperations<K, V> boundGeoOps(K key) {
 		return new DefaultBoundGeoOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundHashOps(java.lang.Object)
-	 */
 	@Override
 	public <HK, HV> BoundHashOperations<K, HK, HV> boundHashOps(K key) {
 		return new DefaultBoundHashOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForHash()
-	 */
 	@Override
 	public <HK, HV> HashOperations<K, HK, HV> opsForHash() {
 		return new DefaultHashOperations<>(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForHyperLogLog()
-	 */
 	@Override
 	public HyperLogLogOperations<K, V> opsForHyperLogLog() {
 		return hllOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForList()
-	 */
 	@Override
 	public ListOperations<K, V> opsForList() {
 		return listOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundListOps(java.lang.Object)
-	 */
 	@Override
 	public BoundListOperations<K, V> boundListOps(K key) {
 		return new DefaultBoundListOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundSetOps(java.lang.Object)
-	 */
 	@Override
 	public BoundSetOperations<K, V> boundSetOps(K key) {
 		return new DefaultBoundSetOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForSet()
-	 */
 	@Override
 	public SetOperations<K, V> opsForSet() {
 		return setOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForStream()
-	 */
 	@Override
 	public <HK, HV> StreamOperations<K, HK, HV> opsForStream() {
 		return (StreamOperations<K, HK, HV>) streamOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForStream()
-	 */
 	@Override
 	public <HK, HV> StreamOperations<K, HK, HV> opsForStream(HashMapper<? super K, ? super HK, ? super HV> hashMapper) {
 
 		return new DefaultStreamOperations<>(this, hashMapper);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundStreamOps(java.lang.Object)
-	 */
 	@Override
 	public <HK, HV> BoundStreamOperations<K, HK, HV> boundStreamOps(K key) {
 		return new DefaultBoundStreamOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundValueOps(java.lang.Object)
-	 */
 	@Override
 	public BoundValueOperations<K, V> boundValueOps(K key) {
 		return new DefaultBoundValueOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForValue()
-	 */
 	@Override
 	public ValueOperations<K, V> opsForValue() {
 		return valueOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#boundZSetOps(java.lang.Object)
-	 */
 	@Override
 	public BoundZSetOperations<K, V> boundZSetOps(K key) {
 		return new DefaultBoundZSetOperations<>(key, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.RedisOperations#opsForZSet()
-	 */
 	@Override
 	public ZSetOperations<K, V> opsForZSet() {
 		return zSetOps;
diff --git a/src/main/java/org/springframework/data/redis/core/ScanCursor.java b/src/main/java/org/springframework/data/redis/core/ScanCursor.java
index 414945c4c..cae6d782b 100644
--- a/src/main/java/org/springframework/data/redis/core/ScanCursor.java
+++ b/src/main/java/org/springframework/data/redis/core/ScanCursor.java
@@ -153,19 +153,11 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 		delegate = Collections.emptyIterator();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#getCursorId()
-	 */
 	@Override
 	public long getCursorId() {
 		return cursorId;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#hasNext()
-	 */
 	@Override
 	public boolean hasNext() {
 
@@ -189,10 +181,6 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#next()
-	 */
 	@Override
 	public T next() {
 
@@ -218,19 +206,11 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 		return source.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#remove()
-	 */
 	@Override
 	public void remove() {
 		throw new UnsupportedOperationException("Remove is not supported");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	public final void close() {
 
@@ -246,10 +226,6 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 	 */
 	protected void doClose() {}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#isClosed()
-	 */
 	@Override
 	public boolean isClosed() {
 		return state == CursorState.CLOSED;
@@ -263,10 +239,6 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 		return state == CursorState.OPEN;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.Cursor#getPosition()
-	 */
 	@Override
 	public long getPosition() {
 		return position;
diff --git a/src/main/java/org/springframework/data/redis/core/ScanIteration.java b/src/main/java/org/springframework/data/redis/core/ScanIteration.java
index 431cb63f6..b1f9ccc4a 100644
--- a/src/main/java/org/springframework/data/redis/core/ScanIteration.java
+++ b/src/main/java/org/springframework/data/redis/core/ScanIteration.java
@@ -63,10 +63,6 @@ public class ScanIteration<T> implements Iterable<T> {
 		return items;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<T> iterator() {
 		return items.iterator();
diff --git a/src/main/java/org/springframework/data/redis/core/convert/Bucket.java b/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
index d2f0de56a..6650de658 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
@@ -270,10 +270,6 @@ public class Bucket {
 		return bucket;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "Bucket [data=" + safeToString() + "]";
diff --git a/src/main/java/org/springframework/data/redis/core/convert/CompositeIndexResolver.java b/src/main/java/org/springframework/data/redis/core/convert/CompositeIndexResolver.java
index 803817344..2991bd302 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/CompositeIndexResolver.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/CompositeIndexResolver.java
@@ -55,10 +55,6 @@ public class CompositeIndexResolver implements IndexResolver {
 		this.resolvers = new ArrayList<>(resolvers);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	@Override
 	public Set<IndexedData> resolveIndexesFor(TypeInformation<?> typeInformation, @Nullable Object value) {
 
@@ -73,9 +69,6 @@ public class CompositeIndexResolver implements IndexResolver {
 		return data;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(java.lang.String, java.lang.String, org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	@Override
 	public Set<IndexedData> resolveIndexesFor(String keyspace, String path, TypeInformation<?> typeInformation,
 			@Nullable Object value) {
diff --git a/src/main/java/org/springframework/data/redis/core/convert/DefaultRedisTypeMapper.java b/src/main/java/org/springframework/data/redis/core/convert/DefaultRedisTypeMapper.java
index a654de897..b0847f2d5 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/DefaultRedisTypeMapper.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/DefaultRedisTypeMapper.java
@@ -106,10 +106,6 @@ public class DefaultRedisTypeMapper extends DefaultTypeMapper<BucketPropertyPath
 		return conversionService;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.RedisTypeMapper#isTypeKey(java.lang.String)
-	 */
 	public boolean isTypeKey(@Nullable String key) {
 		return key != null && typeKey != null && key.endsWith(typeKey);
 	}
@@ -133,10 +129,6 @@ public class DefaultRedisTypeMapper extends DefaultTypeMapper<BucketPropertyPath
 			this.conversionService = conversionService;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object)
-		 */
 		public Alias readAliasFrom(BucketPropertyPath source) {
 
 			if (typeKey == null || source instanceof List) {
@@ -152,10 +144,6 @@ public class DefaultRedisTypeMapper extends DefaultTypeMapper<BucketPropertyPath
 			return Alias.NONE;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.TypeAliasAccessor#writeTypeTo(java.lang.Object, java.lang.Object)
-		 */
 		public void writeTypeTo(BucketPropertyPath sink, Object alias) {
 
 			if (typeKey != null) {
diff --git a/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java b/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java
index f777fa00e..e0e5d20bc 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java
@@ -37,19 +37,11 @@ public class GeoIndexedPropertyValue implements IndexedData {
 		this.value = value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getIndexName()
-	 */
 	@Override
 	public String getIndexName() {
 		return GeoIndexedPropertyValue.geoIndexName(indexName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getKeyspace()
-	 */
 	@Override
 	public String getKeyspace() {
 		return keyspace;
diff --git a/src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java b/src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java
index 9408d22e3..19834fffd 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java
@@ -172,10 +172,6 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 		this.referenceResolver = referenceResolver;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityReader#read(java.lang.Class, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <R> R read(Class<R> type, RedisData source) {
@@ -385,10 +381,6 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityWriter#write(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings({ "rawtypes" })
 	public void write(Object source, RedisData sink) {
@@ -1047,29 +1039,17 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 		this.customConversions = customConversions != null ? customConversions : new RedisCustomConversions();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityConverter#getMappingContext()
-	 */
 	@Override
 	public RedisMappingContext getMappingContext() {
 		return this.mappingContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.RedisConverter#getIndexResolver()
-	 */
 	@Nullable
 	@Override
 	public IndexResolver getIndexResolver() {
 		return this.indexResolver;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityConverter#getConversionService()
-	 */
 	@Override
 	public ConversionService getConversionService() {
 		return this.conversionService;
@@ -1127,10 +1107,6 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
 		public int compare(String s1, String s2) {
 
 			int s1offset = 0;
@@ -1193,10 +1169,6 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 				return rawValue.length();
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see java.lang.Comparable#compareTo(java.lang.Object)
-			 */
 			@Override
 			public int compareTo(Part that) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/convert/PathIndexResolver.java b/src/main/java/org/springframework/data/redis/core/convert/PathIndexResolver.java
index fd3960013..e763f7eb8 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/PathIndexResolver.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/PathIndexResolver.java
@@ -83,18 +83,11 @@ public class PathIndexResolver implements IndexResolver {
 		this.indexedDataFactoryProvider = new IndexedDataFactoryProvider();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	public Set<IndexedData> resolveIndexesFor(TypeInformation<?> typeInformation, @Nullable Object value) {
 		return doResolveIndexesFor(mappingContext.getRequiredPersistentEntity(typeInformation).getKeySpace(), "",
 				typeInformation, null, value);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(java.lang.String, java.lang.String, org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	@Override
 	public Set<IndexedData> resolveIndexesFor(String keyspace, String path, TypeInformation<?> typeInformation,
 			Object value) {
diff --git a/src/main/java/org/springframework/data/redis/core/convert/RedisConverter.java b/src/main/java/org/springframework/data/redis/core/convert/RedisConverter.java
index 8a1387ea9..bb9343065 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/RedisConverter.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/RedisConverter.java
@@ -31,10 +31,6 @@ import org.springframework.lang.Nullable;
 public interface RedisConverter
 		extends EntityConverter<RedisPersistentEntity<?>, RedisPersistentProperty, Object, RedisData> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityConverter#getMappingContext()
-	 */
 	@Override
 	RedisMappingContext getMappingContext();
 
diff --git a/src/main/java/org/springframework/data/redis/core/convert/RedisData.java b/src/main/java/org/springframework/data/redis/core/convert/RedisData.java
index ead5cd182..b6d07e04e 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/RedisData.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/RedisData.java
@@ -168,10 +168,6 @@ public class RedisData {
 		setTimeToLive(TimeUnit.SECONDS.convert(timeToLive, timeUnit));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "RedisDataObject [key=" + keyspace + ":" + id + ", hash=" + bucket + "]";
diff --git a/src/main/java/org/springframework/data/redis/core/convert/ReferenceResolverImpl.java b/src/main/java/org/springframework/data/redis/core/convert/ReferenceResolverImpl.java
index 1f77d2e45..d922c877a 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/ReferenceResolverImpl.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/ReferenceResolverImpl.java
@@ -47,10 +47,6 @@ public class ReferenceResolverImpl implements ReferenceResolver {
 		this.converter = new StringToBytesConverter();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.ReferenceResolver#resolveReference(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	@Nullable
 	public Map<byte[], byte[]> resolveReference(Object id, String keyspace) {
diff --git a/src/main/java/org/springframework/data/redis/core/convert/RemoveIndexedData.java b/src/main/java/org/springframework/data/redis/core/convert/RemoveIndexedData.java
index c5d8d86d8..96af9bf59 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/RemoveIndexedData.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/RemoveIndexedData.java
@@ -30,19 +30,11 @@ public class RemoveIndexedData implements IndexedData {
 		this.delegate = delegate;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getIndexName()
-	 */
 	@Override
 	public String getIndexName() {
 		return delegate.getIndexName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getKeyspace()
-	 */
 	@Override
 	public String getKeyspace() {
 		return delegate.getKeyspace();
diff --git a/src/main/java/org/springframework/data/redis/core/convert/SimpleIndexedPropertyValue.java b/src/main/java/org/springframework/data/redis/core/convert/SimpleIndexedPropertyValue.java
index 5ce34a489..68026a44a 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/SimpleIndexedPropertyValue.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/SimpleIndexedPropertyValue.java
@@ -53,19 +53,11 @@ public class SimpleIndexedPropertyValue implements IndexedData {
 		return value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getIndexName()
-	 */
 	@Override
 	public String getIndexName() {
 		return indexName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexedData#getKeySpace()
-	 */
 	@Override
 	public String getKeyspace() {
 		return this.keyspace;
diff --git a/src/main/java/org/springframework/data/redis/core/convert/SpelIndexResolver.java b/src/main/java/org/springframework/data/redis/core/convert/SpelIndexResolver.java
index bcab62370..daf86ff64 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/SpelIndexResolver.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/SpelIndexResolver.java
@@ -77,9 +77,6 @@ public class SpelIndexResolver implements IndexResolver {
 		this.parser = parser;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	public Set<IndexedData> resolveIndexesFor(TypeInformation<?> typeInformation, @Nullable Object value) {
 
 		if (value == null) {
@@ -120,9 +117,6 @@ public class SpelIndexResolver implements IndexResolver {
 		return indexes;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(java.lang.String, java.lang.String, org.springframework.data.util.TypeInformation, java.lang.Object)
-	 */
 	@Override
 	public Set<IndexedData> resolveIndexesFor(String keyspace, String path, TypeInformation<?> typeInformation,
 			Object value) {
diff --git a/src/main/java/org/springframework/data/redis/core/index/IndexConfiguration.java b/src/main/java/org/springframework/data/redis/core/index/IndexConfiguration.java
index f65138fd5..b6e64a6ff 100644
--- a/src/main/java/org/springframework/data/redis/core/index/IndexConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/core/index/IndexConfiguration.java
@@ -48,35 +48,19 @@ public class IndexConfiguration implements ConfigurableIndexDefinitionProvider {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinitionProvider#hasIndexFor(java.io.Serializable)
-	 */
 	@Override
 	public boolean hasIndexFor(Serializable keyspace) {
 		return !getIndexDefinitionsFor(keyspace).isEmpty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinitionProvider#hasIndexFor(java.io.Serializable, java.lang.String)
-	 */
 	public boolean hasIndexFor(Serializable keyspace, String path) {
 		return !getIndexDefinitionsFor(keyspace, path).isEmpty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinitionProvider#getIndexDefinitionsFor(java.io.Serializable, java.lang.String)
-	 */
 	public Set<IndexDefinition> getIndexDefinitionsFor(Serializable keyspace, String path) {
 		return getIndexDefinitions(keyspace, path, Object.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinitionProvider#getIndexDefinitionsFor(java.io.Serializable)
-	 */
 	public Set<IndexDefinition> getIndexDefinitionsFor(Serializable keyspace) {
 
 		Set<IndexDefinition> indexDefinitions = new LinkedHashSet<>();
@@ -90,10 +74,6 @@ public class IndexConfiguration implements ConfigurableIndexDefinitionProvider {
 		return indexDefinitions;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinitionRegistry#addIndexDefinition(org.springframework.data.redis.core.index.IndexDefinition)
-	 */
 	public void addIndexDefinition(IndexDefinition indexDefinition) {
 
 		Assert.notNull(indexDefinition, "RedisIndexDefinition must not be null in order to be added.");
diff --git a/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java b/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java
index 8c34bc8db..a8bd65f86 100644
--- a/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java
+++ b/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java
@@ -55,37 +55,21 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 		this.conditions = new ArrayList<>();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinition#getKeyspace()
-	 */
 	@Override
 	public String getKeyspace() {
 		return keyspace;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinition#getConditions()
-	 */
 	@Override
 	public Collection<Condition<?>> getConditions() {
 		return Collections.unmodifiableCollection(conditions);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinition#valueTransformer()
-	 */
 	@Override
 	public IndexValueTransformer valueTransformer() {
 		return valueTransformer != null ? valueTransformer : NoOpValueTransformer.INSTANCE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.index.IndexDefinition#getIndexName()
-	 */
 	@Override
 	public String getIndexName() {
 		return indexName;
@@ -106,20 +90,12 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 		this.valueTransformer = valueTransformer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(indexName);
 		return result + ObjectUtils.nullSafeHashCode(keyspace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 
@@ -148,10 +124,6 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 	public static enum NoOpValueTransformer implements IndexValueTransformer {
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Object convert(Object source) {
 			return source;
@@ -165,10 +137,6 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 	public static enum LowercaseIndexValueTransformer implements IndexValueTransformer {
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Object convert(Object source) {
 
@@ -192,10 +160,6 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 			this.transformers.addAll(transformers);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Object convert(Object source) {
 
@@ -221,10 +185,6 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 			this.conditions.addAll(conditions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.index.IndexDefinition.Condition#matches(java.lang.Object, org.springframework.data.redis.core.index.IndexDefinition.IndexingContext)
-		 */
 		@Override
 		public boolean matches(T value, IndexingContext context) {
 
@@ -249,10 +209,6 @@ public abstract class RedisIndexDefinition implements IndexDefinition {
 			this.path = path;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.index.IndexDefinition.Condition#matches(java.lang.Object, org.springframework.data.redis.core.index.IndexDefinition.IndexingContext)
-		 */
 		@Override
 		public boolean matches(Object value, IndexingContext context) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java b/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
index ef432c973..2af47927e 100644
--- a/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
+++ b/src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java
@@ -52,38 +52,22 @@ public class BasicRedisPersistentEntity<T> extends BasicKeyValuePersistentEntity
 		this.timeToLiveAccessor = timeToLiveAccessor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.mapping.RedisPersistentEntity#getTimeToLiveAccessor()
-	 */
 	@Override
 	public TimeToLiveAccessor getTimeToLiveAccessor() {
 		return this.timeToLiveAccessor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.mapping.RedisPersistentEntity#hasExplictTimeToLiveProperty()
-	 */
 	@Override
 	public boolean hasExplictTimeToLiveProperty() {
 		return getExplicitTimeToLiveProperty() != null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.mapping.RedisPersistentEntity#getExplicitTimeToLiveProperty()
-	 */
 	@Override
 	@Nullable
 	public RedisPersistentProperty getExplicitTimeToLiveProperty() {
 		return this.getPersistentProperty(TimeToLive.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#returnPropertyIfBetterIdPropertyCandidateOrNull(org.springframework.data.mapping.PersistentProperty)
-	 */
 	@Override
 	@Nullable
 	protected RedisPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNull(RedisPersistentProperty property) {
diff --git a/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java b/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
index 6a19fd8be..96ce388c3 100644
--- a/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
+++ b/src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java
@@ -132,10 +132,6 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 			this.keyspaceConfig = keyspaceConfig;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.keyvalue.core.mapping.KeySpaceResolver#resolveKeySpace(java.lang.Class)
-		 */
 		@Override
 		public String resolveKeySpace(Class<?> type) {
 
@@ -162,10 +158,6 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.keyvalue.core.KeySpaceResolver#resolveKeySpace(java.lang.Class)
-		 */
 		@Override
 		public String resolveKeySpace(Class<?> type) {
 
@@ -279,10 +271,6 @@ public class RedisMappingContext extends KeyValueMappingContext<RedisPersistentE
 			return defaultTimeout;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.TimeToLiveResolver#isExpiringEntity(java.lang.Class)
-		 */
 		@Override
 		public boolean isExpiringEntity(Class<?> type) {
 
diff --git a/src/main/java/org/springframework/data/redis/core/mapping/RedisPersistentProperty.java b/src/main/java/org/springframework/data/redis/core/mapping/RedisPersistentProperty.java
index b3c691c18..7d6549e5a 100644
--- a/src/main/java/org/springframework/data/redis/core/mapping/RedisPersistentProperty.java
+++ b/src/main/java/org/springframework/data/redis/core/mapping/RedisPersistentProperty.java
@@ -50,10 +50,6 @@ public class RedisPersistentProperty extends KeyValuePersistentProperty<RedisPer
 		super(property, owner, simpleTypeHolder);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isIdProperty()
-	 */
 	@Override
 	public boolean isIdProperty() {
 
diff --git a/src/main/java/org/springframework/data/redis/core/script/DefaultReactiveScriptExecutor.java b/src/main/java/org/springframework/data/redis/core/script/DefaultReactiveScriptExecutor.java
index 1fcfa40b9..9486bd11b 100644
--- a/src/main/java/org/springframework/data/redis/core/script/DefaultReactiveScriptExecutor.java
+++ b/src/main/java/org/springframework/data/redis/core/script/DefaultReactiveScriptExecutor.java
@@ -64,10 +64,6 @@ public class DefaultReactiveScriptExecutor<K> implements ReactiveScriptExecutor<
 		this.serializationContext = serializationContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.script.ReactiveScriptExecutor#execute(org.springframework.data.redis.core.script.RedisScript, java.util.List, java.util.List)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> execute(RedisScript<T> script, List<K> keys, List<?> args) {
@@ -82,10 +78,6 @@ public class DefaultReactiveScriptExecutor<K> implements ReactiveScriptExecutor<
 				(RedisElementReader<T>) serializationPair.getReader());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.script.ReactiveScriptExecutor#execute(org.springframework.data.redis.core.script.RedisScript, java.util.List, java.util.List, org.springframework.data.redis.serializer.RedisElementWriter, org.springframework.data.redis.serializer.RedisElementReader)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> execute(RedisScript<T> script, List<K> keys, List<?> args, RedisElementWriter<?> argsWriter,
diff --git a/src/main/java/org/springframework/data/redis/core/script/DefaultRedisScript.java b/src/main/java/org/springframework/data/redis/core/script/DefaultRedisScript.java
index bf1b9538e..753d6883c 100644
--- a/src/main/java/org/springframework/data/redis/core/script/DefaultRedisScript.java
+++ b/src/main/java/org/springframework/data/redis/core/script/DefaultRedisScript.java
@@ -70,18 +70,10 @@ public class DefaultRedisScript<T> implements RedisScript<T>, InitializingBean {
 		this.resultType = resultType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	public void afterPropertiesSet() {
 		Assert.state(this.scriptSource != null, "Either script, script location," + " or script source is required");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.script.RedisScript#getSha1()
-	 */
 	public String getSha1() {
 
 		synchronized (shaModifiedMonitor) {
@@ -92,19 +84,11 @@ public class DefaultRedisScript<T> implements RedisScript<T>, InitializingBean {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.script.RedisScript#getResultType()
-	 */
 	@Nullable
 	public Class<T> getResultType() {
 		return this.resultType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.script.RedisScript#getScriptAsString()
-	 */
 	public String getScriptAsString() {
 
 		try {
diff --git a/src/main/java/org/springframework/data/redis/core/types/RedisClientInfo.java b/src/main/java/org/springframework/data/redis/core/types/RedisClientInfo.java
index 0b905c184..14b317ec2 100644
--- a/src/main/java/org/springframework/data/redis/core/types/RedisClientInfo.java
+++ b/src/main/java/org/springframework/data/redis/core/types/RedisClientInfo.java
@@ -242,10 +242,6 @@ public class RedisClientInfo {
 		return value == null ? null : Long.valueOf(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return this.clientProperties.toString();
diff --git a/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java b/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java
index 9c8690f32..5b910e5d4 100644
--- a/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java
+++ b/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java
@@ -81,10 +81,6 @@ public class BoundingBox implements Shape {
 		return height;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = ObjectUtils.nullSafeHashCode(width);
@@ -107,10 +103,6 @@ public class BoundingBox implements Shape {
 		return ObjectUtils.nullSafeEquals(height, that.height);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("Bounding box: [width=%s, height=%s]", width, height);
diff --git a/src/main/java/org/springframework/data/redis/domain/geo/Metrics.java b/src/main/java/org/springframework/data/redis/domain/geo/Metrics.java
index 1fe9cc90e..93616cd3d 100644
--- a/src/main/java/org/springframework/data/redis/domain/geo/Metrics.java
+++ b/src/main/java/org/springframework/data/redis/domain/geo/Metrics.java
@@ -42,18 +42,10 @@ public enum Metrics implements Metric {
 		this.abbreviation = abbreviation;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.geo.Metric#getMultiplier()
-	 */
 	public double getMultiplier() {
 		return multiplier;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.geo.Metric#getAbbreviation()
-	 */
 	@Override
 	public String getAbbreviation() {
 		return abbreviation;
diff --git a/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java b/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java
index 17c936240..ee3ffd3ba 100644
--- a/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java
+++ b/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java
@@ -41,10 +41,6 @@ public class BeanUtilsHashMapper<T> implements HashMapper<T, String, String> {
 		this.type = type;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#fromHash(java.util.Map)
-	 */
 	@Override
 	public T fromHash(Map<String, String> hash) {
 
@@ -59,10 +55,6 @@ public class BeanUtilsHashMapper<T> implements HashMapper<T, String, String> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#toHash(java.lang.Object)
-	 */
 	@Override
 	public Map<String, String> toHash(T object) {
 
diff --git a/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java b/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java
index 3468c121e..be11208da 100644
--- a/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java
+++ b/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java
@@ -32,20 +32,12 @@ public class DecoratingStringHashMapper<T> implements HashMapper<T, String, Stri
 		this.delegate = mapper;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#fromHash(java.util.Map)
-	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public T fromHash(Map hash) {
 		return (T) delegate.fromHash(hash);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#toHash(java.lang.Object)
-	 */
 	@Override
 	public Map<String, String> toHash(T object) {
 
diff --git a/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java b/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java
index 44a5382c4..95e97c785 100644
--- a/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java
+++ b/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java
@@ -214,10 +214,6 @@ public class Jackson2HashMapper implements HashMapper<Object, String, Object> {
 		this.untypedMapper.setSerializationInclusion(Include.NON_NULL);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#toHash(java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> toHash(Object source) {
@@ -226,10 +222,6 @@ public class Jackson2HashMapper implements HashMapper<Object, String, Object> {
 		return flatten ? flattenMap(tree.fields()) : untypedMapper.convertValue(tree, Map.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#fromHash(java.util.Map)
-	 */
 	@Override
 	public Object fromHash(Map<String, Object> hash) {
 
diff --git a/src/main/java/org/springframework/data/redis/hash/ObjectHashMapper.java b/src/main/java/org/springframework/data/redis/hash/ObjectHashMapper.java
index 72a281230..6fbff23ef 100644
--- a/src/main/java/org/springframework/data/redis/hash/ObjectHashMapper.java
+++ b/src/main/java/org/springframework/data/redis/hash/ObjectHashMapper.java
@@ -147,10 +147,6 @@ public class ObjectHashMapper implements HashMapper<Object, byte[], byte[]> {
 		return cs;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#toHash(java.lang.Object)
-	 */
 	@Override
 	public Map<byte[], byte[]> toHash(Object source) {
 
@@ -163,10 +159,6 @@ public class ObjectHashMapper implements HashMapper<Object, byte[], byte[]> {
 		return sink.getBucket().rawMap();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.hash.HashMapper#fromHash(java.util.Map)
-	 */
 	@Override
 	public Object fromHash(Map<byte[], byte[]> hash) {
 
@@ -198,10 +190,6 @@ public class ObjectHashMapper implements HashMapper<Object, byte[], byte[]> {
 
 		private static final Map<byte[], byte[]> NO_REFERENCE = Collections.emptyMap();
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.convert.ReferenceResolver#resolveReference(java.lang.Object, java.lang.String)
-		 */
 		@Override
 		public Map<byte[], byte[]> resolveReference(Object id, String keyspace) {
 			return NO_REFERENCE;
@@ -217,19 +205,11 @@ public class ObjectHashMapper implements HashMapper<Object, byte[], byte[]> {
 
 		private static final Set<IndexedData> NO_INDEXES = Collections.emptySet();
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(org.springframework.data.util.TypeInformation, java.lang.Object)
-		 */
 		@Override
 		public Set<IndexedData> resolveIndexesFor(TypeInformation<?> typeInformation, Object value) {
 			return NO_INDEXES;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.core.convert.IndexResolver#resolveIndexesFor(java.lang.String, java.lang.String, org.springframework.data.util.TypeInformation, java.lang.Object)
-		 */
 		@Override
 		public Set<IndexedData> resolveIndexesFor(String keyspace, String path, TypeInformation<?> typeInformation,
 				Object value) {
diff --git a/src/main/java/org/springframework/data/redis/listener/ChannelTopic.java b/src/main/java/org/springframework/data/redis/listener/ChannelTopic.java
index 37b83776f..44688c398 100644
--- a/src/main/java/org/springframework/data/redis/listener/ChannelTopic.java
+++ b/src/main/java/org/springframework/data/redis/listener/ChannelTopic.java
@@ -59,10 +59,6 @@ public class ChannelTopic implements Topic {
 		return channelName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return channelName;
diff --git a/src/main/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListener.java b/src/main/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListener.java
index 290a81d70..9759af3f6 100644
--- a/src/main/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListener.java
+++ b/src/main/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListener.java
@@ -45,19 +45,11 @@ public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListe
 		super(listenerContainer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.listener.KeyspaceEventMessageListener#doRegister(org.springframework.data.redis.listener.RedisMessageListenerContainer)
-	 */
 	@Override
 	protected void doRegister(RedisMessageListenerContainer listenerContainer) {
 		listenerContainer.addMessageListener(this, KEYEVENT_EXPIRED_TOPIC);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.listener.KeyspaceEventMessageListener#doHandleMessage(org.springframework.data.redis.connection.Message)
-	 */
 	@Override
 	protected void doHandleMessage(Message message) {
 		publishEvent(new RedisKeyExpiredEvent(message.getBody()));
@@ -75,10 +67,6 @@ public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListe
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
-	 */
 	@Override
 	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
 		this.publisher = applicationEventPublisher;
diff --git a/src/main/java/org/springframework/data/redis/listener/KeyspaceEventMessageListener.java b/src/main/java/org/springframework/data/redis/listener/KeyspaceEventMessageListener.java
index 01e3b8e1d..f604517d7 100644
--- a/src/main/java/org/springframework/data/redis/listener/KeyspaceEventMessageListener.java
+++ b/src/main/java/org/springframework/data/redis/listener/KeyspaceEventMessageListener.java
@@ -53,10 +53,6 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
 		this.listenerContainer = listenerContainer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.MessageListener#onMessage(org.springframework.data.redis.connection.Message, byte[])
-	 */
 	@Override
 	public void onMessage(Message message, @Nullable byte[] pattern) {
 
@@ -109,10 +105,6 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
 		listenerContainer.addMessageListener(this, TOPIC_ALL_KEYEVENTS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() throws Exception {
 		listenerContainer.removeMessageListener(this);
@@ -128,10 +120,6 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
 		this.keyspaceNotificationsConfigParameter = keyspaceNotificationsConfigParameter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		init();
diff --git a/src/main/java/org/springframework/data/redis/listener/PatternTopic.java b/src/main/java/org/springframework/data/redis/listener/PatternTopic.java
index baa93da0b..ded2b54fe 100644
--- a/src/main/java/org/springframework/data/redis/listener/PatternTopic.java
+++ b/src/main/java/org/springframework/data/redis/listener/PatternTopic.java
@@ -60,10 +60,6 @@ public class PatternTopic implements Topic {
 		return channelPattern;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return channelPattern;
diff --git a/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java
index 2424a4f3b..6c505be1f 100644
--- a/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java
+++ b/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java
@@ -88,10 +88,6 @@ public class ReactiveRedisMessageListenerContainer implements DisposableBean {
 		this.connection = connectionFactory.getReactiveConnection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() {
 		destroyLater().block();
diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
index efe07a814..df4e18937 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java
@@ -113,10 +113,6 @@ public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 		return builder.toString();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getTypes()
-	 */
 	public Set<Type> getTypes() {
 
 		Set<Type> types = new HashSet<>();
@@ -150,10 +146,6 @@ public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 		create(beanManager.createCreationalContext(this));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext)
-	 */
 	public void destroy(T instance, CreationalContext<T> creationalContext) {
 
 		if (log.isDebugEnabled()) {
@@ -164,28 +156,16 @@ public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 		creationalContext.release();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getQualifiers()
-	 */
 	public Set<Annotation> getQualifiers() {
 		return qualifiers;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getName()
-	 */
 	public String getName() {
 
 		return getQualifiers().contains(Default.class) ? beanClass.getName()
 				: beanClass.getName() + "-" + getQualifiers().toString();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getStereotypes()
-	 */
 	public Set<Class<? extends Annotation>> getStereotypes() {
 
 		Set<Class<? extends Annotation>> stereotypes = new HashSet<>();
@@ -200,58 +180,30 @@ public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
 		return stereotypes;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getBeanClass()
-	 */
 	public Class<?> getBeanClass() {
 		return beanClass;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#isAlternative()
-	 */
 	public boolean isAlternative() {
 		return beanClass.isAnnotationPresent(Alternative.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#isNullable()
-	 */
 	public boolean isNullable() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints()
-	 */
 	public Set<InjectionPoint> getInjectionPoints() {
 		return Collections.emptySet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.Bean#getScope()
-	 */
 	public Class<? extends Annotation> getScope() {
 		return ApplicationScoped.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see jakarta.enterprise.inject.spi.PassivationCapable#getId()
-	 */
 	public String getId() {
 		return passivationId;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("CdiBean: type='%s', qualifiers=%s", beanClass.getName(), qualifiers.toString());
diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java
index e74c24d59..14cc42daf 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java
@@ -55,10 +55,6 @@ public class RedisKeyValueAdapterBean extends CdiBean<RedisKeyValueAdapter> {
 		this.redisOperations = redisOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
 	@Override
 	public RedisKeyValueAdapter create(CreationalContext<RedisKeyValueAdapter> creationalContext) {
 
diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueTemplateBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueTemplateBean.java
index ef10f5a78..db8ebc90f 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueTemplateBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueTemplateBean.java
@@ -55,10 +55,6 @@ public class RedisKeyValueTemplateBean extends CdiBean<KeyValueOperations> {
 		this.keyValueAdapter = keyValueAdapter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
 	@Override
 	public KeyValueOperations create(CreationalContext<KeyValueOperations> creationalContext) {
 
diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryBean.java
index 065e352e0..3819c1b4f 100644
--- a/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryBean.java
@@ -60,10 +60,6 @@ public class RedisRepositoryBean<T> extends CdiRepositoryBean<T> {
 		this.keyValueTemplate = keyValueTemplate;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
 	@Override
 	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 
diff --git a/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoriesRegistrar.java b/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoriesRegistrar.java
index fe412f27c..57d4b3fb0 100644
--- a/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoriesRegistrar.java
@@ -29,19 +29,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  */
 public class RedisRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableRedisRepositories.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getExtension() {
 		return new RedisRepositoryConfigurationExtension();
diff --git a/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtension.java
index 94d1ec2f6..ee3da5918 100644
--- a/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtension.java
@@ -52,37 +52,21 @@ public class RedisRepositoryConfigurationExtension extends KeyValueRepositoryCon
 	private static final String REDIS_ADAPTER_BEAN_NAME = "redisKeyValueAdapter";
 	private static final String REDIS_CUSTOM_CONVERSIONS_BEAN_NAME = "redisCustomConversions";
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "Redis";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getModulePrefix()
-	 */
 	@Override
 	protected String getModulePrefix() {
 		return "redis";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getDefaultKeyValueTemplateRef()
-	 */
 	@Override
 	protected String getDefaultKeyValueTemplateRef() {
 		return "redisKeyValueTemplate";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#registerBeansForRoot(org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.data.repository.config.RepositoryConfigurationSource)
-	 */
 	@Override
 	public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource configuration) {
 
@@ -114,10 +98,6 @@ public class RedisRepositoryConfigurationExtension extends KeyValueRepositoryCon
 		super.registerBeansForRoot(registry, configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getDefaultKeyValueTemplateBeanDefinition(org.springframework.data.repository.config.RepositoryConfigurationSource)
-	 */
 	@Override
 	protected AbstractBeanDefinition getDefaultKeyValueTemplateBeanDefinition(
 			RepositoryConfigurationSource configurationSource) {
@@ -128,10 +108,6 @@ public class RedisRepositoryConfigurationExtension extends KeyValueRepositoryCon
 				.getBeanDefinition();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations()
-	 */
 	@Override
 	protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
 		return Collections.singleton(RedisHash.class);
diff --git a/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java b/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
index c83954ec1..a621ebf62 100644
--- a/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
+++ b/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
@@ -44,10 +44,6 @@ public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisO
 		super(tree, parameters);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	 */
 	@Override
 	protected RedisOperationChain create(Part part, Iterator<Object> iterator) {
 		return from(part, iterator, new RedisOperationChain());
@@ -76,29 +72,17 @@ public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisO
 		return sink;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
-	 */
 	@Override
 	protected RedisOperationChain and(Part part, RedisOperationChain base, Iterator<Object> iterator) {
 		return from(part, iterator, base);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected RedisOperationChain or(RedisOperationChain base, RedisOperationChain criteria) {
 		base.orSismember(criteria.getSismember());
 		return base;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	protected KeyValueQuery<RedisOperationChain> complete(final RedisOperationChain criteria, Sort sort) {
 
diff --git a/src/main/java/org/springframework/data/redis/repository/support/DtoInstantiatingConverter.java b/src/main/java/org/springframework/data/redis/repository/support/DtoInstantiatingConverter.java
index 4c9e5ecd8..382455b29 100644
--- a/src/main/java/org/springframework/data/redis/repository/support/DtoInstantiatingConverter.java
+++ b/src/main/java/org/springframework/data/redis/repository/support/DtoInstantiatingConverter.java
@@ -61,10 +61,6 @@ class DtoInstantiatingConverter implements Converter<Object, Object> {
 		this.instantiator = entityInstantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Object convert(Object source) {
diff --git a/src/main/java/org/springframework/data/redis/repository/support/QueryByExampleRedisExecutor.java b/src/main/java/org/springframework/data/redis/repository/support/QueryByExampleRedisExecutor.java
index 7e0824a2e..20a3e6cf7 100644
--- a/src/main/java/org/springframework/data/redis/repository/support/QueryByExampleRedisExecutor.java
+++ b/src/main/java/org/springframework/data/redis/repository/support/QueryByExampleRedisExecutor.java
@@ -114,10 +114,6 @@ public class QueryByExampleRedisExecutor<T>
 		this.projectionFactory.setBeanClassLoader(classLoader);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findOne(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> Optional<S> findOne(Example<S> example) {
 
@@ -149,10 +145,6 @@ public class QueryByExampleRedisExecutor<T>
 		return (Iterator<S>) keyValueTemplate.find(query.limit(2), entityInformation.getJavaType()).iterator();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> Iterable<S> findAll(Example<S> example) {
 
@@ -161,19 +153,11 @@ public class QueryByExampleRedisExecutor<T>
 		return (Iterable<S>) keyValueTemplate.find(new KeyValueQuery<>(operationChain), entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public <S extends T> Iterable<S> findAll(Example<S> example, Sort sort) {
 		throw new UnsupportedOperationException("Ordering is not supported");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Pageable)
-	 */
 	@Override
 	public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
 
@@ -191,10 +175,6 @@ public class QueryByExampleRedisExecutor<T>
 						: keyValueTemplate.count(query, entityInformation.getJavaType()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#count(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> long count(Example<S> example) {
 
@@ -203,19 +183,11 @@ public class QueryByExampleRedisExecutor<T>
 		return keyValueTemplate.count(new KeyValueQuery<>(operationChain), entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#exists(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> boolean exists(Example<S> example) {
 		return count(example) > 0;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findBy(org.springframework.data.domain.Example, java.util.function.Function)
-	 */
 	@Override
 	public <S extends T, R> R findBy(Example<S> example,
 			Function<org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
@@ -262,28 +234,16 @@ public class QueryByExampleRedisExecutor<T>
 			return new FluentQueryByExample<>(example, sort, domainType, resultType);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
-		 */
 		@Override
 		public <R1> FetchableFluentQuery<R1> as(Class<R1> resultType) {
 			return new FluentQueryByExample<>(example, sort, domainType, resultType);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
-		 */
 		@Override
 		public FetchableFluentQuery<R> project(Collection<String> properties) {
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue()
-		 */
 		@Nullable
 		@Override
 		public R oneValue() {
@@ -297,10 +257,6 @@ public class QueryByExampleRedisExecutor<T>
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue()
-		 */
 		@Nullable
 		@Override
 		public R firstValue() {
@@ -314,19 +270,11 @@ public class QueryByExampleRedisExecutor<T>
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all()
-		 */
 		@Override
 		public List<R> all() {
 			return stream().collect(Collectors.toList());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable)
-		 */
 		@Override
 		public Page<R> page(Pageable pageable) {
 
@@ -338,10 +286,6 @@ public class QueryByExampleRedisExecutor<T>
 			return PageableExecutionUtils.getPage(content, pageable, this::count);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream()
-		 */
 		@Override
 		public Stream<R> stream() {
 
@@ -354,19 +298,11 @@ public class QueryByExampleRedisExecutor<T>
 			return Streamable.of(findAll(example)).map(conversionFunction).stream();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count()
-		 */
 		@Override
 		public long count() {
 			return QueryByExampleRedisExecutor.this.count(example);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists()
-		 */
 		@Override
 		public boolean exists() {
 			return QueryByExampleRedisExecutor.this.exists(example);
diff --git a/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactory.java b/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactory.java
index 6be75b246..caf35c935 100644
--- a/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactory.java
@@ -75,10 +75,6 @@ public class RedisRepositoryFactory extends KeyValueRepositoryFactory {
 		this.operations = keyValueOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
 
@@ -97,10 +93,6 @@ public class RedisRepositoryFactory extends KeyValueRepositoryFactory {
 		return fragments;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.support.KeyValueRepositoryFactory#getEntityInformation(java.lang.Class)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
diff --git a/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactoryBean.java b/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactoryBean.java
index 08fbb0726..a687ae48a 100644
--- a/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/redis/repository/support/RedisRepositoryFactoryBean.java
@@ -46,10 +46,6 @@ public class RedisRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
 		super(repositoryInterface);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.support.KeyValueRepositoryFactoryBean#createRepositoryFactory(org.springframework.data.keyvalue.core.KeyValueOperations, java.lang.Class, java.lang.Class)
-	 */
 	@Override
 	protected RedisRepositoryFactory createRepositoryFactory(KeyValueOperations operations,
 			Class<? extends AbstractQueryCreator<?, ?>> queryCreator, Class<? extends RepositoryQuery> repositoryQueryType) {
diff --git a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java
index 2f739cedc..fb9e5dd14 100644
--- a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java
+++ b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementReader.java
@@ -35,9 +35,6 @@ class DefaultRedisElementReader<T> implements RedisElementReader<T> {
 		this.serializer = serializer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisElementReader#read(java.nio.ByteBuffer)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public T read(ByteBuffer buffer) {
diff --git a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementWriter.java b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementWriter.java
index 2fef111e9..0c20c5ae1 100644
--- a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementWriter.java
+++ b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisElementWriter.java
@@ -34,9 +34,6 @@ class DefaultRedisElementWriter<T> implements RedisElementWriter<T> {
 		this.serializer = serializer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisElementWriter#write(java.lang.Object)
-	 */
 	@Override
 	public ByteBuffer write(T value) {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisSerializationContext.java b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisSerializationContext.java
index 9d257b40a..51de0ba9b 100644
--- a/src/main/java/org/springframework/data/redis/serializer/DefaultRedisSerializationContext.java
+++ b/src/main/java/org/springframework/data/redis/serializer/DefaultRedisSerializationContext.java
@@ -43,43 +43,28 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 		this.stringTuple = stringTuple;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext#getKeySerializationPair()
-	 */
 	@Override
 	public SerializationPair<K> getKeySerializationPair() {
 		return keyTuple;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext#getValueSerializationPair()
-	 */
 	@Override
 	public SerializationPair<V> getValueSerializationPair() {
 		return valueTuple;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext#getHashKeySerializationPair()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <HK> SerializationPair<HK> getHashKeySerializationPair() {
 		return (SerializationPair) hashKeyTuple;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext#getHashValueSerializationPair()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <HV> SerializationPair<HV> getHashValueSerializationPair() {
 		return (SerializationPair) hashValueTuple;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext#getStringSerializationPair()
-	 */
 	@Override
 	public SerializationPair<String> getStringSerializationPair() {
 		return stringTuple;
@@ -100,9 +85,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 		private @Nullable SerializationPair<?> hashValueTuple;
 		private SerializationPair<String> stringTuple = SerializationPair.fromSerializer(RedisSerializer.string());
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#key(SerializationPair)
-		 */
 		@Override
 		public RedisSerializationContextBuilder<K, V> key(SerializationPair<K> tuple) {
 
@@ -112,9 +94,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#value(SerializationPair)
-		 */
 		@Override
 		public RedisSerializationContextBuilder<K, V> value(SerializationPair<V> tuple) {
 
@@ -124,9 +103,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#hashKey(SerializationPair)
-		 */
 		@Override
 		public RedisSerializationContextBuilder<K, V> hashKey(SerializationPair<?> tuple) {
 
@@ -136,9 +112,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#hashValue(SerializationPair)
-		 */
 		@Override
 		public RedisSerializationContextBuilder<K, V> hashValue(SerializationPair<?> tuple) {
 
@@ -148,9 +121,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#string(SerializationPair)
-		 */
 		@Override
 		public RedisSerializationContextBuilder<K, V> string(SerializationPair<String> tuple) {
 
@@ -160,9 +130,6 @@ class DefaultRedisSerializationContext<K, V> implements RedisSerializationContex
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.redis.serializer.RedisSerializationContextBuilder#build()
-		 */
 		@Override
 		public RedisSerializationContext<K, V> build() {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
index b1296caed..8fca10fbd 100644
--- a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
@@ -108,10 +108,6 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer<Objec
 		objectMapper.registerModule(new SimpleModule().addSerializer(new NullValueSerializer(classPropertyTypeName)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#serialize(java.lang.Object)
-	 */
 	@Override
 	public byte[] serialize(@Nullable Object source) throws SerializationException {
 
@@ -126,10 +122,6 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer<Objec
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#deserialize(byte[])
-	 */
 	@Override
 	public Object deserialize(@Nullable byte[] source) throws SerializationException {
 		return deserialize(source, Object.class);
@@ -179,10 +171,6 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer<Objec
 			this.classIdentifier = StringUtils.hasText(classIdentifier) ? classIdentifier : "@class";
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
-		 */
 		@Override
 		public void serialize(NullValue value, JsonGenerator jgen, SerializerProvider provider)
 				throws IOException {
diff --git a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
index 96a54fe41..ac61ee73e 100644
--- a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
@@ -77,10 +77,6 @@ public class OxmSerializer implements InitializingBean, RedisSerializer<Object>
 		this.unmarshaller = unmarshaller;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
@@ -88,10 +84,6 @@ public class OxmSerializer implements InitializingBean, RedisSerializer<Object>
 		Assert.state(unmarshaller != null, "non-null unmarshaller required");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#deserialize(byte[])
-	 */
 	@Override
 	public Object deserialize(@Nullable byte[] bytes) throws SerializationException {
 
@@ -106,10 +98,6 @@ public class OxmSerializer implements InitializingBean, RedisSerializer<Object>
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#serialize(java.lang.Object)
-	 */
 	@Override
 	public byte[] serialize(@Nullable Object t) throws SerializationException {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java b/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
index 7c8a06de3..2500a47cf 100644
--- a/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
+++ b/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
@@ -83,17 +83,11 @@ class RedisSerializerToSerializationPairAdapter<T> implements SerializationPair<
 		return new RedisSerializerToSerializationPairAdapter<>(redisSerializer);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair#reader()
-	 */
 	@Override
 	public RedisElementReader<T> getReader() {
 		return pair.getReader();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair#writer()
-	 */
 	@Override
 	public RedisElementWriter<T> getWriter() {
 		return pair.getWriter();
diff --git a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
index c70dda603..76a53f2c4 100644
--- a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
@@ -80,19 +80,11 @@ public class StringRedisSerializer implements RedisSerializer<String> {
 		this.charset = charset;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#deserialize(byte[])
-	 */
 	@Override
 	public String deserialize(@Nullable byte[] bytes) {
 		return (bytes == null ? null : new String(bytes, charset));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.serializer.RedisSerializer#serialize(java.lang.Object)
-	 */
 	@Override
 	public byte[] serialize(@Nullable String string) {
 		return (string == null ? null : string.getBytes(charset));
diff --git a/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java
index b99c75d2c..552f08b9c 100644
--- a/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java
+++ b/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java
@@ -121,19 +121,11 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		return template;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.SmartLifecycle#isAutoStartup()
-	 */
 	@Override
 	public boolean isAutoStartup() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.SmartLifecycle#stop(java.lang.Runnable)
-	 */
 	@Override
 	public void stop(Runnable callback) {
 
@@ -141,10 +133,6 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		callback.run();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#start()
-	 */
 	@Override
 	public void start() {
 
@@ -165,10 +153,6 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#stop()
-	 */
 	@Override
 	public void stop() {
 
@@ -183,10 +167,6 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#isRunning()
-	 */
 	@Override
 	public boolean isRunning() {
 
@@ -195,19 +175,11 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Phased#getPhase()
-	 */
 	@Override
 	public int getPhase() {
 		return Integer.MAX_VALUE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.StreamMessageListenerContainer#register(org.springframework.data.redis.stream.StreamMessageListenerContainer.StreamReadRequest, org.springframework.data.redis.stream.StreamListener)
-	 */
 	@Override
 	public Subscription register(StreamReadRequest<K> streamRequest, StreamListener<K, V> listener) {
 		return doRegister(getReadTask(streamRequest, listener));
@@ -279,10 +251,6 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 		return subscription;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#remove(org.springframework.data.mongodb.monitor.Subscription)
-	 */
 	@Override
 	public void remove(Subscription subscription) {
 
@@ -317,28 +285,16 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 			return task;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.stream.Subscription#isActive()
-		 */
 		@Override
 		public boolean isActive() {
 			return task.isActive();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.stream.Subscription#await(java.time.Duration)
-		 */
 		@Override
 		public boolean await(Duration timeout) throws InterruptedException {
 			return task.awaitStart(timeout);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.redis.stream.Cancelable#cancel()
-		 */
 		@Override
 		public void cancel() throws DataAccessResourceFailureException {
 			task.cancel();
@@ -378,10 +334,6 @@ class DefaultStreamMessageListenerContainer<K, V extends Record<K, ?>> implement
 			this.logger = LogFactory.getLog(LoggingErrorHandler.class);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.util.ErrorHandler#handleError(java.lang.Throwable)
-		 */
 		public void handleError(Throwable t) {
 
 			if (this.logger.isErrorEnabled()) {
diff --git a/src/main/java/org/springframework/data/redis/stream/DefaultStreamReceiver.java b/src/main/java/org/springframework/data/redis/stream/DefaultStreamReceiver.java
index 74d71b3c9..d088331e7 100644
--- a/src/main/java/org/springframework/data/redis/stream/DefaultStreamReceiver.java
+++ b/src/main/java/org/springframework/data/redis/stream/DefaultStreamReceiver.java
@@ -100,10 +100,6 @@ class DefaultStreamReceiver<K, V extends Record<K, ?>> implements StreamReceiver
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.StreamReceiver#receive(org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Flux<V> receive(StreamOffset<K> streamOffset) {
@@ -128,10 +124,6 @@ class DefaultStreamReceiver<K, V extends Record<K, ?>> implements StreamReceiver
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.StreamReceiver#receiveAutoAck(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Flux<V> receiveAutoAck(Consumer consumer, StreamOffset<K> streamOffset) {
@@ -153,10 +145,6 @@ class DefaultStreamReceiver<K, V extends Record<K, ?>> implements StreamReceiver
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.StreamReceiver#receive(org.springframework.data.redis.connection.RedisStreamCommands.Consumer, org.springframework.data.redis.connection.RedisStreamCommands.StreamOffset)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Flux<V> receive(Consumer consumer, StreamOffset<K> streamOffset) {
diff --git a/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java b/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
index 9c6c97ca4..df67d2fe8 100644
--- a/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
+++ b/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
@@ -80,46 +80,26 @@ class StreamPollTask<K, V extends Record<K, ?>> implements Task {
 		return PollState.standalone(streamOffset.getOffset());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.Cancelable#cancel()
-	 */
 	@Override
 	public void cancel() throws DataAccessResourceFailureException {
 		this.pollState.cancel();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.Task#getState()
-	 */
 	@Override
 	public State getState() {
 		return pollState.getState();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.stream.Task#awaitStart(java.time.Duration)
-	 */
 	@Override
 	public boolean awaitStart(Duration timeout) throws InterruptedException {
 		return pollState.awaitStart(timeout.toNanos(), TimeUnit.NANOSECONDS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.scheduling.SchedulingAwareRunnable#isLongLived()
-	 */
 	@Override
 	public boolean isLongLived() {
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Runnable#run()
-	 */
 	@Override
 	public void run() {
 
diff --git a/src/main/java/org/springframework/data/redis/support/atomic/CompareAndSet.java b/src/main/java/org/springframework/data/redis/support/atomic/CompareAndSet.java
index c5bf03e1f..2e623e94b 100644
--- a/src/main/java/org/springframework/data/redis/support/atomic/CompareAndSet.java
+++ b/src/main/java/org/springframework/data/redis/support/atomic/CompareAndSet.java
@@ -54,10 +54,6 @@ class CompareAndSet<T> implements SessionCallback<Boolean> {
 		this.update = update;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.SessionCallback#execute(org.springframework.data.redis.core.RedisOperations)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <K, V> Boolean execute(RedisOperations<K, V> operations) throws DataAccessException {
diff --git a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicDouble.java b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicDouble.java
index ee1d85f60..5e2737686 100644
--- a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicDouble.java
+++ b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicDouble.java
@@ -359,64 +359,36 @@ public class RedisAtomicDouble extends Number implements Serializable, BoundKeyO
 		return Double.toString(get());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.STRING;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return generalOps.getExpire(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return generalOps.expire(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return generalOps.expireAt(key, date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return generalOps.persist(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(String newKey) {
 
@@ -424,37 +396,21 @@ public class RedisAtomicDouble extends Number implements Serializable, BoundKeyO
 		key = newKey;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#intValue()
-	 */
 	@Override
 	public int intValue() {
 		return (int) get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#longValue()
-	 */
 	@Override
 	public long longValue() {
 		return (long) get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#floatValue()
-	 */
 	@Override
 	public float floatValue() {
 		return (float) get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#doubleValue()
-	 */
 	@Override
 	public double doubleValue() {
 		return get();
diff --git a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java
index 0e28e0325..e9641a70a 100644
--- a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java
+++ b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java
@@ -359,64 +359,36 @@ public class RedisAtomicInteger extends Number implements Serializable, BoundKey
 		return Integer.toString(get());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.STRING;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return generalOps.getExpire(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return generalOps.expire(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return generalOps.expireAt(key, date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return generalOps.persist(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(String newKey) {
 
@@ -424,37 +396,21 @@ public class RedisAtomicInteger extends Number implements Serializable, BoundKey
 		key = newKey;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#intValue()
-	 */
 	@Override
 	public int intValue() {
 		return get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#longValue()
-	 */
 	@Override
 	public long longValue() {
 		return get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#floatValue()
-	 */
 	@Override
 	public float floatValue() {
 		return get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#doubleValue()
-	 */
 	@Override
 	public double doubleValue() {
 		return get();
diff --git a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java
index 5738ec0a4..14cc45332 100644
--- a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java
+++ b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java
@@ -356,64 +356,36 @@ public class RedisAtomicLong extends Number implements Serializable, BoundKeyOpe
 		return Long.toString(get());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.STRING;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return generalOps.getExpire(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return generalOps.expire(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return generalOps.expireAt(key, date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return generalOps.persist(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(String newKey) {
 
@@ -421,37 +393,21 @@ public class RedisAtomicLong extends Number implements Serializable, BoundKeyOpe
 		key = newKey;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#intValue()
-	 */
 	@Override
 	public int intValue() {
 		return (int) get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#longValue()
-	 */
 	@Override
 	public long longValue() {
 		return get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#floatValue()
-	 */
 	@Override
 	public float floatValue() {
 		return get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Number#doubleValue()
-	 */
 	@Override
 	public double doubleValue() {
 		return get();
diff --git a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
index 1361da489..da23d349c 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
@@ -55,28 +55,16 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		this.operations = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisStore#getOperations()
-	 */
 	@Override
 	public RedisOperations<String, E> getOperations() {
 		return operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#addAll(java.util.Collection)
-	 */
 	@Override
 	public boolean addAll(Collection<? extends E> c) {
 
@@ -89,10 +77,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return modified;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#containsAll(java.util.Collection)
-	 */
 	@Override
 	public boolean containsAll(Collection<?> c) {
 
@@ -105,10 +89,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return contains;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#removeAll(java.util.Collection)
-	 */
 	@Override
 	public boolean removeAll(Collection<?> c) {
 
@@ -121,46 +101,26 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return modified;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return operations.expire(key, timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return operations.expireAt(key, date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return operations.getExpire(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return operations.persist(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(final String newKey) {
 
@@ -178,10 +138,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -199,10 +155,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -212,10 +164,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#toString()
-	 */
 	@Override
 	public String toString() {
 
diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java
index 3ed6d3ab9..9ddc7d891 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java
@@ -115,10 +115,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		capped = (maxSize > 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#moveFirstTo(org.springframework.data.redis.support.collections.RedisList, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public E moveFirstTo(RedisList<E> destination, RedisListCommands.Direction destinationPosition) {
 
@@ -130,10 +126,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#moveFirstTo(org.springframework.data.redis.support.collections.RedisList, org.springframework.data.redis.connection.RedisListCommands.Direction, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public E moveFirstTo(RedisList<E> destination, RedisListCommands.Direction destinationPosition, long timeout,
 			TimeUnit unit) {
@@ -148,10 +140,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#moveLastTo(org.springframework.data.redis.support.collections.RedisList, org.springframework.data.redis.connection.RedisListCommands.Direction)
-	 */
 	@Override
 	public E moveLastTo(RedisList<E> destination, RedisListCommands.Direction destinationPosition) {
 
@@ -163,10 +151,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#moveLastTo(org.springframework.data.redis.support.collections.RedisList, org.springframework.data.redis.connection.RedisListCommands.Direction, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public E moveLastTo(RedisList<E> destination, RedisListCommands.Direction destinationPosition, long timeout,
 			TimeUnit unit) {
@@ -187,39 +171,23 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#range(long, long)
-	 */
 	@Override
 	public List<E> range(long start, long end) {
 		return listOps.range(start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#trim(int, int)
-	 */
 	@Override
 	public RedisList<E> trim(int start, int end) {
 		listOps.trim(start, end);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisList#trim(long, long)
-	 */
 	@Override
 	public RedisList<E> trim(long start, long end) {
 		listOps.trim(start, end);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#iterator()
-	 */
 	@Override
 	public Iterator<E> iterator() {
 		List<E> list = content();
@@ -227,10 +195,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisListIterator(list.iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#size()
-	 */
 	@Override
 	public int size() {
 		Long size = listOps.size();
@@ -238,10 +202,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return size.intValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#add(java.lang.Object)
-	 */
 	@Override
 	public boolean add(E value) {
 		listOps.rightPush(value);
@@ -249,29 +209,17 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#clear()
-	 */
 	@Override
 	public void clear() {
 		listOps.trim(size() + 1, 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#remove(java.lang.Object)
-	 */
 	@Override
 	public boolean remove(Object o) {
 		Long result = listOps.remove(1, o);
 		return (result != null && result.longValue() > 0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#add(int, java.lang.Object)
-	 */
 	@Override
 	public void add(int index, E element) {
 		if (index == 0) {
@@ -295,10 +243,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		throw new IllegalArgumentException("Redis supports insertion only at the beginning or the end of the list");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#addAll(int, java.util.Collection)
-	 */
 	@Override
 	public boolean addAll(int index, Collection<? extends E> c) {
 		// insert collection in reverse
@@ -329,10 +273,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		throw new IllegalArgumentException("Redis supports insertion only at the beginning or the end of the list");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#get(int)
-	 */
 	@Override
 	public E get(int index) {
 		if (index < 0 || index > size()) {
@@ -341,10 +281,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return listOps.index(index);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#indexOf(java.lang.Object)
-	 */
 	@Override
 	public int indexOf(Object o) {
 
@@ -352,10 +288,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return index != null ? index.intValue() : -1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#lastIndexOf(java.lang.Object)
-	 */
 	@Override
 	public int lastIndexOf(Object o) {
 
@@ -363,37 +295,21 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return index != null ? index.intValue() : -1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#listIterator()
-	 */
 	@Override
 	public ListIterator<E> listIterator() {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#listIterator(int)
-	 */
 	@Override
 	public ListIterator<E> listIterator(int index) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#remove(int)
-	 */
 	@Override
 	public E remove(int index) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#set(int, java.lang.Object)
-	 */
 	@Override
 	public E set(int index, E e) {
 
@@ -402,10 +318,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return object;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.List#subList(int, int)
-	 */
 	@Override
 	public List<E> subList(int fromIndex, int toIndex) {
 		throw new UnsupportedOperationException();
@@ -415,10 +327,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 	// Queue methods
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#element()
-	 */
 	@Override
 	public E element() {
 		E value = peek();
@@ -429,10 +337,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offer(java.lang.Object)
-	 */
 	@Override
 	public boolean offer(E e) {
 		listOps.rightPush(e);
@@ -440,30 +344,18 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#peek()
-	 */
 	@Override
 	@Nullable
 	public E peek() {
 		return listOps.index(0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#poll()
-	 */
 	@Override
 	@Nullable
 	public E poll() {
 		return listOps.leftPop();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#remove()
-	 */
 	@Override
 	public E remove() {
 
@@ -479,29 +371,17 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 	// Dequeue
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#addFirst(java.lang.Object)
-	 */
 	@Override
 	public void addFirst(E e) {
 		listOps.leftPush(e);
 		cap();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#addLast(java.lang.Object)
-	 */
 	@Override
 	public void addLast(E e) {
 		add(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#descendingIterator()
-	 */
 	@Override
 	public Iterator<E> descendingIterator() {
 		List<E> content = content();
@@ -509,19 +389,11 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisListIterator(content.iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#getFirst()
-	 */
 	@Override
 	public E getFirst() {
 		return element();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#getLast()
-	 */
 	@Override
 	public E getLast() {
 		E e = peekLast();
@@ -531,70 +403,42 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return e;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offerFirst(java.lang.Object)
-	 */
 	@Override
 	public boolean offerFirst(E e) {
 		addFirst(e);
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offerLast(java.lang.Object)
-	 */
 	@Override
 	public boolean offerLast(E e) {
 		addLast(e);
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#peekFirst()
-	 */
 	@Override
 	@Nullable
 	public E peekFirst() {
 		return peek();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#peekLast()
-	 */
 	@Override
 	@Nullable
 	public E peekLast() {
 		return listOps.index(-1);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#pollFirst()
-	 */
 	@Override
 	@Nullable
 	public E pollFirst() {
 		return poll();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#pollLast()
-	 */
 	@Override
 	@Nullable
 	public E pollLast() {
 		return listOps.rightPop();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#pop()
-	 */
 	@Override
 	public E pop() {
 
@@ -605,37 +449,21 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return e;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#push(java.lang.Object)
-	 */
 	@Override
 	public void push(E e) {
 		addFirst(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#removeFirst()
-	 */
 	@Override
 	public E removeFirst() {
 		return pop();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#removeFirstOccurrence(java.lang.Object)
-	 */
 	@Override
 	public boolean removeFirstOccurrence(Object o) {
 		return remove(o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Deque#removeLast()
-	 */
 	@Override
 	public E removeLast() {
 		E e = pollLast();
@@ -645,10 +473,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return e;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#removeLastOccurrence(java.lang.Object)
-	 */
 	@Override
 	public boolean removeLastOccurrence(Object o) {
 		Long result = listOps.remove(-1, o);
@@ -658,10 +482,6 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 	//
 	// BlockingQueue
 	//
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection, int)
-	 */
 	@Override
 	public int drainTo(Collection<? super E> c, int maxElements) {
 		if (this.equals(c)) {
@@ -678,56 +498,32 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 		return loop;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection)
-	 */
 	@Override
 	public int drainTo(Collection<? super E> c) {
 		return drainTo(c, size());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offer(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException {
 		return offer(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#poll(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	@Nullable
 	public E poll(long timeout, TimeUnit unit) throws InterruptedException {
 		return listOps.leftPop(timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#put(java.lang.Object)
-	 */
 	@Override
 	public void put(E e) throws InterruptedException {
 		offer(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingQueue#remainingCapacity()
-	 */
 	@Override
 	public int remainingCapacity() {
 		return Integer.MAX_VALUE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#take()
-	 */
 	@Override
 	@Nullable
 	public E take() throws InterruptedException {
@@ -738,86 +534,50 @@ public class DefaultRedisList<E> extends AbstractRedisCollection<E> implements R
 	// BlockingDeque
 	//
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offerFirst(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public boolean offerFirst(E e, long timeout, TimeUnit unit) throws InterruptedException {
 		return offerFirst(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#offerLast(java.lang.Object, long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public boolean offerLast(E e, long timeout, TimeUnit unit) throws InterruptedException {
 		return offerLast(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#pollFirst(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	@Nullable
 	public E pollFirst(long timeout, TimeUnit unit) throws InterruptedException {
 		return poll(timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#pollLast(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	@Nullable
 	public E pollLast(long timeout, TimeUnit unit) throws InterruptedException {
 		return listOps.rightPop(timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#putFirst(java.lang.Object)
-	 */
 	@Override
 	public void putFirst(E e) throws InterruptedException {
 		add(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#putLast(java.lang.Object)
-	 */
 	@Override
 	public void putLast(E e) throws InterruptedException {
 		put(e);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#takeFirst()
-	 */
 	@Override
 	@Nullable
 	public E takeFirst() throws InterruptedException {
 		return take();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.BlockingDeque#takeLast()
-	 */
 	@Override
 	@Nullable
 	public E takeLast() throws InterruptedException {
 		return pollLast(0, TimeUnit.SECONDS);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.LIST;
diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
index e32120473..85b9f7dc0 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
@@ -63,64 +63,36 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		this.hashOps = boundOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Long increment(K key, long delta) {
 		return hashOps.increment(key, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#increment(java.lang.Object, double)
-	 */
 	@Override
 	public Double increment(K key, double delta) {
 		return hashOps.increment(key, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#randomKey()
-	 */
 	@Override
 	public K randomKey() {
 		return hashOps.randomKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#randomEntry()
-	 */
 	@Override
 	public Entry<K, V> randomEntry() {
 		return hashOps.randomEntry();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisStore#getOperations()
-	 */
 	@Override
 	public RedisOperations<String, ?> getOperations() {
 		return hashOps.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#clear()
-	 */
 	@Override
 	public void clear() {
 		getOperations().delete(Collections.singleton(getKey()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#containsKey(java.lang.Object)
-	 */
 	@Override
 	public boolean containsKey(Object key) {
 
@@ -129,19 +101,11 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#containsValue(java.lang.Object)
-	 */
 	@Override
 	public boolean containsValue(Object value) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#entrySet()
-	 */
 	@Override
 	public Set<java.util.Map.Entry<K, V>> entrySet() {
 
@@ -150,38 +114,22 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return entries.entrySet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#get(java.lang.Object)
-	 */
 	@Override
 	@Nullable
 	public V get(Object key) {
 		return hashOps.get(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#isEmpty()
-	 */
 	@Override
 	public boolean isEmpty() {
 		return size() == 0;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#keySet()
-	 */
 	@Override
 	public Set<K> keySet() {
 		return hashOps.keys();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#put(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public V put(K key, V value) {
 
@@ -190,19 +138,11 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return oldV;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#putAll(java.util.Map)
-	 */
 	@Override
 	public void putAll(Map<? extends K, ? extends V> m) {
 		hashOps.putAll(m);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#remove(java.lang.Object)
-	 */
 	@Override
 	@Nullable
 	public V remove(Object key) {
@@ -212,10 +152,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return v;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#size()
-	 */
 	@Override
 	public int size() {
 
@@ -224,19 +160,11 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return size.intValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Map#values()
-	 */
 	@Override
 	public Collection<V> values() {
 		return hashOps.values();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object o) {
 
@@ -249,10 +177,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -261,30 +185,18 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 
 		return "RedisStore for key:" + getKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.ConcurrentMap#putIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@Nullable
 	public V putIfAbsent(K key, V value) {
 		return (hashOps.putIfAbsent(key, value) ? null : get(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.ConcurrentMap#remove(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public boolean remove(Object key, Object value) {
 
@@ -313,10 +225,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public boolean replace(K key, V oldValue, V newValue) {
 
@@ -345,10 +253,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	@Nullable
 	public V replace(K key, V value) {
@@ -378,64 +282,36 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return hashOps.expire(timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return hashOps.expireAt(date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return hashOps.getExpire();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return hashOps.persist();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return hashOps.getKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(String newKey) {
 		hashOps.rename(newKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return hashOps.getType();
@@ -447,10 +323,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#scan()
-	 */
 	@Override
 	public Cursor<java.util.Map.Entry<K, V>> scan() {
 		return scan(ScanOptions.NONE);
diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java
index 7f404dcf5..c43b08d7e 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java
@@ -73,133 +73,77 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		this.boundSetOps = boundOps;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#diff(org.springframework.data.redis.support.collections.RedisSet)
-	 */
 	@Override
 	public Set<E> diff(RedisSet<?> set) {
 		return boundSetOps.diff(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#diff(java.util.Collection)
-	 */
 	@Override
 	public Set<E> diff(Collection<? extends RedisSet<?>> sets) {
 		return boundSetOps.diff(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#diffAndStore(org.springframework.data.redis.support.collections.RedisSet, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> diffAndStore(RedisSet<?> set, String destKey) {
 		boundSetOps.diffAndStore(set.getKey(), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#diffAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> diffAndStore(Collection<? extends RedisSet<?>> sets, String destKey) {
 		boundSetOps.diffAndStore(CollectionUtils.extractKeys(sets), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#intersect(org.springframework.data.redis.support.collections.RedisSet)
-	 */
 	@Override
 	public Set<E> intersect(RedisSet<?> set) {
 		return boundSetOps.intersect(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#intersect(java.util.Collection)
-	 */
 	@Override
 	public Set<E> intersect(Collection<? extends RedisSet<?>> sets) {
 		return boundSetOps.intersect(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#intersectAndStore(org.springframework.data.redis.support.collections.RedisSet, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> intersectAndStore(RedisSet<?> set, String destKey) {
 		boundSetOps.intersectAndStore(set.getKey(), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#intersectAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> intersectAndStore(Collection<? extends RedisSet<?>> sets, String destKey) {
 		boundSetOps.intersectAndStore(CollectionUtils.extractKeys(sets), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#union(org.springframework.data.redis.support.collections.RedisSet)
-	 */
 	@Override
 	public Set<E> union(RedisSet<?> set) {
 		return boundSetOps.union(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#union(java.util.Collection)
-	 */
 	@Override
 	public Set<E> union(Collection<? extends RedisSet<?>> sets) {
 		return boundSetOps.union(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#unionAndStore(org.springframework.data.redis.support.collections.RedisSet, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> unionAndStore(RedisSet<?> set, String destKey) {
 		boundSetOps.unionAndStore(set.getKey(), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#unionAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisSet<E> unionAndStore(Collection<? extends RedisSet<?>> sets, String destKey) {
 		boundSetOps.unionAndStore(CollectionUtils.extractKeys(sets), destKey);
 		return new DefaultRedisSet<>(boundSetOps.getOperations().boundSetOps(destKey));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#randomElement()
-	 */
 	@Override
 	public E randomValue() {
 		return boundSetOps.randomMember();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#add(java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean add(E e) {
@@ -208,19 +152,11 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return result == 1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#clear()
-	 */
 	@Override
 	public void clear() {
 		boundSetOps.getOperations().delete(getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#contains(java.lang.Object)
-	 */
 	@Override
 	public boolean contains(Object o) {
 		Boolean result = boundSetOps.isMember(o);
@@ -228,10 +164,6 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#containsAll(java.util.Collection)
-	 */
 	@Override
 	public boolean containsAll(Collection<?> c) {
 
@@ -245,10 +177,6 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return member.values().stream().reduce(true, (left, right) -> left && right);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#iterator()
-	 */
 	@Override
 	public Iterator<E> iterator() {
 		Set<E> members = boundSetOps.members();
@@ -256,10 +184,6 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return new DefaultRedisSetIterator(members.iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#remove(java.lang.Object)
-	 */
 	@Override
 	public boolean remove(Object o) {
 		Long result = boundSetOps.remove(o);
@@ -267,10 +191,6 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return result == 1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#size()
-	 */
 	@Override
 	public int size() {
 		Long result = boundSetOps.size();
@@ -278,19 +198,11 @@ public class DefaultRedisSet<E> extends AbstractRedisCollection<E> implements Re
 		return result.intValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.SET;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisSet#scan()
-	 */
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.support.collections.RedisSet#scan()
diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java
index fe7851f6c..52db88d26 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java
@@ -105,46 +105,26 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		this.defaultScore = defaultScore;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#difference(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<E> diff(RedisZSet<?> set) {
 		return boundZSetOps.difference(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#difference(java.util.Collection)
-	 */
 	@Override
 	public Set<E> diff(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.difference(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#differenceWithScores(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<TypedTuple<E>> diffWithScores(RedisZSet<?> set) {
 		return boundZSetOps.differenceWithScores(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#differenceWithScores(java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<E>> diffWithScores(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.differenceWithScores(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#differenceAndStore(org.springframework.data.redis.support.collections.RedisZSet, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> diffAndStore(RedisZSet<?> set, String destKey) {
 
@@ -152,10 +132,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#differenceAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> diffAndStore(Collection<? extends RedisZSet<?>> sets, String destKey) {
 
@@ -163,46 +139,26 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersect(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<E> intersect(RedisZSet<?> set) {
 		return boundZSetOps.intersect(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersect(java.util.Collection)
-	 */
 	@Override
 	public Set<E> intersect(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.intersect(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersectWithScores(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<TypedTuple<E>> intersectWithScores(RedisZSet<?> set) {
 		return boundZSetOps.intersectWithScores(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersectWithScores(java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<E>> intersectWithScores(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.intersectWithScores(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersectAndStore(org.springframework.data.redis.support.collections.RedisZSet, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> intersectAndStore(RedisZSet<?> set, String destKey) {
 
@@ -210,10 +166,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#intersectAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> intersectAndStore(Collection<? extends RedisZSet<?>> sets, String destKey) {
 
@@ -221,195 +173,111 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#union(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<E> union(RedisZSet<?> set) {
 		return boundZSetOps.union(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#union(java.util.Collection)
-	 */
 	@Override
 	public Set<E> union(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.union(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#unionWithScores(org.springframework.data.redis.support.collections.RedisZSet)
-	 */
 	@Override
 	public Set<TypedTuple<E>> unionWithScores(RedisZSet<?> set) {
 		return boundZSetOps.unionWithScores(set.getKey());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#unionWithScores(java.util.Collection)
-	 */
 	@Override
 	public Set<TypedTuple<E>> unionWithScores(Collection<? extends RedisZSet<?>> sets) {
 		return boundZSetOps.unionWithScores(CollectionUtils.extractKeys(sets));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#unionAndStore(org.springframework.data.redis.support.collections.RedisZSet, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> unionAndStore(RedisZSet<?> set, String destKey) {
 		boundZSetOps.unionAndStore(set.getKey(), destKey);
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#unionAndStore(java.util.Collection, java.lang.String)
-	 */
 	@Override
 	public RedisZSet<E> unionAndStore(Collection<? extends RedisZSet<?>> sets, String destKey) {
 		boundZSetOps.unionAndStore(CollectionUtils.extractKeys(sets), destKey);
 		return new DefaultRedisZSet<>(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#randomElement()
-	 */
 	@Override
 	public E randomValue() {
 		return boundZSetOps.randomMember();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#range(long, long)
-	 */
 	@Override
 	public Set<E> range(long start, long end) {
 		return boundZSetOps.range(start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRange(long, long)
-	 */
 	@Override
 	public Set<E> reverseRange(long start, long end) {
 		return boundZSetOps.reverseRange(start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#rangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<E> rangeByLex(Range range, Limit limit) {
 		return boundZSetOps.rangeByLex(range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range, org.springframework.data.redis.connection.RedisZSetCommands.Limit)
-	 */
 	@Override
 	public Set<E> reverseRangeByLex(Range range, Limit limit) {
 		return boundZSetOps.reverseRangeByLex(range, limit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#rangeByScore(double, double)
-	 */
 	@Override
 	public Set<E> rangeByScore(double min, double max) {
 		return boundZSetOps.rangeByScore(min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRangeByScore(double, double)
-	 */
 	@Override
 	public Set<E> reverseRangeByScore(double min, double max) {
 		return boundZSetOps.reverseRangeByScore(min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#rangeByScoreWithScores(double, double)
-	 */
 	@Override
 	public Set<TypedTuple<E>> rangeByScoreWithScores(double min, double max) {
 		return boundZSetOps.rangeByScoreWithScores(min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#rangeWithScores(long, long)
-	 */
 	@Override
 	public Set<TypedTuple<E>> rangeWithScores(long start, long end) {
 		return boundZSetOps.rangeWithScores(start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRangeByScoreWithScores(double, double)
-	 */
 	@Override
 	public Set<TypedTuple<E>> reverseRangeByScoreWithScores(double min, double max) {
 		return boundZSetOps.reverseRangeByScoreWithScores(min, max);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRangeWithScores(long, long)
-	 */
 	@Override
 	public Set<TypedTuple<E>> reverseRangeWithScores(long start, long end) {
 		return boundZSetOps.reverseRangeWithScores(start, end);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#remove(long, long)
-	 */
 	@Override
 	public RedisZSet<E> remove(long start, long end) {
 		boundZSetOps.removeRange(start, end);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#removeRangeByLex(org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Set<E> removeByLex(Range range) {
 		boundZSetOps.removeRangeByLex(range);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#removeByScore(double, double)
-	 */
 	@Override
 	public RedisZSet<E> removeByScore(double min, double max) {
 		boundZSetOps.removeRangeByScore(min, max);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#add(java.lang.Object)
-	 */
 	@Override
 	public boolean add(E e) {
 		Boolean result = add(e, getDefaultScore());
@@ -417,10 +285,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#add(java.lang.Object, double)
-	 */
 	@Override
 	public boolean add(E e, double score) {
 		Boolean result = boundZSetOps.add(e, score);
@@ -428,10 +292,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#addIfAbsent(java.lang.Object, double)
-	 */
 	@Override
 	public boolean addIfAbsent(E e, double score) {
 
@@ -440,28 +300,16 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#clear()
-	 */
 	@Override
 	public void clear() {
 		boundZSetOps.removeRange(0, -1);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#contains(java.lang.Object)
-	 */
 	@Override
 	public boolean contains(Object o) {
 		return (boundZSetOps.rank(o) != null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#iterator()
-	 */
 	@Override
 	public Iterator<E> iterator() {
 		Set<E> members = boundZSetOps.range(0, -1);
@@ -469,10 +317,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return new DefaultRedisSortedSetIterator(members.iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#remove(java.lang.Object)
-	 */
 	@Override
 	public boolean remove(Object o) {
 
@@ -481,10 +325,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return result == 1;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.AbstractCollection#size()
-	 */
 	@Override
 	public int size() {
 
@@ -493,19 +333,11 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		return result.intValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#getDefaultScore()
-	 */
 	@Override
 	public Double getDefaultScore() {
 		return defaultScore;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#first()
-	 */
 	@Override
 	public E first() {
 
@@ -520,10 +352,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#popFirst()
-	 */
 	@Override
 	public E popFirst() {
 
@@ -536,10 +364,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#popFirst(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public E popFirst(long timeout, TimeUnit unit) {
 
@@ -552,10 +376,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#last()
-	 */
 	@Override
 	public E last() {
 
@@ -569,10 +389,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#popLast()
-	 */
 	@Override
 	public E popLast() {
 
@@ -585,10 +401,6 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#popLast(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public E popLast(long timeout, TimeUnit unit) {
 
@@ -601,55 +413,31 @@ public class DefaultRedisZSet<E> extends AbstractRedisCollection<E> implements R
 		throw new NoSuchElementException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#rank(java.lang.Object)
-	 */
 	@Override
 	public Long rank(Object o) {
 		return boundZSetOps.rank(o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#reverseRank(java.lang.Object)
-	 */
 	@Override
 	public Long reverseRank(Object o) {
 		return boundZSetOps.reverseRank(o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#lexCount(org.springframework.data.redis.connection.RedisZSetCommands.Range)
-	 */
 	@Override
 	public Long lexCount(Range range) {
 		return boundZSetOps.lexCount(range);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#score(java.lang.Object)
-	 */
 	@Override
 	public Double score(Object o) {
 		return boundZSetOps.score(o);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return DataType.ZSET;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisZSet#scan()
-	 */
 	@Override
 	public Cursor<E> scan() {
 		return new ConvertingCursor<>(scan(ScanOptions.NONE), TypedTuple::getValue);
diff --git a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
index 5ef6eac63..ab06d11d6 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
@@ -96,38 +96,22 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 		this(defaults, operations.boundHashOps(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#get(java.lang.Object)
-	 */
 	@Override
 	public synchronized Object get(Object key) {
 		return delegate.get(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#put(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public synchronized Object put(Object key, Object value) {
 		return delegate.put((String) key, (String) value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#putAll(java.util.Map)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public synchronized void putAll(Map<? extends Object, ? extends Object> t) {
 		delegate.putAll((Map<? extends String, ? extends String>) t);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Properties#propertyNames()
-	 */
 	@Override
 	public Enumeration<?> propertyNames() {
 		Set<String> keys = new LinkedHashSet<>(delegate.keySet());
@@ -137,75 +121,43 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 		return Collections.enumeration(keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#clear()
-	 */
 	@Override
 	public synchronized void clear() {
 		delegate.clear();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#clone()
-	 */
 	@Override
 	public synchronized Object clone() {
 		return new RedisProperties(defaults, hashOps);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#contains(java.lang.Object)
-	 */
 	@Override
 	public synchronized boolean contains(Object value) {
 		return containsValue(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#containsKey(java.lang.Object)
-	 */
 	@Override
 	public synchronized boolean containsKey(Object key) {
 		return delegate.containsKey(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#containsValue(java.lang.Object)
-	 */
 	@Override
 	public boolean containsValue(Object value) {
 		return delegate.containsValue(value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#elements()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public synchronized Enumeration<Object> elements() {
 		return Collections.enumeration((Collection) delegate.values());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#entrySet()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Set<Entry<Object, Object>> entrySet() {
 		return (Set) delegate.entrySet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#equals(java.lang.Object)
-	 */
 	@Override
 	public synchronized boolean equals(Object o) {
 
@@ -218,10 +170,6 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#hashCode()
-	 */
 	@Override
 	public synchronized int hashCode() {
 
@@ -229,229 +177,129 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 		return hash * 17 + delegate.hashCode();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#isEmpty()
-	 */
 	@Override
 	public synchronized boolean isEmpty() {
 		return delegate.isEmpty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#keys()
-	 */
 	@Override
 	public synchronized Enumeration<Object> keys() {
 		Set<Object> keys = keySet();
 		return Collections.enumeration(keys);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#keySet()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Set<Object> keySet() {
 		return (Set) delegate.keySet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#remove(java.lang.Object)
-	 */
 	@Override
 	public synchronized Object remove(Object key) {
 		return delegate.remove(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#size()
-	 */
 	@Override
 	public synchronized int size() {
 		return delegate.size();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#values()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Collection<Object> values() {
 		return (Collection) delegate.values();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#increment(java.lang.Object, long)
-	 */
 	@Override
 	public Long increment(Object key, long delta) {
 		return hashOps.increment((String) key, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#increment(java.lang.Object, double)
-	 */
 	@Override
 	public Double increment(Object key, double delta) {
 		return hashOps.increment((String) key, delta);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#randomKey()
-	 */
 	@Override
 	public Object randomKey() {
 		return delegate.randomKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#randomEntry()
-	 */
 	@Override
 	public Entry<Object, Object> randomEntry() {
 		return (Entry) delegate.randomEntry();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisStore#getOperations()
-	 */
 	@Override
 	public RedisOperations<String, ?> getOperations() {
 		return hashOps.getOperations();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expire(long, java.util.concurrent.TimeUnit)
-	 */
 	@Override
 	public Boolean expire(long timeout, TimeUnit unit) {
 		return hashOps.expire(timeout, unit);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#expireAt(java.util.Date)
-	 */
 	@Override
 	public Boolean expireAt(Date date) {
 		return hashOps.expireAt(date);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getExpire()
-	 */
 	@Override
 	public Long getExpire() {
 		return hashOps.getExpire();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return hashOps.getKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#getType()
-	 */
 	@Override
 	public DataType getType() {
 		return hashOps.getType();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#persist()
-	 */
 	@Override
 	public Boolean persist() {
 		return hashOps.persist();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.core.BoundKeyOperations#rename(java.lang.Object)
-	 */
 	@Override
 	public void rename(String newKey) {
 		hashOps.rename(newKey);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#putIfAbsent(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Object putIfAbsent(Object key, Object value) {
 		return (hashOps.putIfAbsent((String) key, (String) value) ? null : get(key));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#remove(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public boolean remove(Object key, Object value) {
 		return delegate.remove(key, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#replace(java.lang.Object, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public boolean replace(Object key, Object oldValue, Object newValue) {
 		return delegate.replace((String) key, (String) oldValue, (String) newValue);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Hashtable#replace(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public Object replace(Object key, Object value) {
 		return delegate.replace((String) key, (String) value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Properties#storeToXML(java.io.OutputStream, java.lang.String, java.lang.String)
-	 */
 	@Override
 	public synchronized void storeToXML(OutputStream os, String comment, String encoding) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Properties#storeToXML(java.io.OutputStream, java.lang.String)
-	 */
 	@Override
 	public synchronized void storeToXML(OutputStream os, String comment) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.support.collections.RedisMap#scan()
-	 */
 	@Override
 	public Iterator<java.util.Map.Entry<Object, Object>> scan() {
 		throw new UnsupportedOperationException();