Fix JedisClusterZSetCommands.reverseRangeByLex(…) parameter order.

max/min parameter are now used in the correct order.

Closes #1998

Author: mp911de

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java

@@ -384,9 +384,9 @@ public Set<byte[]> zRevRangeByLex(byte[] key, Range range, Limit limit) {
 
 		try {
 			if (limit.isUnlimited()) {
-				return connection.getCluster().zrevrangeByLex(key, min, max);
+				return connection.getCluster().zrevrangeByLex(key, max, min);
 			}
-			return connection.getCluster().zrevrangeByLex(key, min, max, limit.getOffset(), limit.getCount());
+			return connection.getCluster().zrevrangeByLex(key, max, min, limit.getOffset(), limit.getCount());
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);
 		}

src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java

@@ -23,9 +23,9 @@
 import static org.springframework.data.redis.connection.ClusterTestVariables.*;
 import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*;
 import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*;
+import static org.springframework.data.redis.connection.RedisZSetCommands.*;
 import static org.springframework.data.redis.core.ScanOptions.*;
 
-import org.springframework.data.redis.test.condition.EnabledOnCommand;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisCluster;
@@ -63,14 +63,13 @@
 import org.springframework.data.redis.connection.RedisNode;
 import org.springframework.data.redis.connection.RedisStringCommands.BitOperation;
 import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
-import org.springframework.data.redis.connection.RedisZSetCommands.Range;
-import org.springframework.data.redis.connection.RedisZSetCommands.Tuple;
 import org.springframework.data.redis.connection.ReturnType;
 import org.springframework.data.redis.connection.ValueEncoding.RedisValueEncoding;
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.data.redis.core.script.DigestUtils;
 import org.springframework.data.redis.core.types.Expiration;
+import org.springframework.data.redis.test.condition.EnabledOnCommand;
 import org.springframework.data.redis.test.condition.EnabledOnRedisClusterAvailable;
 import org.springframework.data.redis.test.extension.JedisExtension;
 import org.springframework.data.redis.test.util.HexStringUtils;
@@ -2041,6 +2040,40 @@ public void zRangeByLexShouldReturnResultCorrectly() {
 				JedisConverters.toBytes("c"), JedisConverters.toBytes("d"));
 	}
 
+	@Test // GH-1998
+	public void zRevRangeByLexShouldReturnValuesCorrectly() {
+
+		nativeConnection.zadd(KEY_1, 0, "a");
+		nativeConnection.zadd(KEY_1, 0, "b");
+		nativeConnection.zadd(KEY_1, 0, "c");
+		nativeConnection.zadd(KEY_1, 0, "d");
+		nativeConnection.zadd(KEY_1, 0, "e");
+		nativeConnection.zadd(KEY_1, 0, "f");
+		nativeConnection.zadd(KEY_1, 0, "g");
+
+		Set<byte[]> values = clusterConnection.zRevRangeByLex(KEY_1_BYTES, Range.range().lte("c"));
+
+		assertThat(values).containsExactly(JedisConverters.toBytes("c"), JedisConverters.toBytes("b"),
+				JedisConverters.toBytes("a"));
+		assertThat(values).doesNotContain(JedisConverters.toBytes("d"), JedisConverters.toBytes("e"),
+				JedisConverters.toBytes("f"), JedisConverters.toBytes("g"));
+
+		values = clusterConnection.zRevRangeByLex(KEY_1_BYTES, Range.range().lt("c"));
+		assertThat(values).containsExactly(JedisConverters.toBytes("b"), JedisConverters.toBytes("a"));
+		assertThat(values).doesNotContain(JedisConverters.toBytes("c"));
+
+		values = clusterConnection.zRevRangeByLex(KEY_1_BYTES, Range.range().gte("aaa").lt("g"));
+		assertThat(values).containsExactly(JedisConverters.toBytes("f"), JedisConverters.toBytes("e"),
+				JedisConverters.toBytes("d"), JedisConverters.toBytes("c"), JedisConverters.toBytes("b"));
+		assertThat(values).doesNotContain(JedisConverters.toBytes("a"), JedisConverters.toBytes("g"));
+
+		values = clusterConnection.zRevRangeByLex(KEY_1_BYTES, Range.range().lte("d"), Limit.limit().count(2).offset(1));
+
+		assertThat(values).hasSize(2).containsExactly(JedisConverters.toBytes("c"), JedisConverters.toBytes("b"));
+		assertThat(values).doesNotContain(JedisConverters.toBytes("a"), JedisConverters.toBytes("d"),
+				JedisConverters.toBytes("e"), JedisConverters.toBytes("f"), JedisConverters.toBytes("g"));
+	}
+
 	@Test // DATAREDIS-315
 	public void zRangeByScoreShouldReturnValuesCorrectly() {