diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
index a37359fc7..de3470c18 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
@@ -475,8 +475,8 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 		}
 
 		try {
-			return toTupleSet(connection.getCluster().zrangeByScoreWithScores(key, min, max,
-					Long.valueOf(offset).intValue(), Long.valueOf(count).intValue()));
+			return toTupleSet(connection.getCluster().zrangeByScoreWithScores(key, min, max, Long.valueOf(offset).intValue(),
+					Long.valueOf(count).intValue()));
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);
 		}
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
index d9c396a8e..46c3efd72 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisZSetCommands.java
@@ -248,10 +248,8 @@ class JedisZSetCommands implements RedisZSetCommands {
 					.toSet(JedisConverters::toTuple);
 		}
 
-		return connection.invoke()
-				.fromMany(BinaryJedis::zrevrangeByScoreWithScores, MultiKeyPipelineBase::zrevrangeByScoreWithScores, key, max,
-						min)
-				.toSet(JedisConverters::toTuple);
+		return connection.invoke().fromMany(BinaryJedis::zrevrangeByScoreWithScores,
+				MultiKeyPipelineBase::zrevrangeByScoreWithScores, key, max, min).toSet(JedisConverters::toTuple);
 	}
 
 	/*
@@ -511,10 +509,8 @@ class JedisZSetCommands implements RedisZSetCommands {
 		}
 		String keyStr = new String(key, StandardCharsets.UTF_8);
 
-		return connection.invoke()
-				.fromMany(Jedis::zrangeByScore, MultiKeyPipelineBase::zrangeByScore, keyStr, min, max, (int) offset,
-						(int) count)
-				.toSet(JedisConverters::toBytes);
+		return connection.invoke().fromMany(Jedis::zrangeByScore, MultiKeyPipelineBase::zrangeByScore, keyStr, min, max,
+				(int) offset, (int) count).toSet(JedisConverters::toBytes);
 	}
 
 	/*
@@ -575,7 +571,6 @@ class JedisZSetCommands implements RedisZSetCommands {
 		byte[] min = JedisConverters.boundaryToBytesForZRangeByLex(range.getMin(), JedisConverters.MINUS_BYTES);
 		byte[] max = JedisConverters.boundaryToBytesForZRangeByLex(range.getMax(), JedisConverters.PLUS_BYTES);
 
-
 		if (!limit.isUnlimited()) {
 			return connection.invoke().from(BinaryJedis::zrevrangeByLex, MultiKeyPipelineBase::zrevrangeByLex, key, max, min,
 					limit.getOffset(), limit.getCount()).get(LinkedHashSet::new);
diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
index d9698ae66..5899c6636 100644
--- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
@@ -1925,7 +1925,7 @@ public abstract class AbstractConnectionIntegrationTests {
 		actual.add(connection.zRemRangeByLex("myset", Range.range().gte("alpha").lte("omega")));
 
 		actual.add(connection.zRange("myset", 0L, -1L));
-		verifyResults(Arrays.asList(new Object[] { true, true, true,true, true, true,true, true, true,true, 6L, new LinkedHashSet<String>(Arrays.asList("ALPHA", "aaaa", "zap", "zip")) }));
+		verifyResults(Arrays.asList( true, true, true, true, true, true, true, true, true, true, 6L, new LinkedHashSet<>(Arrays.asList("ALPHA", "aaaa", "zap", "zip"))));
 	}
 
 	@Test
@@ -1935,7 +1935,8 @@ public abstract class AbstractConnectionIntegrationTests {
 		actual.add(connection.zRemRangeByScore("myset", 0d, 1d));
 		actual.add(connection.zRange("myset", 0L, -1L));
 		verifyResults(
-				Arrays.asList(new Object[] { true, true, 1L, new LinkedHashSet<>(Arrays.asList("Bob")) }));
+				Arrays.asList(new Object[] { true, true, 1L, new LinkedHashSet<>(Collections
+						.singletonList("Bob")) }));
 	}
 
 	@Test
diff --git a/src/test/java/org/springframework/data/redis/core/ConnectionMockingRedisTemplate.java b/src/test/java/org/springframework/data/redis/core/ConnectionMockingRedisTemplate.java
index a59efb08f..5b444125f 100644
--- a/src/test/java/org/springframework/data/redis/core/ConnectionMockingRedisTemplate.java
+++ b/src/test/java/org/springframework/data/redis/core/ConnectionMockingRedisTemplate.java
@@ -21,11 +21,13 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.serializer.RedisSerializer;
 
 /**
+ * Test extension to {@link RedisTemplate} to use a Mockito mocked {@link RedisConnection}.
+ *
  * @author Christoph Strobl
  */
 public class ConnectionMockingRedisTemplate<K, V> extends RedisTemplate<K, V> {
 
-	private RedisConnection connectionMock;
+	private final RedisConnection connectionMock;
 
 	private ConnectionMockingRedisTemplate() {
 
diff --git a/src/test/java/org/springframework/data/redis/core/DefaultBoundZSetOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultBoundZSetOperationsUnitTests.java
index a94dca556..2f5877618 100644
--- a/src/test/java/org/springframework/data/redis/core/DefaultBoundZSetOperationsUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/DefaultBoundZSetOperationsUnitTests.java
@@ -22,6 +22,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.data.redis.connection.RedisZSetCommands.Range;
 
 /**
+ * Unit tests for {@link DefaultBoundZSetOperations}.
+ *
  * @author Christoph Strobl
  */
 class DefaultBoundZSetOperationsUnitTests {
diff --git a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsUnitTests.java
index 47ef7564f..926d1138f 100644
--- a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsUnitTests.java
@@ -22,6 +22,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.data.redis.connection.RedisZSetCommands.Range;
 
 /**
+ * Unit tests for {@link DefaultZSetOperations}.
+ *
  * @author Christoph Strobl
  */
 class DefaultZSetOperationsUnitTests {