Skip to content

Commit 5ecb107

Browse files
committed
Add nullable annotations
1 parent f6883b4 commit 5ecb107

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseFunctionsTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
package com.google.firebase.functions;
1616

1717
import static org.junit.Assert.assertEquals;
18+
import static org.junit.Assert.assertThrows;
1819

1920
import androidx.test.platform.app.InstrumentationRegistry;
2021
import androidx.test.runner.AndroidJUnit4;
2122
import com.google.firebase.FirebaseApp;
2223
import com.google.firebase.FirebaseOptions;
2324
import java.net.URL;
25+
import okhttp3.OkHttpClient;
2426
import org.junit.Test;
2527
import org.junit.runner.RunWith;
2628

27-
import okhttp3.OkHttpClient;
28-
2929
@RunWith(AndroidJUnit4.class)
3030
public class FirebaseFunctionsTest {
3131

@@ -114,6 +114,15 @@ public void testSetOkHttpClient() {
114114
assertEquals(client, functions.getOkHttpClient());
115115
}
116116

117+
@Test
118+
public void testSetOkHttpClient_throwNPE() {
119+
FirebaseApp app = getApp("testSetOkHttpClient_throwNPE");
120+
FirebaseFunctions functions = FirebaseFunctions.getInstance(app);
121+
122+
//noinspection DataFlowIssue
123+
assertThrows(NullPointerException.class, () -> functions.setOkHttpClient(null));
124+
}
125+
117126
private FirebaseApp getApp(String name) {
118127
return FirebaseApp.initializeApp(
119128
InstrumentationRegistry.getInstrumentation().getTargetContext(),

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,11 @@ public void useEmulator(@NonNull String host, int port) {
282282
*
283283
* @param client The OkHttpClient instance
284284
*/
285-
public void setOkHttpClient(OkHttpClient client) {
286-
this.client = client;
285+
public void setOkHttpClient(@NonNull OkHttpClient client) {
286+
this.client = Preconditions.checkNotNull(client);
287287
}
288288

289+
@NonNull
289290
OkHttpClient getOkHttpClient() {
290291
return this.client;
291292
}

0 commit comments

Comments
 (0)