Skip to content

Commit d3be969

Browse files
authored
Merge 83a9fd0 into 47df10e
2 parents 47df10e + 83a9fd0 commit d3be969

55 files changed

Lines changed: 1789 additions & 4 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/redis/clients/jedis/args/RawableFactory.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@ public Raw(byte[] raw) {
6161
public byte[] getRaw() {
6262
return raw;
6363
}
64+
65+
@Override
66+
public boolean equals(Object o) {
67+
if (this == o) return true;
68+
if (o == null || getClass() != o.getClass()) return false;
69+
Raw raw1 = (Raw) o;
70+
return Arrays.equals(raw, raw1.raw);
71+
}
72+
73+
@Override
74+
public int hashCode() {
75+
return Arrays.hashCode(raw);
76+
}
6477
}
6578

6679
/**

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.args.BitCountOption;
55

6+
import java.util.Objects;
7+
68
public class BitPosParams implements IParams {
79

810
private Long start;
@@ -62,4 +64,17 @@ public void addParams(CommandArguments args) {
6264
}
6365
}
6466
}
67+
68+
@Override
69+
public boolean equals(Object o) {
70+
if (this == o) return true;
71+
if (o == null || getClass() != o.getClass()) return false;
72+
BitPosParams that = (BitPosParams) o;
73+
return Objects.equals(start, that.start) && Objects.equals(end, that.end) && Objects.equals(modifier, that.modifier);
74+
}
75+
76+
@Override
77+
public int hashCode() {
78+
return Objects.hash(start, end, modifier);
79+
}
6580
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package redis.clients.jedis.params;
22

33
import java.util.ArrayList;
4+
import java.util.Objects;
45

56
import redis.clients.jedis.CommandArguments;
67
import redis.clients.jedis.Protocol.Keyword;
@@ -81,4 +82,17 @@ public ClientKillParams maxAge(long maxAge) {
8182
public void addParams(CommandArguments args) {
8283
params.forEach(kv -> args.add(kv.getKey()).add(kv.getValue()));
8384
}
85+
86+
@Override
87+
public boolean equals(Object o) {
88+
if (this == o) return true;
89+
if (o == null || getClass() != o.getClass()) return false;
90+
ClientKillParams that = (ClientKillParams) o;
91+
return Objects.equals(params, that.params);
92+
}
93+
94+
@Override
95+
public int hashCode() {
96+
return Objects.hash(params);
97+
}
8498
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Objects;
7+
68
public class CommandListFilterByParams implements IParams {
79

810
private String moduleName;
@@ -46,4 +48,17 @@ public void addParams(CommandArguments args) {
4648
+ getClass().getSimpleName());
4749
}
4850
}
51+
52+
@Override
53+
public boolean equals(Object o) {
54+
if (this == o) return true;
55+
if (o == null || getClass() != o.getClass()) return false;
56+
CommandListFilterByParams that = (CommandListFilterByParams) o;
57+
return Objects.equals(moduleName, that.moduleName) && Objects.equals(category, that.category) && Objects.equals(pattern, that.pattern);
58+
}
59+
60+
@Override
61+
public int hashCode() {
62+
return Objects.hash(moduleName, category, pattern);
63+
}
4964
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import redis.clients.jedis.HostAndPort;
55
import redis.clients.jedis.Protocol.Keyword;
66

7+
import java.util.Objects;
8+
79
public class FailoverParams implements IParams {
810

911
private HostAndPort to;
@@ -59,4 +61,17 @@ public void addParams(CommandArguments args) {
5961
}
6062

6163
}
64+
65+
@Override
66+
public boolean equals(Object o) {
67+
if (this == o) return true;
68+
if (o == null || getClass() != o.getClass()) return false;
69+
FailoverParams that = (FailoverParams) o;
70+
return force == that.force && Objects.equals(to, that.to) && Objects.equals(timeout, that.timeout);
71+
}
72+
73+
@Override
74+
public int hashCode() {
75+
return Objects.hash(to, force, timeout);
76+
}
6277
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Objects;
7+
68
public class GeoAddParams implements IParams {
79

810
private boolean nx = false;
@@ -57,4 +59,16 @@ public void addParams(CommandArguments args) {
5759
}
5860
}
5961

62+
@Override
63+
public boolean equals(Object o) {
64+
if (this == o) return true;
65+
if (o == null || getClass() != o.getClass()) return false;
66+
GeoAddParams that = (GeoAddParams) o;
67+
return nx == that.nx && xx == that.xx && ch == that.ch;
68+
}
69+
70+
@Override
71+
public int hashCode() {
72+
return Objects.hash(nx, xx, ch);
73+
}
6074
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Objects;
7+
68
public class GetExParams implements IParams {
79

810
private Keyword expiration;
@@ -74,4 +76,17 @@ public void addParams(CommandArguments args) {
7476
}
7577
}
7678
}
79+
80+
@Override
81+
public boolean equals(Object o) {
82+
if (this == o) return true;
83+
if (o == null || getClass() != o.getClass()) return false;
84+
GetExParams that = (GetExParams) o;
85+
return persist == that.persist && expiration == that.expiration && Objects.equals(expirationValue, that.expirationValue);
86+
}
87+
88+
@Override
89+
public int hashCode() {
90+
return Objects.hash(expiration, expirationValue, persist);
91+
}
7792
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Objects;
7+
68
public class LCSParams implements IParams {
79

810
private boolean len = false;
@@ -65,4 +67,17 @@ public void addParams(CommandArguments args) {
6567
args.add(Keyword.WITHMATCHLEN);
6668
}
6769
}
70+
71+
@Override
72+
public boolean equals(Object o) {
73+
if (this == o) return true;
74+
if (o == null || getClass() != o.getClass()) return false;
75+
LCSParams lcsParams = (LCSParams) o;
76+
return len == lcsParams.len && idx == lcsParams.idx && withMatchLen == lcsParams.withMatchLen && Objects.equals(minMatchLen, lcsParams.minMatchLen);
77+
}
78+
79+
@Override
80+
public int hashCode() {
81+
return Objects.hash(len, idx, minMatchLen, withMatchLen);
82+
}
6883
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Objects;
7+
68
public class LPosParams implements IParams {
79

810
private Integer rank;
@@ -33,4 +35,16 @@ public void addParams(CommandArguments args) {
3335
}
3436
}
3537

38+
@Override
39+
public boolean equals(Object o) {
40+
if (this == o) return true;
41+
if (o == null || getClass() != o.getClass()) return false;
42+
LPosParams that = (LPosParams) o;
43+
return Objects.equals(rank, that.rank) && Objects.equals(maxlen, that.maxlen);
44+
}
45+
46+
@Override
47+
public int hashCode() {
48+
return Objects.hash(rank, maxlen);
49+
}
3650
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import redis.clients.jedis.CommandArguments;
44
import redis.clients.jedis.Protocol.Keyword;
55

6+
import java.util.Arrays;
7+
import java.util.Objects;
8+
69
public class LolwutParams implements IParams {
710

811
private Integer version;
@@ -33,4 +36,19 @@ public void addParams(CommandArguments args) {
3336
}
3437
}
3538
}
39+
40+
@Override
41+
public boolean equals(Object o) {
42+
if (this == o) return true;
43+
if (o == null || getClass() != o.getClass()) return false;
44+
LolwutParams that = (LolwutParams) o;
45+
return Objects.equals(version, that.version) && Arrays.equals(opargs, that.opargs);
46+
}
47+
48+
@Override
49+
public int hashCode() {
50+
int result = Objects.hash(version);
51+
result = 31 * result + Arrays.hashCode(opargs);
52+
return result;
53+
}
3654
}

0 commit comments

Comments
 (0)