Skip to content

Commit 9fa3b97

Browse files
christophstroblmp911de
authored andcommitted
Add Nullable annotation to parameter of overridden equals method.
Closes: #1325 Original pull request: #1326
1 parent 6e0832e commit 9fa3b97

27 files changed

+42
-30
lines changed

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/KeyspaceActions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.List;
2020

2121
import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceActionSpecification;
22+
import org.springframework.lang.Nullable;
2223
import org.springframework.util.ObjectUtils;
2324

2425
/**
@@ -44,7 +45,7 @@ public List<KeyspaceActionSpecification> getActions() {
4445
}
4546

4647
@Override
47-
public boolean equals(Object o) {
48+
public boolean equals(@Nullable Object o) {
4849

4950
if (this == o) {
5051
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/DeleteOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public Filter getIfCondition() {
105105
}
106106

107107
@Override
108-
public boolean equals(Object o) {
108+
public boolean equals(@Nullable Object o) {
109109

110110
if (this == o) {
111111
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public boolean isInsertNulls() {
103103
}
104104

105105
@Override
106-
public boolean equals(Object o) {
106+
public boolean equals(@Nullable Object o) {
107107

108108
if (this == o) {
109109
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public boolean isIfExists() {
107107
}
108108

109109
@Override
110-
public boolean equals(Object o) {
110+
public boolean equals(@Nullable Object o) {
111111

112112
if (this == o) {
113113
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.data.convert.CustomConversions;
3333
import org.springframework.data.mapping.MappingException;
3434
import org.springframework.data.mapping.context.MappingContext;
35+
import org.springframework.lang.Nullable;
3536
import org.springframework.util.Assert;
3637

3738
import com.datastax.oss.driver.api.core.CqlIdentifier;
@@ -402,7 +403,7 @@ public void attach(@edu.umd.cs.findbugs.annotations.NonNull AttachmentPoint atta
402403
}
403404

404405
@Override
405-
public boolean equals(Object o) {
406+
public boolean equals(@Nullable Object o) {
406407
if (this == o)
407408
return true;
408409
if (!(o instanceof com.datastax.oss.driver.api.core.type.UserDefinedType))

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.io.Serializable;
1919
import java.util.regex.Pattern;
2020

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

2324
/**
@@ -237,7 +238,7 @@ public int compareTo(CqlIdentifier identifier) {
237238
* @see java.lang.Object#equals(java.lang.Object)
238239
*/
239240
@Override
240-
public boolean equals(Object o) {
241+
public boolean equals(@Nullable Object o) {
241242

242243
if (this == o)
243244
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java

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

1818
import java.util.regex.Pattern;
1919

20+
import org.springframework.lang.Nullable;
2021
import org.springframework.util.Assert;
2122

2223
import com.datastax.oss.driver.api.core.CqlIdentifier;
@@ -118,7 +119,7 @@ public int hashCode() {
118119
* equal to a {@link KeyspaceIdentifier}.
119120
*/
120121
@Override
121-
public boolean equals(Object that) {
122+
public boolean equals(@Nullable Object that) {
122123
if (this == that) {
123124
return true;
124125
}

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ protected Boolean getTracing() {
213213
}
214214

215215
@Override
216-
public boolean equals(Object o) {
216+
public boolean equals(@Nullable Object o) {
217217

218218
if (this == o) {
219219
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public Long getTimestamp() {
108108
}
109109

110110
@Override
111-
public boolean equals(Object o) {
111+
public boolean equals(@Nullable Object o) {
112112

113113
if (this == o) {
114114
return true;

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateKeyspaceSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public CreateKeyspaceSpecification with(String name, @Nullable Object value, boo
152152
}
153153

154154
@Override
155-
public boolean equals(Object o) {
155+
public boolean equals(@Nullable Object o) {
156156

157157
if (this == o) {
158158
return true;

0 commit comments

Comments
 (0)