Address Javadoc warnings (and related changes) (#2730)

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

@@ -277,11 +277,6 @@ public List<byte[]> getBinaryMultiBulkReply() {
     return (List<byte[]>) readProtocolWithCheckingBroken();
   }
 
-  @Deprecated
-  public List<Object> getRawObjectMultiBulkReply() {
-    return getUnflushedObjectMultiBulkReply();
-  }
-
   @SuppressWarnings("unchecked")
   public List<Object> getUnflushedObjectMultiBulkReply() {
     return (List<Object>) readProtocolWithCheckingBroken();

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

@@ -90,7 +90,6 @@ public List<Object> syncAndReturnAll() {
     }
   }
 
-  @Deprecated
   public final boolean hasPipelinedResponse() {
     return getPipelinedResponseLength() > 0;
   }

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

@@ -256,7 +256,6 @@ public String sentinelMyId() {
    *    24) "2"
    *
    * </pre>
-   * @return
    */
   @Override
   public List<Map<String, String>> sentinelMasters() {
@@ -299,7 +298,6 @@ public List<String> sentinelGetMasterAddrByName(String masterName) {
    * (integer) 1
    * </pre>
    * @param pattern
-   * @return
    */
   @Override
   public Long sentinelReset(String pattern) {
@@ -340,7 +338,6 @@ public Long sentinelReset(String pattern) {
    *    28) "100"
    * </pre>
    * @param masterName
-   * @return
    */
   @Override
   public List<Map<String, String>> sentinelSlaves(String masterName) {

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

@@ -27,9 +27,6 @@ public ScanParams match(final byte[] pattern) {
 
   /**
    * @see <a href="https://redis.io/commands/scan#the-match-option">MATCH option in Redis documentation</a>
-   * 
-   * @param pattern
-   * @return
    */
   public ScanParams match(final String pattern) {
     params.put(MATCH, ByteBuffer.wrap(SafeEncoder.encode(pattern)));
@@ -38,9 +35,6 @@ public ScanParams match(final String pattern) {
 
   /**
    * @see <a href="https://redis.io/commands/scan#the-count-option">COUNT option in Redis documentation</a>
-   * 
-   * @param count
-   * @return
    */
   public ScanParams count(final Integer count) {
     params.put(COUNT, ByteBuffer.wrap(Protocol.toByteArray(count)));

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

@@ -22,17 +22,6 @@ public static SetParams setParams() {
     return new SetParams();
   }
 
-  /**
-   * Set the specified expire time, in seconds.
-   * @param secondsToExpire
-   * @return SetParams
-   * @deprecated Use {@link #ex(long)}.
-   */
-  @Deprecated
-  public SetParams ex(int secondsToExpire) {
-    return ex((long) secondsToExpire);
-  }
-
   /**
    * Set the specified expire time, in seconds.
    * @param secondsToExpire

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

@@ -18,7 +18,7 @@
 import redis.clients.jedis.util.SafeEncoder;
 
 /**
- * Builder Class for {@link Jedis#sort(String, SortingParams) SORT} Parameters.
+ * Builder Class for {@code SORT} command parameters.
  */
 public class SortingParams implements IParams {
   private final List<byte[]> params = new ArrayList<>();

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

@@ -7,48 +7,41 @@
 import java.util.List;
 
 import redis.clients.jedis.CommandArguments;
-import redis.clients.jedis.Protocol;
+import redis.clients.jedis.args.Rawable;
 import redis.clients.jedis.util.SafeEncoder;
 
 public class ZParams implements IParams {
 
-  public enum Aggregate {
+  public enum Aggregate implements Rawable {
+
     SUM, MIN, MAX;
 
-    /**
-     * @deprecated This will be private in future. Use {@link #getRaw()}.
-     */
-    @Deprecated
-    public final byte[] raw;
+    private final byte[] raw;
 
-    Aggregate() {
+    private Aggregate() {
       raw = SafeEncoder.encode(name());
     }
 
+    @Override
     public byte[] getRaw() {
       return raw;
     }
   }
 
-  private final List<byte[]> params = new ArrayList<>();
+  private final List<Object> params = new ArrayList<>();
 
-  /**
-   * Set weights.
-   * @param weights weights.
-   * @return
-   */
   public ZParams weights(final double... weights) {
-    params.add(WEIGHTS.getRaw());
+    params.add(WEIGHTS);
     for (final double weight : weights) {
-      params.add(Protocol.toByteArray(weight));
+      params.add(weight);
     }
 
     return this;
   }
 
   public ZParams aggregate(final Aggregate aggregate) {
-    params.add(AGGREGATE.getRaw());
-    params.add(aggregate.raw);
+    params.add(AGGREGATE);
+    params.add(aggregate);
     return this;
   }