clean warns (#2335)

* clean warns

* Add more try-resource blocks

* Update RedisVersionUtil.java

* Update src/test/java/redis/clients/jedis/tests/JedisSentinelPoolWithCompleteCredentialsTest.java

Co-authored-by: M Sazzadul Hoque <[email protected]>

* Update src/test/java/redis/clients/jedis/tests/JedisSentinelPoolWithCompleteCredentialsTest.java

Co-authored-by: M Sazzadul Hoque <[email protected]>

* Update src/main/java/redis/clients/jedis/ZParams.java

Co-authored-by: M Sazzadul Hoque <[email protected]>

Author: gkorland

src/main/java/redis/clients/jedis/BinaryClient.java

@@ -104,32 +104,32 @@ private void process(Client client) {
         throw new JedisException("Unknown message type: " + firstObj);
       }
       final byte[] resp = (byte[]) firstObj;
-      if (Arrays.equals(SUBSCRIBE.raw, resp)) {
+      if (Arrays.equals(SUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bchannel = (byte[]) reply.get(1);
         onSubscribe(bchannel, subscribedChannels);
-      } else if (Arrays.equals(UNSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(UNSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bchannel = (byte[]) reply.get(1);
         onUnsubscribe(bchannel, subscribedChannels);
-      } else if (Arrays.equals(MESSAGE.raw, resp)) {
+      } else if (Arrays.equals(MESSAGE.getRaw(), resp)) {
         final byte[] bchannel = (byte[]) reply.get(1);
         final byte[] bmesg = (byte[]) reply.get(2);
         onMessage(bchannel, bmesg);
-      } else if (Arrays.equals(PMESSAGE.raw, resp)) {
+      } else if (Arrays.equals(PMESSAGE.getRaw(), resp)) {
         final byte[] bpattern = (byte[]) reply.get(1);
         final byte[] bchannel = (byte[]) reply.get(2);
         final byte[] bmesg = (byte[]) reply.get(3);
         onPMessage(bpattern, bchannel, bmesg);
-      } else if (Arrays.equals(PSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(PSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bpattern = (byte[]) reply.get(1);
         onPSubscribe(bpattern, subscribedChannels);
-      } else if (Arrays.equals(PUNSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(PUNSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bpattern = (byte[]) reply.get(1);
         onPUnsubscribe(bpattern, subscribedChannels);
-      } else if (Arrays.equals(PONG.raw, resp)) {
+      } else if (Arrays.equals(PONG.getRaw(), resp)) {
         final byte[] bpattern = (byte[]) reply.get(1);
         onPong(bpattern);
       } else {

src/main/java/redis/clients/jedis/BinaryJedisPubSub.java

@@ -629,7 +629,6 @@ public String toString() {
 
   public static final Builder<StreamEntryID> STREAM_ENTRY_ID = new Builder<StreamEntryID>() {
     @Override
-    @SuppressWarnings("unchecked")
     public  StreamEntryID build(Object data) {
       if (null == data) {
         return null;

src/main/java/redis/clients/jedis/BuilderFactory.java

@@ -3121,7 +3121,7 @@ public List<Map<String, String>> sentinelMasters() {
 
     final List<Map<String, String>> masters = new ArrayList<>();
     for (Object obj : reply) {
-      masters.add(BuilderFactory.STRING_MAP.build((List) obj));
+      masters.add(BuilderFactory.STRING_MAP.build( obj));
     }
     return masters;
   }
@@ -3192,7 +3192,6 @@ public Long sentinelReset(final String pattern) {
    * @return
    */
   @Override
-  @SuppressWarnings("rawtypes")
   public List<Map<String, String>> sentinelSlaves(final String masterName) {
     client.sentinel(Protocol.SENTINEL_SLAVES, masterName);
     final List<Object> reply = client.getObjectMultiBulkReply();

src/main/java/redis/clients/jedis/Jedis.java

@@ -134,41 +134,41 @@ private void process(Client client) {
         throw new JedisException("Unknown message type: " + firstObj);
       }
       final byte[] resp = (byte[]) firstObj;
-      if (Arrays.equals(SUBSCRIBE.raw, resp)) {
+      if (Arrays.equals(SUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bchannel = (byte[]) reply.get(1);
         final String strchannel = (bchannel == null) ? null : SafeEncoder.encode(bchannel);
         onSubscribe(strchannel, subscribedChannels);
-      } else if (Arrays.equals(UNSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(UNSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bchannel = (byte[]) reply.get(1);
         final String strchannel = (bchannel == null) ? null : SafeEncoder.encode(bchannel);
         onUnsubscribe(strchannel, subscribedChannels);
-      } else if (Arrays.equals(MESSAGE.raw, resp)) {
+      } else if (Arrays.equals(MESSAGE.getRaw(), resp)) {
         final byte[] bchannel = (byte[]) reply.get(1);
         final byte[] bmesg = (byte[]) reply.get(2);
         final String strchannel = (bchannel == null) ? null : SafeEncoder.encode(bchannel);
         final String strmesg = (bmesg == null) ? null : SafeEncoder.encode(bmesg);
         onMessage(strchannel, strmesg);
-      } else if (Arrays.equals(PMESSAGE.raw, resp)) {
+      } else if (Arrays.equals(PMESSAGE.getRaw(), resp)) {
         final byte[] bpattern = (byte[]) reply.get(1);
         final byte[] bchannel = (byte[]) reply.get(2);
         final byte[] bmesg = (byte[]) reply.get(3);
         final String strpattern = (bpattern == null) ? null : SafeEncoder.encode(bpattern);
         final String strchannel = (bchannel == null) ? null : SafeEncoder.encode(bchannel);
         final String strmesg = (bmesg == null) ? null : SafeEncoder.encode(bmesg);
         onPMessage(strpattern, strchannel, strmesg);
-      } else if (Arrays.equals(PSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(PSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bpattern = (byte[]) reply.get(1);
         final String strpattern = (bpattern == null) ? null : SafeEncoder.encode(bpattern);
         onPSubscribe(strpattern, subscribedChannels);
-      } else if (Arrays.equals(PUNSUBSCRIBE.raw, resp)) {
+      } else if (Arrays.equals(PUNSUBSCRIBE.getRaw(), resp)) {
         subscribedChannels = ((Long) reply.get(2)).intValue();
         final byte[] bpattern = (byte[]) reply.get(1);
         final String strpattern = (bpattern == null) ? null : SafeEncoder.encode(bpattern);
         onPUnsubscribe(strpattern, subscribedChannels);
-      } else if (Arrays.equals(PONG.raw, resp)) {
+      } else if (Arrays.equals(PONG.getRaw(), resp)) {
         final byte[] bpattern = (byte[]) reply.get(1);
         final String strpattern = (bpattern == null) ? null : SafeEncoder.encode(bpattern);
         onPong(strpattern);

src/main/java/redis/clients/jedis/JedisPubSub.java

@@ -50,7 +50,7 @@ public SortingParams by(final String pattern) {
    * @return the SortingParams Object
    */
   public SortingParams by(final byte[] pattern) {
-    params.add(BY.raw);
+    params.add(BY.getRaw());
     params.add(pattern);
     return this;
   }
@@ -63,8 +63,8 @@ public SortingParams by(final byte[] pattern) {
    * @return the SortingParams Object
    */
   public SortingParams nosort() {
-    params.add(BY.raw);
-    params.add(NOSORT.raw);
+    params.add(BY.getRaw());
+    params.add(NOSORT.getRaw());
     return this;
   }
 
@@ -77,7 +77,7 @@ public Collection<byte[]> getParams() {
    * @return the sortingParams Object
    */
   public SortingParams desc() {
-    params.add(DESC.raw);
+    params.add(DESC.getRaw());
     return this;
   }
 
@@ -86,7 +86,7 @@ public SortingParams desc() {
    * @return the SortingParams Object
    */
   public SortingParams asc() {
-    params.add(ASC.raw);
+    params.add(ASC.getRaw());
     return this;
   }
 
@@ -97,7 +97,7 @@ public SortingParams asc() {
    * @return the SortingParams Object
    */
   public SortingParams limit(final int start, final int count) {
-    params.add(LIMIT.raw);
+    params.add(LIMIT.getRaw());
     params.add(Protocol.toByteArray(start));
     params.add(Protocol.toByteArray(count));
     return this;
@@ -109,7 +109,7 @@ public SortingParams limit(final int start, final int count) {
    * @return the SortingParams Object
    */
   public SortingParams alpha() {
-    params.add(ALPHA.raw);
+    params.add(ALPHA.getRaw());
     return this;
   }
 
@@ -129,7 +129,7 @@ public SortingParams alpha() {
    */
   public SortingParams get(String... patterns) {
     for (final String pattern : patterns) {
-      params.add(GET.raw);
+      params.add(GET.getRaw());
       params.add(SafeEncoder.encode(pattern));
     }
     return this;
@@ -151,7 +151,7 @@ public SortingParams get(String... patterns) {
    */
   public SortingParams get(byte[]... patterns) {
     for (final byte[] pattern : patterns) {
-      params.add(GET.raw);
+      params.add(GET.getRaw());
       params.add(pattern);
     }
     return this;

src/main/java/redis/clients/jedis/SortingParams.java

@@ -11,9 +11,9 @@
  */
 public class StreamConsumersInfo {
 
-  public final static String NAME = "name";
-  public final static String IDLE = "idle";
-  public final static String PENDING = "pending";
+  public static final String NAME = "name";
+  public static final String IDLE = "idle";
+  public static final String PENDING = "pending";
 
   private final String name;
   private final long idle;

src/main/java/redis/clients/jedis/StreamConsumersInfo.java

@@ -14,11 +14,19 @@ public class ZParams {
   public enum Aggregate {
     SUM, MIN, MAX;
 
+    /**
+     * @deprecated This will be private in future. Use {@link #getRaw()}.
+     */
+    @Deprecated
     public final byte[] raw;
 
     Aggregate() {
       raw = SafeEncoder.encode(name());
     }
+    
+    public byte[] getRaw() {
+      return raw;
+    }
   }
 
   private final List<byte[]> params = new ArrayList<>();
@@ -29,7 +37,7 @@ public enum Aggregate {
    * @return 
    */
   public ZParams weights(final double... weights) {
-    params.add(WEIGHTS.raw);
+    params.add(WEIGHTS.getRaw());
     for (final double weight : weights) {
       params.add(Protocol.toByteArray(weight));
     }
@@ -42,7 +50,7 @@ public Collection<byte[]> getParams() {
   }
 
   public ZParams aggregate(final Aggregate aggregate) {
-    params.add(AGGREGATE.raw);
+    params.add(AGGREGATE.getRaw());
     params.add(aggregate.raw);
     return this;
   }

src/main/java/redis/clients/jedis/ZParams.java

@@ -1,6 +1,7 @@
 package redis.clients.jedis.params;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -92,10 +93,8 @@ public byte[][] getByteKeys(byte[] key) {
     }
 
     public byte[][] getByteParams(byte[]... args) {
-        ArrayList<byte[]> byteParams = new ArrayList<byte[]>();
-        for (byte[] arg : args) {
-            byteParams.add(arg);
-        }
+        ArrayList<byte[]> byteParams = new ArrayList<>();
+        Collections.addAll(byteParams, args);
 
         if (contains(STORE)) {
             byteParams.add(SafeEncoder.encode(STORE));

src/main/java/redis/clients/jedis/params/GeoRadiusStoreParam.java

@@ -104,31 +104,22 @@ public void returnResourceShouldResetState() {
     GenericObjectPoolConfig config = new GenericObjectPoolConfig();
     config.setMaxTotal(1);
     config.setBlockWhenExhausted(false);
-    JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
-        "foobared", 2);
-
-    Jedis jedis = pool.getResource();
-    Jedis jedis2 = null;
-
-    try {
-      jedis.set("hello", "jedis");
-      Transaction t = jedis.multi();
-      t.set("hello", "world");
-      jedis.close();
-
-      jedis2 = pool.getResource();
-
-      assertSame(jedis, jedis2);
-      assertEquals("jedis", jedis2.get("hello"));
-    } catch (JedisConnectionException e) {
-      if (jedis2 != null) {
-        jedis2 = null;
+    try ( JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000,
+        "foobared", 2)){
+      
+      Jedis jedis = null;
+      try(Jedis jedis1 = pool.getResource()){
+        jedis = jedis1;
+        jedis1.set("hello", "jedis");
+        Transaction t = jedis1.multi();
+        t.set("hello", "world");
       }
-    } finally {
-      jedis2.close();
 
-      pool.destroy();
-    }
+      try(Jedis jedis2 = pool.getResource()){
+        assertSame(jedis, jedis2);
+        assertEquals("jedis", jedis2.get("hello"));
+      }     
+    } 
   }
 
   @Test