Skip to content

Commit acabc61

Browse files
GH-10083: Apply Nullability to stream module
Related to: #10083 * Use `@Nullable` on `ByteStreamReadingMessageSource.doReceive()` return type Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent bb62eca commit acabc61

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.util.concurrent.locks.Lock;
2323
import java.util.concurrent.locks.ReentrantLock;
2424

25+
import org.jspecify.annotations.Nullable;
26+
2527
import org.springframework.integration.endpoint.AbstractMessageSource;
2628
import org.springframework.messaging.MessagingException;
2729

@@ -73,7 +75,7 @@ public String getComponentType() {
7375
}
7476

7577
@Override
76-
protected byte[] doReceive() {
78+
protected byte @Nullable [] doReceive() {
7779
try {
7880
byte[] bytes;
7981
int bytesRead = 0;

spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.concurrent.locks.Lock;
2525
import java.util.concurrent.locks.ReentrantLock;
2626

27+
import org.jspecify.annotations.Nullable;
28+
2729
import org.springframework.context.ApplicationEventPublisher;
2830
import org.springframework.context.ApplicationEventPublisherAware;
2931
import org.springframework.integration.endpoint.AbstractMessageSource;
@@ -48,7 +50,7 @@ public class CharacterStreamReadingMessageSource extends AbstractMessageSource<S
4850

4951
private final boolean blockToDetectEOF;
5052

51-
private ApplicationEventPublisher applicationEventPublisher;
53+
private @Nullable ApplicationEventPublisher applicationEventPublisher;
5254

5355
/**
5456
* Construct an instance with the provider reader.
@@ -116,7 +118,7 @@ public String getComponentType() {
116118
}
117119

118120
@Override
119-
public String doReceive() {
121+
public @Nullable String doReceive() {
120122
try {
121123
this.lock.lock();
122124
try {

spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.io.UnsupportedEncodingException;
2525
import java.io.Writer;
2626

27+
import org.jspecify.annotations.Nullable;
28+
2729
import org.springframework.integration.handler.AbstractMessageHandler;
2830
import org.springframework.messaging.Message;
2931
import org.springframework.messaging.MessagingException;
@@ -80,7 +82,7 @@ public static CharacterStreamWritingMessageHandler stdout() {
8082
* @param charsetName The charset name.
8183
* @return A stdout handler.
8284
*/
83-
public static CharacterStreamWritingMessageHandler stdout(String charsetName) {
85+
public static CharacterStreamWritingMessageHandler stdout(@Nullable String charsetName) {
8486
return createTargetForStream(System.out, charsetName);
8587
}
8688

@@ -101,11 +103,11 @@ public static CharacterStreamWritingMessageHandler stderr() {
101103
* @param charsetName The charset name.
102104
* @return A stderr handler.
103105
*/
104-
public static CharacterStreamWritingMessageHandler stderr(String charsetName) {
106+
public static CharacterStreamWritingMessageHandler stderr(@Nullable String charsetName) {
105107
return createTargetForStream(System.err, charsetName);
106108
}
107109

108-
private static CharacterStreamWritingMessageHandler createTargetForStream(OutputStream stream, String charsetName) {
110+
private static CharacterStreamWritingMessageHandler createTargetForStream(OutputStream stream, @Nullable String charsetName) {
109111
if (charsetName == null) {
110112
return new CharacterStreamWritingMessageHandler(new OutputStreamWriter(stream));
111113
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/**
22
* Provides classes for configuration - parsers, namespace handlers.
33
*/
4+
@org.jspecify.annotations.NullMarked
45
package org.springframework.integration.stream.config;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/**
22
* Base package for stream support.
33
*/
4+
@org.jspecify.annotations.NullMarked
45
package org.springframework.integration.stream;

0 commit comments

Comments
 (0)