Skip to content

Commit 819c46a

Browse files
GijsWeteringsfacebook-github-bot
authored andcommitted
[skip ci] Fix Nullsafe FIXMEs for MultipartStreamReader.java (facebook#50056)
Summary: Gone trough all the FIXMEs added in the previous diff by the nullsafe tool, marked the class as nullsafe and ensured no remaining violations. Changelog: [Android][Fixed] Made MultipartStreamReader.java nullsafe Reviewed By: mdvacca Differential Revision: D71126393
1 parent ff2fe21 commit 819c46a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77

88
package com.facebook.react.devsupport;
99

10+
import com.facebook.infer.annotation.Nullsafe;
1011
import java.io.IOException;
12+
import java.util.Collections;
1113
import java.util.HashMap;
1214
import java.util.Map;
1315
import okio.Buffer;
1416
import okio.BufferedSource;
1517
import okio.ByteString;
1618

1719
/** Utility class to parse the body of a response of type multipart/mixed. */
20+
@Nullsafe(Nullsafe.Mode.LOCAL)
1821
class MultipartStreamReader {
1922
// Standard line separator for HTTP.
2023
private static final String CRLF = "\r\n";
@@ -60,8 +63,7 @@ private void emitChunk(Buffer chunk, boolean done, ChunkListener listener) throw
6063
ByteString marker = ByteString.encodeUtf8(CRLF + CRLF);
6164
long indexOfMarker = chunk.indexOf(marker);
6265
if (indexOfMarker == -1) {
63-
// NULLSAFE_FIXME[Parameter Not Nullable]
64-
listener.onChunkComplete(null, chunk, done);
66+
listener.onChunkComplete(Collections.emptyMap(), chunk, done);
6567
} else {
6668
Buffer headers = new Buffer();
6769
Buffer body = new Buffer();

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MultipartStreamReaderTest {
3333

3434
val callback: CallCountTrackingChunkCallback =
3535
object : CallCountTrackingChunkCallback() {
36-
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
36+
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
3737
super.onChunkComplete(headers, body, done)
3838

3939
assertThat(done).isTrue
@@ -68,7 +68,7 @@ class MultipartStreamReaderTest {
6868

6969
val callback: CallCountTrackingChunkCallback =
7070
object : CallCountTrackingChunkCallback() {
71-
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
71+
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
7272
super.onChunkComplete(headers, body, done)
7373

7474
assertThat(done).isEqualTo(callCount == 3)
@@ -125,7 +125,7 @@ class MultipartStreamReaderTest {
125125
var callCount = 0
126126
private set
127127

128-
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
128+
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
129129
callCount++
130130
}
131131

0 commit comments

Comments
 (0)