Skip to content

Commit e5a1011

Browse files
christophstroblmp911de
authored andcommitted
Add Nullable annotation to parameter of overridden equals method.
Closes: #2450 Original pull request: #2451
1 parent 505009b commit e5a1011

Some content is hidden

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

47 files changed

+85
-56
lines changed

src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.time.Instant;
1919
import java.util.concurrent.TimeUnit;
2020

21+
import org.springframework.lang.Nullable;
2122
import org.springframework.util.ObjectUtils;
2223

2324
/**
@@ -112,7 +113,7 @@ public Instant getLastReset() {
112113
}
113114

114115
@Override
115-
public boolean equals(Object o) {
116+
public boolean equals(@Nullable Object o) {
116117

117118
if (this == o) {
118119
return true;

src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public Iterator<BitFieldSubCommand> iterator() {
147147
}
148148

149149
@Override
150-
public boolean equals(Object o) {
150+
public boolean equals(@Nullable Object o) {
151151
if (this == o) {
152152
return true;
153153
}
@@ -432,7 +432,7 @@ public String toString() {
432432
}
433433

434434
@Override
435-
public boolean equals(Object o) {
435+
public boolean equals(@Nullable Object o) {
436436

437437
if (this == o) {
438438
return true;
@@ -544,7 +544,7 @@ public String asString() {
544544
}
545545

546546
@Override
547-
public boolean equals(Object o) {
547+
public boolean equals(@Nullable Object o) {
548548

549549
if (this == o) {
550550
return true;
@@ -592,7 +592,7 @@ public Offset getOffset() {
592592
}
593593

594594
@Override
595-
public boolean equals(Object o) {
595+
public boolean equals(@Nullable Object o) {
596596

597597
if (this == o) {
598598
return true;
@@ -676,7 +676,7 @@ public long getValue() {
676676
}
677677

678678
@Override
679-
public boolean equals(Object o) {
679+
public boolean equals(@Nullable Object o) {
680680
if (this == o) {
681681
return true;
682682
}
@@ -827,7 +827,7 @@ public enum Overflow {
827827
}
828828

829829
@Override
830-
public boolean equals(Object o) {
830+
public boolean equals(@Nullable Object o) {
831831

832832
if (this == o) {
833833
return true;

src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ public int getPosition() {
678678
}
679679

680680
@Override
681-
public boolean equals(Object o) {
681+
public boolean equals(@Nullable Object o) {
682682
if (this == o)
683683
return true;
684684
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/DefaultStringTuple.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.springframework.data.redis.connection.StringRedisConnection.StringTuple;
2121
import org.springframework.data.redis.connection.zset.DefaultTuple;
2222
import org.springframework.data.redis.connection.zset.Tuple;
23+
import org.springframework.lang.Nullable;
2324
import org.springframework.util.ObjectUtils;
2425

2526
/**
@@ -78,7 +79,7 @@ public String toString() {
7879
}
7980

8081
@Override
81-
public boolean equals(Object o) {
82+
public boolean equals(@Nullable Object o) {
8283
if (this == o)
8384
return true;
8485
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public O getOutput() {
366366
}
367367

368368
@Override
369-
public boolean equals(Object o) {
369+
public boolean equals(@Nullable Object o) {
370370
if (this == o)
371371
return true;
372372
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/ReactiveSubscription.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.redis.connection;
1717

18+
import org.springframework.lang.Nullable;
1819
import reactor.core.publisher.Flux;
1920
import reactor.core.publisher.Mono;
2021

@@ -186,7 +187,7 @@ public M getMessage() {
186187
}
187188

188189
@Override
189-
public boolean equals(Object o) {
190+
public boolean equals(@Nullable Object o) {
190191
if (this == o)
191192
return true;
192193
if (o == null || getClass() != o.getClass())
@@ -252,7 +253,7 @@ public P getPattern() {
252253
}
253254

254255
@Override
255-
public boolean equals(Object o) {
256+
public boolean equals(@Nullable Object o) {
256257
if (this == o)
257258
return true;
258259
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void setPassword(RedisPassword password) {
199199
}
200200

201201
@Override
202-
public boolean equals(Object o) {
202+
public boolean equals(@Nullable Object o) {
203203
if (this == o) {
204204
return true;
205205
}

src/main/java/org/springframework/data/redis/connection/RedisNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public int hashCode() {
269269
}
270270

271271
@Override
272-
public boolean equals(Object obj) {
272+
public boolean equals(@Nullable Object obj) {
273273

274274
if (this == obj) {
275275
return true;

src/main/java/org/springframework/data/redis/connection/RedisPassword.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public String toString() {
144144
}
145145

146146
@Override
147-
public boolean equals(Object o) {
147+
public boolean equals(@Nullable Object o) {
148148

149149
if (this == o)
150150
return true;

src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public RedisPassword getSentinelPassword() {
265265
}
266266

267267
@Override
268-
public boolean equals(Object o) {
268+
public boolean equals(@Nullable Object o) {
269269
if (this == o) {
270270
return true;
271271
}

src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void setPassword(RedisPassword password) {
104104
}
105105

106106
@Override
107-
public boolean equals(Object o) {
107+
public boolean equals(@Nullable Object o) {
108108
if (this == o) {
109109
return true;
110110
}

src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void setPassword(RedisPassword password) {
129129
}
130130

131131
@Override
132-
public boolean equals(Object o) {
132+
public boolean equals(@Nullable Object o) {
133133
if (this == o) {
134134
return true;
135135
}

src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public List<RedisStandaloneConfiguration> getNodes() {
155155
}
156156

157157
@Override
158-
public boolean equals(Object o) {
158+
public boolean equals(@Nullable Object o) {
159159
if (this == o) {
160160
return true;
161161
}

src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public boolean hasMinId() {
242242
}
243243

244244
@Override
245-
public boolean equals(Object o) {
245+
public boolean equals(@Nullable Object o) {
246246
if (this == o) {
247247
return true;
248248
}

src/main/java/org/springframework/data/redis/connection/RedisZSetCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public boolean isEmpty() {
317317
}
318318

319319
@Override
320-
public boolean equals(Object o) {
320+
public boolean equals(@Nullable Object o) {
321321

322322
if (this == o) {
323323
return true;

src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.springframework.data.redis.connection;
1717

1818
import org.springframework.lang.NonNull;
19+
import org.springframework.lang.Nullable;
1920
import org.springframework.util.Assert;
2021
import org.springframework.util.ObjectUtils;
2122

@@ -46,7 +47,7 @@ public String toString() {
4647
}
4748

4849
@Override
49-
public boolean equals(Object o) {
50+
public boolean equals(@Nullable Object o) {
5051
if (this == o) {
5152
return true;
5253
}

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ public String name() {
14421442
}
14431443

14441444
@Override
1445-
public boolean equals(Object o) {
1445+
public boolean equals(@Nullable Object o) {
14461446

14471447
if (this == o) {
14481448
return true;

src/main/java/org/springframework/data/redis/connection/stream/Consumer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.redis.connection.stream;
1717

18+
import org.springframework.lang.Nullable;
1819
import org.springframework.util.Assert;
1920
import org.springframework.util.ObjectUtils;
2021

@@ -64,7 +65,7 @@ public String getName() {
6465
}
6566

6667
@Override
67-
public boolean equals(Object o) {
68+
public boolean equals(@Nullable Object o) {
6869
if (this == o)
6970
return true;
7071
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/stream/ReadOffset.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.redis.connection.stream;
1717

18+
import org.springframework.lang.Nullable;
1819
import org.springframework.util.Assert;
1920
import org.springframework.util.ObjectUtils;
2021

@@ -81,7 +82,7 @@ public String getOffset() {
8182
}
8283

8384
@Override
84-
public boolean equals(Object o) {
85+
public boolean equals(@Nullable Object o) {
8586

8687
if (this == o)
8788
return true;

src/main/java/org/springframework/data/redis/connection/stream/RecordId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private Long value(int index) {
154154
}
155155

156156
@Override
157-
public boolean equals(Object o) {
157+
public boolean equals(@Nullable Object o) {
158158
if (this == o)
159159
return true;
160160
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/stream/StreamOffset.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.redis.connection.stream;
1717

18+
import org.springframework.lang.Nullable;
1819
import org.springframework.util.Assert;
1920
import org.springframework.util.ObjectUtils;
2021

@@ -101,7 +102,7 @@ public String toString() {
101102
}
102103

103104
@Override
104-
public boolean equals(Object o) {
105+
public boolean equals(@Nullable Object o) {
105106

106107
if (this == o)
107108
return true;

src/main/java/org/springframework/data/redis/connection/stream/StreamReadOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public String toString() {
131131
}
132132

133133
@Override
134-
public boolean equals(Object o) {
134+
public boolean equals(@Nullable Object o) {
135135
if (this == o)
136136
return true;
137137
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/stream/StreamRecords.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public String toString() {
280280
}
281281

282282
@Override
283-
public boolean equals(Object o) {
283+
public boolean equals(@Nullable Object o) {
284284

285285
if (o == null) {
286286
return false;
@@ -430,7 +430,7 @@ public String toString() {
430430
}
431431

432432
@Override
433-
public boolean equals(Object o) {
433+
public boolean equals(@Nullable Object o) {
434434
if (this == o)
435435
return true;
436436
if (o == null || getClass() != o.getClass())

src/main/java/org/springframework/data/redis/connection/util/ByteArrayWrapper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import java.util.Arrays;
1919

20+
import org.springframework.lang.Nullable;
21+
2022
/**
2123
* Simple wrapper class used for wrapping arrays so they can be used as keys inside maps.
2224
*
@@ -32,7 +34,7 @@ public ByteArrayWrapper(byte[] array) {
3234
this.hashCode = Arrays.hashCode(array);
3335
}
3436

35-
public boolean equals(Object obj) {
37+
public boolean equals(@Nullable Object obj) {
3638
if (obj instanceof ByteArrayWrapper) {
3739
return Arrays.equals(array, ((ByteArrayWrapper) obj).array);
3840
}

src/main/java/org/springframework/data/redis/connection/zset/DefaultTuple.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import java.util.Arrays;
1919

20+
import org.springframework.lang.Nullable;
21+
2022
/**
2123
* Default implementation for {@link Tuple} interface.
2224
*
@@ -48,7 +50,7 @@ public byte[] getValue() {
4850
return value;
4951
}
5052

51-
public boolean equals(Object obj) {
53+
public boolean equals(@Nullable Object obj) {
5254
if (this == obj)
5355
return true;
5456
if (obj == null)

src/main/java/org/springframework/data/redis/connection/zset/Weights.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.stream.DoubleStream;
2525
import java.util.stream.IntStream;
2626

27+
import org.springframework.lang.Nullable;
2728
import org.springframework.util.Assert;
2829
import org.springframework.util.ObjectUtils;
2930

@@ -144,7 +145,7 @@ public List<Double> toList() {
144145
}
145146

146147
@Override
147-
public boolean equals(Object o) {
148+
public boolean equals(@Nullable Object o) {
148149

149150
if (this == o) {
150151
return true;

src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public int hashCode() {
5959
return result;
6060
}
6161

62-
public boolean equals(Object obj) {
62+
public boolean equals(@Nullable Object obj) {
6363
if (this == obj)
6464
return true;
6565
if (obj == null)

0 commit comments

Comments
 (0)