From ad5412d8cfc24ab56f9da3d3159035630fd00d36 Mon Sep 17 00:00:00 2001 From: Markus Heiden Date: Wed, 27 Aug 2014 21:12:28 +0200 Subject: [PATCH] Restored old method for int weights for backwards compatibility --- .../java/redis/clients/jedis/ZParams.java | 25 ++++++++++++++++++- .../tests/commands/SortedSetCommandsTest.java | 8 +++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/redis/clients/jedis/ZParams.java b/src/main/java/redis/clients/jedis/ZParams.java index ff2ef60..ac1d1bd 100644 --- a/src/main/java/redis/clients/jedis/ZParams.java +++ b/src/main/java/redis/clients/jedis/ZParams.java @@ -23,7 +23,30 @@ public class ZParams { private List params = new ArrayList(); - public ZParams weights(final double... weights) { + /** + * Set weights. + * + * @param weights + * weights. + * @deprecated Use {@link #weightsByDouble(double...)} instead + */ + @Deprecated + public ZParams weights(final int... weights) { + params.add(WEIGHTS.raw); + for (final int weight : weights) { + params.add(Protocol.toByteArray(weight)); + } + + return this; + } + + /** + * Set weights. + * + * @param weights + * weights. + */ + public ZParams weightsByDouble(final double... weights) { params.add(WEIGHTS.raw); for (final double weight : weights) { params.add(Protocol.toByteArray(weight)); diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java index 467fc7b..f510ae3 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java @@ -783,7 +783,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase { jedis.zadd("bar", 2, "b"); ZParams params = new ZParams(); - params.weights(2, 2.5); + params.weightsByDouble(2, 2.5); params.aggregate(ZParams.Aggregate.SUM); long result = jedis.zunionstore("dst", params, "foo", "bar"); @@ -802,7 +802,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase { jedis.zadd(bbar, 2, bb); ZParams bparams = new ZParams(); - bparams.weights(2, 2.5); + bparams.weightsByDouble(2, 2.5); bparams.aggregate(ZParams.Aggregate.SUM); long bresult = jedis.zunionstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar); @@ -855,7 +855,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase { jedis.zadd("bar", 2, "a"); ZParams params = new ZParams(); - params.weights(2, 2.5); + params.weightsByDouble(2, 2.5); params.aggregate(ZParams.Aggregate.SUM); long result = jedis.zinterstore("dst", params, "foo", "bar"); @@ -872,7 +872,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase { jedis.zadd(bbar, 2, ba); ZParams bparams = new ZParams(); - bparams.weights(2, 2.5); + bparams.weightsByDouble(2, 2.5); bparams.aggregate(ZParams.Aggregate.SUM); long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar);