SetParams should implement equals and hashcode issue #2687 (#3728)

redis · Mar 25, 2024 · b530804 · b530804
1 parent 89b1ac4
commit b530804
Show file tree

Hide file tree

Showing 55 changed files with 1,788 additions and 4 deletions.
diff --git a/src/main/java/redis/clients/jedis/args/RawableFactory.java b/src/main/java/redis/clients/jedis/args/RawableFactory.java
@@ -61,6 +61,18 @@ public Raw(byte[] raw) {
     public byte[] getRaw() {
       return raw;
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      return Arrays.equals(raw, ((Raw) o).raw);
+    }
+
+    @Override
+    public int hashCode() {
+      return Arrays.hashCode(raw);
+    }
   }
 
   /**

diff --git a/src/main/java/redis/clients/jedis/params/BitPosParams.java b/src/main/java/redis/clients/jedis/params/BitPosParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.args.BitCountOption;
 
+import java.util.Objects;
+
 public class BitPosParams implements IParams {
 
   private Long start;
@@ -62,4 +64,17 @@ public void addParams(CommandArguments args) {
       }
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    BitPosParams that = (BitPosParams) o;
+    return Objects.equals(start, that.start) && Objects.equals(end, that.end) && Objects.equals(modifier, that.modifier);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(start, end, modifier);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/ClientKillParams.java b/src/main/java/redis/clients/jedis/params/ClientKillParams.java
@@ -1,6 +1,7 @@
 package redis.clients.jedis.params;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
@@ -81,4 +82,17 @@ public ClientKillParams maxAge(long maxAge) {
   public void addParams(CommandArguments args) {
     params.forEach(kv -> args.add(kv.getKey()).add(kv.getValue()));
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ClientKillParams that = (ClientKillParams) o;
+    return Objects.equals(params, that.params);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(params);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/CommandListFilterByParams.java b/src/main/java/redis/clients/jedis/params/CommandListFilterByParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class CommandListFilterByParams implements IParams {
 
   private String moduleName;
@@ -46,4 +48,17 @@ public void addParams(CommandArguments args) {
           + getClass().getSimpleName());
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CommandListFilterByParams that = (CommandListFilterByParams) o;
+    return Objects.equals(moduleName, that.moduleName) && Objects.equals(category, that.category) && Objects.equals(pattern, that.pattern);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(moduleName, category, pattern);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/FailoverParams.java b/src/main/java/redis/clients/jedis/params/FailoverParams.java
@@ -4,6 +4,8 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class FailoverParams implements IParams {
 
   private HostAndPort to;
@@ -59,4 +61,17 @@ public void addParams(CommandArguments args) {
     }
 
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    FailoverParams that = (FailoverParams) o;
+    return force == that.force && Objects.equals(to, that.to) && Objects.equals(timeout, that.timeout);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(to, force, timeout);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/GeoAddParams.java b/src/main/java/redis/clients/jedis/params/GeoAddParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class GeoAddParams implements IParams {
 
   private boolean nx = false;
@@ -57,4 +59,16 @@ public void addParams(CommandArguments args) {
     }
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    GeoAddParams that = (GeoAddParams) o;
+    return nx == that.nx && xx == that.xx && ch == that.ch;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(nx, xx, ch);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/GetExParams.java b/src/main/java/redis/clients/jedis/params/GetExParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class GetExParams implements IParams {
 
   private Keyword expiration;
@@ -74,4 +76,17 @@ public void addParams(CommandArguments args) {
       }
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    GetExParams that = (GetExParams) o;
+    return persist == that.persist && expiration == that.expiration && Objects.equals(expirationValue, that.expirationValue);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(expiration, expirationValue, persist);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/LCSParams.java b/src/main/java/redis/clients/jedis/params/LCSParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class LCSParams implements IParams {
 
   private boolean len = false;
@@ -65,4 +67,17 @@ public void addParams(CommandArguments args) {
       args.add(Keyword.WITHMATCHLEN);
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    LCSParams lcsParams = (LCSParams) o;
+    return len == lcsParams.len && idx == lcsParams.idx && withMatchLen == lcsParams.withMatchLen && Objects.equals(minMatchLen, lcsParams.minMatchLen);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(len, idx, minMatchLen, withMatchLen);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/LPosParams.java b/src/main/java/redis/clients/jedis/params/LPosParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class LPosParams implements IParams {
 
   private Integer rank;
@@ -33,4 +35,16 @@ public void addParams(CommandArguments args) {
     }
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    LPosParams that = (LPosParams) o;
+    return Objects.equals(rank, that.rank) && Objects.equals(maxlen, that.maxlen);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rank, maxlen);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/LolwutParams.java b/src/main/java/redis/clients/jedis/params/LolwutParams.java
@@ -3,6 +3,9 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Arrays;
+import java.util.Objects;
+
 public class LolwutParams implements IParams {
 
   private Integer version;
@@ -33,4 +36,19 @@ public void addParams(CommandArguments args) {
       }
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    LolwutParams that = (LolwutParams) o;
+    return Objects.equals(version, that.version) && Arrays.equals(opargs, that.opargs);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = Objects.hash(version);
+    result = 31 * result + Arrays.hashCode(opargs);
+    return result;
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/MigrateParams.java b/src/main/java/redis/clients/jedis/params/MigrateParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class MigrateParams implements IParams {
 
   private boolean copy = false;
@@ -52,4 +54,17 @@ public void addParams(CommandArguments args) {
       args.add(Keyword.AUTH).add(password);
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    MigrateParams that = (MigrateParams) o;
+    return copy == that.copy && replace == that.replace && Objects.equals(username, that.username) && Objects.equals(password, that.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(copy, replace, username, password);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/ModuleLoadExParams.java b/src/main/java/redis/clients/jedis/params/ModuleLoadExParams.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
@@ -38,4 +39,17 @@ public void addParams(CommandArguments args) {
       args.add(Keyword.ARGS).addObjects(this.args);
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ModuleLoadExParams that = (ModuleLoadExParams) o;
+    return Objects.equals(configs, that.configs) && Objects.equals(args, that.args);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(configs, args);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/RestoreParams.java b/src/main/java/redis/clients/jedis/params/RestoreParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class RestoreParams implements IParams {
 
   private boolean replace;
@@ -55,4 +57,17 @@ public void addParams(CommandArguments args) {
       args.add(Keyword.FREQ).add(frequency);
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    RestoreParams that = (RestoreParams) o;
+    return replace == that.replace && absTtl == that.absTtl && Objects.equals(idleTime, that.idleTime) && Objects.equals(frequency, that.frequency);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(replace, absTtl, idleTime, frequency);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/ScanParams.java b/src/main/java/redis/clients/jedis/params/ScanParams.java
@@ -5,6 +5,7 @@
 import java.nio.ByteBuffer;
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Objects;
 
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
@@ -63,4 +64,17 @@ public String match() {
       return null;
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ScanParams that = (ScanParams) o;
+    return Objects.equals(params, that.params);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(params);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/params/SetParams.java b/src/main/java/redis/clients/jedis/params/SetParams.java
@@ -3,6 +3,8 @@
 import redis.clients.jedis.CommandArguments;
 import redis.clients.jedis.Protocol.Keyword;
 
+import java.util.Objects;
+
 public class SetParams implements IParams {
 
   private Keyword existance;
@@ -106,4 +108,18 @@ public void addParams(CommandArguments args) {
       }
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    SetParams setParams = (SetParams) o;
+    return Objects.equals(existance, setParams.existance) && Objects.equals(expiration, setParams.expiration)
+            && Objects.equals(expirationValue, setParams.expirationValue);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(existance, expiration, expirationValue);
+  }
 }