Skip to content

Commit 81c0195

Browse files
authored
GH-4054: Fix missing Nullable in deserialize methods
Fixes #4054 Signed-off-by: Soby Chacko <[email protected]>
1 parent c14786a commit 81c0195

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingByTopicDeserializer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import org.apache.kafka.common.header.Headers;
2424
import org.apache.kafka.common.serialization.Deserializer;
25+
import org.jspecify.annotations.Nullable;
2526

2627
/**
2728
* A {@link Deserializer} that delegates to other deserializers based on the topic name.
@@ -74,12 +75,12 @@ public Object deserialize(String topic, byte[] data) {
7475
}
7576

7677
@Override
77-
public Object deserialize(String topic, Headers headers, byte[] data) {
78+
public @Nullable Object deserialize(String topic, Headers headers, byte[] data) {
7879
return findDelegate(topic).deserialize(topic, headers, data);
7980
}
8081

8182
@Override
82-
public Object deserialize(String topic, Headers headers, ByteBuffer data) {
83+
public @Nullable Object deserialize(String topic, Headers headers, ByteBuffer data) {
8384
return findDelegate(topic).deserialize(topic, headers, data);
8485
}
8586

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ public Object deserialize(String topic, byte[] data) {
167167
}
168168

169169
@Override
170-
public Object deserialize(String topic, Headers headers, byte[] data) {
170+
public @Nullable Object deserialize(String topic, Headers headers, byte[] data) {
171171
Deserializer<?> deserializer = getDeserializerByHeaders(headers);
172172
return deserializer == null ? data : deserializer.deserialize(topic, headers, data);
173173
}
174174

175175
@Override
176-
public Object deserialize(String topic, Headers headers, ByteBuffer data) {
176+
public @Nullable Object deserialize(String topic, Headers headers, ByteBuffer data) {
177177
Deserializer<?> deserializer = getDeserializerByHeaders(headers);
178178
return deserializer == null ? data : deserializer.deserialize(topic, headers, data);
179179
}

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/RetryingDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ public void configure(Map<String, ?> configs, boolean isKey) {
6868
}
6969

7070
@Override
71-
public T deserialize(String topic, byte[] data) {
71+
public @Nullable T deserialize(String topic, byte[] data) {
7272
return this.retryOperations.execute(context -> this.delegate.deserialize(topic, data), this.recoveryCallback);
7373
}
7474

7575
@Override
76-
public T deserialize(String topic, Headers headers, byte[] data) {
76+
public @Nullable T deserialize(String topic, Headers headers, byte[] data) {
7777
return this.retryOperations.execute(context -> this.delegate.deserialize(topic, headers, data), this.recoveryCallback);
7878
}
7979

8080
@Override
81-
public T deserialize(String topic, Headers headers, ByteBuffer data) {
81+
public @Nullable T deserialize(String topic, Headers headers, ByteBuffer data) {
8282
return this.retryOperations.execute(context -> this.delegate.deserialize(topic, headers, data), this.recoveryCallback);
8383
}
8484

0 commit comments

Comments
 (0)