Remove Eclipse Non-Javadoc comments.

Closes #2223

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

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

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

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

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;

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

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

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;

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 {
 

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

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 {
 

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

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

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

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;

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;

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;

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

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

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;

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

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

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

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;

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

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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;

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

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;

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

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 {
 

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

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

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

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(

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

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

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

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

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 {
 

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

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

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

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

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

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

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

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

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 {
 

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

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