Merge remote branch 'raszi/findbugs'

Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java

src/test/java/redis/clients/jedis/tests/PipeliningTest.java

@@ -82,8 +82,8 @@ public class PipeliningTest extends Assert {
         assertEquals("foo", zset.get().iterator().next());
         assertEquals("foo", set.get());
         assertEquals(false, blist.get());
-        assertEquals(new Double(2), zincrby.get());
-        assertEquals(new Long(1), zcard.get());
+        assertEquals(Double.valueOf(2), zincrby.get());
+        assertEquals(Long.valueOf(1), zcard.get());
         assertEquals(1, lrange.get().size());
         assertNotNull(hgetAll.get().get("foo"));
         assertEquals(1, smembers.get().size());
@@ -134,4 +134,4 @@ public class PipeliningTest extends Assert {
         }
         assertEquals(r.get(), "bar");
     }
-}
+}

src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java

@@ -1,23 +1,33 @@
 package redis.clients.jedis.tests;
 
-import org.junit.Before;
-import org.junit.Test;
-import redis.clients.jedis.*;
-import redis.clients.jedis.exceptions.JedisDataException;
-
-import java.io.UnsupportedEncodingException;
-import java.util.*;
-
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNull;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisShardInfo;
+import redis.clients.jedis.Response;
+import redis.clients.jedis.ShardedJedis;
+import redis.clients.jedis.ShardedJedisPipeline;
+import redis.clients.jedis.Tuple;
+import redis.clients.jedis.exceptions.JedisDataException;
+
 public class ShardedJedisPipelineTest {
-    private static HostAndPortUtil.HostAndPort redis1 = HostAndPortUtil.getRedisServers()
-            .get(0);
-    private static HostAndPortUtil.HostAndPort redis2 = HostAndPortUtil.getRedisServers()
-            .get(1);
+    private static HostAndPortUtil.HostAndPort redis1 = HostAndPortUtil
+            .getRedisServers().get(0);
+    private static HostAndPortUtil.HostAndPort redis2 = HostAndPortUtil
+            .getRedisServers().get(1);
 
     private ShardedJedis jedis;
 
@@ -42,7 +52,6 @@ public class ShardedJedisPipelineTest {
         this.jedis = new ShardedJedis(shards);
     }
 
-
     @Test
     public void pipeline() throws UnsupportedEncodingException {
         ShardedJedisPipeline p = jedis.pipelined();
@@ -87,8 +96,8 @@ public class ShardedJedisPipelineTest {
         assertEquals("foo", zset.get().iterator().next());
         assertEquals("foo", set.get());
         assertFalse(blist.get());
-        assertEquals(new Double(2), zincrby.get());
-        assertEquals(new Long(1), zcard.get());
+        assertEquals(Double.valueOf(2), zincrby.get());
+        assertEquals(Long.valueOf(1), zcard.get());
         assertEquals(1, lrange.get().size());
         assertNotNull(hgetAll.get().get("foo"));
         assertEquals(1, smembers.get().size());

src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java

@@ -152,8 +152,8 @@ public class ShardedJedisPoolTest extends Assert {
         shards.set(1, new JedisShardInfo("nohost", 1234));
         pool = new ShardedJedisPool(redisConfig, shards);
         jedis = pool.getResource();
-        Long actual = new Long(0);
-        Long fails = new Long(0);
+        Long actual = Long.valueOf(0);
+        Long fails = Long.valueOf(0);
         for (int i = 0; i < 1000; i++) {
             try {
                 jedis.get("a-test-" + i);
@@ -167,4 +167,4 @@ public class ShardedJedisPoolTest extends Assert {
         assertEquals(actual, c1);
         assertEquals(fails, c2);
     }
-}
+}

src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java

@@ -64,8 +64,8 @@ public abstract class JedisCommandTestBase extends JedisTestBase {
                 }
             }
             if (!contained) {
-                throw new ComparisonFailure("element is missing", next
-                        .toString(), actual.toString());
+                throw new ComparisonFailure("element is missing",
+                        Arrays.toString(next), actual.toString());
             }
         }
     }
@@ -93,4 +93,4 @@ public abstract class JedisCommandTestBase extends JedisTestBase {
         }
         return false;
     }
-}
+}