From 2eda9cd8fb78745996fdc20d93000f9ab787a89f Mon Sep 17 00:00:00 2001 From: Markus Heiden Date: Wed, 27 Aug 2014 21:41:22 +0200 Subject: [PATCH] Removed deprecated int based weights --- .../java/redis/clients/jedis/ZParams.java | 19 +------------------ .../tests/commands/SortedSetCommandsTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/main/java/redis/clients/jedis/ZParams.java b/src/main/java/redis/clients/jedis/ZParams.java index ac1d1bd..6b42174 100644 --- a/src/main/java/redis/clients/jedis/ZParams.java +++ b/src/main/java/redis/clients/jedis/ZParams.java @@ -28,25 +28,8 @@ public class ZParams { * * @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) { + public ZParams weights(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 f510ae3..467fc7b 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.weightsByDouble(2, 2.5); + params.weights(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.weightsByDouble(2, 2.5); + bparams.weights(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.weightsByDouble(2, 2.5); + params.weights(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.weightsByDouble(2, 2.5); + bparams.weights(2, 2.5); bparams.aggregate(ZParams.Aggregate.SUM); long bresult = jedis.zinterstore(SafeEncoder.encode("dst"), bparams, bfoo, bbar);