From 516f84b6c72b7a84ae4d623fb91b82d0b9e26283 Mon Sep 17 00:00:00 2001
From: sazzad16 <sazzad.cse.sust@gmail.com>
Date: Wed, 16 Oct 2019 13:06:32 +0600
Subject: [PATCH] Modify #1988 according to #1968

---
 .../redis/clients/jedis/BuilderFactory.java   | 35 +++++++++----------
 .../tests/commands/SortedSetCommandsTest.java | 12 ++++---
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
index 237d2f39c4..6f5e1566b9 100644
--- a/src/main/java/redis/clients/jedis/BuilderFactory.java
+++ b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -262,6 +262,23 @@ public String toString() {
 
   };
 
+  public static final Builder<Tuple> TUPLE = new Builder<Tuple>() {
+    @Override
+    @SuppressWarnings("unchecked")
+    public Tuple build(Object data) {
+      if (null == data) return null;
+      List<byte[]> l = (List<byte[]>) data;
+      if (l.isEmpty()) return null;
+      return new Tuple(l.get(0), DOUBLE.build(l.get(1)));
+    }
+
+    @Override
+    public String toString() {
+      return "Tuple";
+    }
+
+  };
+
   public static final Builder<Set<Tuple>> TUPLE_ZSET = new Builder<Set<Tuple>>() {
     @Override
     @SuppressWarnings("unchecked")
@@ -285,24 +302,6 @@ public String toString() {
 
   };
 
-  public static final Builder<Tuple> TUPLE = new Builder<Tuple>() {
-    @Override
-    @SuppressWarnings("unchecked")
-    public Tuple build(Object data) {
-      List<byte[]> l = (List<byte[]>) data; // never null
-      if (l.isEmpty()) {
-        return null;
-      }
-      return new Tuple(l.get(0), DOUBLE.build(l.get(1)));
-    }
-
-    @Override
-    public String toString() {
-      return "Tuple";
-    }
-
-  };
-  
   public static final Builder<Object> EVAL_RESULT = new Builder<Object>() {
 
     @Override
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 77c2bc3691..1df73af53a 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
@@ -673,6 +673,7 @@ public void zpopmin() {
     assertEquals(expected, range);
 
     Tuple tuple = jedis.zpopmin("foo");
+
     assertEquals(new Tuple("b", 10d), tuple);
 
     // Binary
@@ -682,15 +683,16 @@ public void zpopmin() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    Set<Tuple> brange = jedis.zpopmin(bfoo, 2);
+    range = jedis.zpopmin(bfoo, 2);
 
-    Set<Tuple> bexpected = new LinkedHashSet<Tuple>();
-    bexpected.add(new Tuple(bc, 0.1d));
-    bexpected.add(new Tuple(ba, 2d));
+    expected = new LinkedHashSet<Tuple>();
+    expected.add(new Tuple(bc, 0.1d));
+    expected.add(new Tuple(ba, 2d));
 
-    assertEquals(bexpected, brange);
+    assertEquals(expected, range);
 
     tuple = jedis.zpopmin(bfoo);
+
     assertEquals(new Tuple(bb, 10d), tuple);
   }