Skip to content

Commit 93016eb

Browse files
committed
fix: Use internal default transport
1 parent e0f3e21 commit 93016eb

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/test/java/com/google/firebase/FirebaseOptionsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import static org.junit.Assert.assertSame;
2525
import static org.junit.Assert.assertTrue;
2626

27-
import com.google.api.client.http.javanet.NetHttpTransport;
2827
import com.google.api.client.json.gson.GsonFactory;
2928
import com.google.auth.oauth2.AccessToken;
3029
import com.google.auth.oauth2.GoogleCredentials;
3130
import com.google.auth.oauth2.ServiceAccountCredentials;
3231
import com.google.cloud.firestore.FirestoreOptions;
32+
import com.google.firebase.internal.ApacheHttp2Transport;
3333
import com.google.firebase.testing.ServiceAccount;
3434
import com.google.firebase.testing.TestUtils;
3535
import java.io.IOException;
@@ -74,7 +74,7 @@ protected ThreadFactory getThreadFactory() {
7474
@Test
7575
public void createOptionsWithAllValuesSet() throws IOException {
7676
GsonFactory jsonFactory = new GsonFactory();
77-
NetHttpTransport httpTransport = new NetHttpTransport();
77+
ApacheHttp2Transport httpTransport = new ApacheHttp2Transport();
7878
FirestoreOptions firestoreOptions = FirestoreOptions.newBuilder().build();
7979
FirebaseOptions firebaseOptions =
8080
FirebaseOptions.builder()

src/test/java/com/google/firebase/messaging/FirebaseMessagingClientImplTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public void initialize(HttpRequest httpRequest) {
358358
.setProjectId("test-project")
359359
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
360360
.setRequestFactory(transport.createRequestFactory(initializer))
361-
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
361+
.setChildRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory())
362362
.setResponseInterceptor(interceptor)
363363
.build();
364364

@@ -558,7 +558,7 @@ private FirebaseMessagingClientImpl initMessagingClient(
558558
.setProjectId("test-project")
559559
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
560560
.setRequestFactory(transport.createRequestFactory())
561-
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
561+
.setChildRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory())
562562
.setResponseInterceptor(interceptor)
563563
.build();
564564
}
@@ -581,7 +581,7 @@ private FirebaseMessagingClientImpl initClientWithFaultyTransport() {
581581
.setProjectId("test-project")
582582
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
583583
.setRequestFactory(transport.createRequestFactory())
584-
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory())
584+
.setChildRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory())
585585
.build();
586586
}
587587

@@ -665,8 +665,8 @@ private FirebaseMessagingClientImpl.Builder fullyPopulatedBuilder() {
665665
return FirebaseMessagingClientImpl.builder()
666666
.setProjectId("test-project")
667667
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
668-
.setRequestFactory(Utils.getDefaultTransport().createRequestFactory())
669-
.setChildRequestFactory(Utils.getDefaultTransport().createRequestFactory());
668+
.setRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory())
669+
.setChildRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory());
670670
}
671671

672672
private void checkExceptionFromHttpResponse(

src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public void testRequestFactoryIsNull() {
358358

359359
@Test(expected = NullPointerException.class)
360360
public void testJsonFactoryIsNull() {
361-
new InstanceIdClientImpl(Utils.getDefaultTransport().createRequestFactory(), null);
361+
new InstanceIdClientImpl(ApiClientUtils.getDefaultTransport().createRequestFactory(), null);
362362
}
363363

364364
@Test

src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ private FirebaseRemoteConfigClientImpl.Builder fullyPopulatedBuilder() {
11731173
return FirebaseRemoteConfigClientImpl.builder()
11741174
.setProjectId("test-project")
11751175
.setJsonFactory(ApiClientUtils.getDefaultJsonFactory())
1176-
.setRequestFactory(Utils.getDefaultTransport().createRequestFactory());
1176+
.setRequestFactory(ApiClientUtils.getDefaultTransport().createRequestFactory());
11771177
}
11781178

11791179
private void checkGetRequestHeader(HttpRequest request) {

0 commit comments

Comments
 (0)