Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Nullsafe FIXMEs for MultipartStreamReader.java (#50056)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/50056

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

fbshipit-source-id: 3b621be82cd874c608cb610ba35dff0be7cbd195
This commit is contained in:
Gijs Weterings
2025-03-18 06:08:17 -07:00
committed by Facebook GitHub Bot
parent aa9dc3e924
commit b40b1e679e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
+4 -2
View File
@@ -7,7 +7,9 @@
package com.facebook.react.devsupport;
import com.facebook.infer.annotation.Nullsafe;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import okio.Buffer;
@@ -15,6 +17,7 @@ import okio.BufferedSource;
import okio.ByteString;
/** Utility class to parse the body of a response of type multipart/mixed. */
@Nullsafe(Nullsafe.Mode.LOCAL)
class MultipartStreamReader {
// Standard line separator for HTTP.
private static final String CRLF = "\r\n";
@@ -60,8 +63,7 @@ class MultipartStreamReader {
ByteString marker = ByteString.encodeUtf8(CRLF + CRLF);
long indexOfMarker = chunk.indexOf(marker);
if (indexOfMarker == -1) {
// NULLSAFE_FIXME[Parameter Not Nullable]
listener.onChunkComplete(null, chunk, done);
listener.onChunkComplete(Collections.emptyMap(), chunk, done);
} else {
Buffer headers = new Buffer();
Buffer body = new Buffer();
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.kt
+3 -3
View File
@@ -33,7 +33,7 @@ class MultipartStreamReaderTest {
val callback: CallCountTrackingChunkCallback =
object : CallCountTrackingChunkCallback() {
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
super.onChunkComplete(headers, body, done)
assertThat(done).isTrue
@@ -68,7 +68,7 @@ class MultipartStreamReaderTest {
val callback: CallCountTrackingChunkCallback =
object : CallCountTrackingChunkCallback() {
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
super.onChunkComplete(headers, body, done)
assertThat(done).isEqualTo(callCount == 3)
@@ -125,7 +125,7 @@ class MultipartStreamReaderTest {
var callCount = 0
private set
override fun onChunkComplete(headers: Map<String, String>?, body: Buffer, done: Boolean) {
override fun onChunkComplete(headers: Map<String, String>, body: Buffer, done: Boolean) {
callCount++
}