Skip to content

Commit 44c26e9

Browse files
authored
fix: Migrate off GeneratedMessageV3 (#1692)
* fix: Migrate off GeneratedMessageV3 * chore: Fix lint issues
1 parent ff3866e commit 44c26e9

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

google-cloud-firestore/src/test/java/com/google/cloud/firestore/BulkWriterTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import com.google.firestore.v1.BatchWriteResponse;
4343
import com.google.firestore.v1.Value;
4444
import com.google.firestore.v1.Write;
45-
import com.google.protobuf.GeneratedMessageV3;
45+
import com.google.protobuf.AbstractMessage;
4646
import com.google.rpc.Code;
4747
import io.grpc.Status;
4848
import java.util.ArrayList;
@@ -74,21 +74,21 @@
7474
@RunWith(MockitoJUnitRunner.class)
7575
public class BulkWriterTest {
7676

77-
public static final ApiFuture<GeneratedMessageV3> FAILED_FUTURE =
77+
public static final ApiFuture<AbstractMessage> FAILED_FUTURE =
7878
ApiFutures.immediateFailedFuture(
7979
new ApiException(
8080
new IllegalStateException("Mock batchWrite failed in test"),
8181
GrpcStatusCode.of(Status.Code.UNKNOWN),
8282
false));
8383

84-
private static final ApiFuture<GeneratedMessageV3> RETRYABLE_FAILED_FUTURE =
84+
private static final ApiFuture<AbstractMessage> RETRYABLE_FAILED_FUTURE =
8585
ApiFutures.immediateFailedFuture(
8686
new ApiException(
8787
new IllegalStateException("Mock batchWrite failed in test"),
8888
GrpcStatusCode.of(Status.Code.ABORTED),
8989
true));
9090

91-
private static final ApiFuture<GeneratedMessageV3> RESOURCE_EXHAUSTED_FAILED_FUTURE =
91+
private static final ApiFuture<AbstractMessage> RESOURCE_EXHAUSTED_FAILED_FUTURE =
9292
ApiFutures.immediateFailedFuture(
9393
new ApiException(
9494
new IllegalStateException("Mock batchWrite failed in test"),

google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
import com.google.firestore.v1.Write;
6464
import com.google.gson.Gson;
6565
import com.google.gson.reflect.TypeToken;
66+
import com.google.protobuf.AbstractMessage;
6667
import com.google.protobuf.ByteString;
6768
import com.google.protobuf.Empty;
68-
import com.google.protobuf.GeneratedMessageV3;
6969
import com.google.protobuf.Message;
7070
import com.google.protobuf.NullValue;
7171
import com.google.type.LatLng;
@@ -1200,11 +1200,11 @@ public static String fullPath(DocumentReference ref, FirestoreOptions options) {
12001200
}
12011201

12021202
static class RequestResponsePair {
1203-
GeneratedMessageV3 request;
1204-
ApiFuture<? extends GeneratedMessageV3> response;
1203+
AbstractMessage request;
1204+
ApiFuture<? extends AbstractMessage> response;
12051205

12061206
public RequestResponsePair(
1207-
GeneratedMessageV3 request, ApiFuture<? extends GeneratedMessageV3> response) {
1207+
AbstractMessage request, ApiFuture<? extends AbstractMessage> response) {
12081208
this.request = request;
12091209
this.response = response;
12101210
}
@@ -1218,15 +1218,15 @@ static class ResponseStubber {
12181218

12191219
List<Object> actualRequestList = new CopyOnWriteArrayList<>();
12201220

1221-
void put(GeneratedMessageV3 request, ApiFuture<? extends GeneratedMessageV3> response) {
1221+
void put(AbstractMessage request, ApiFuture<? extends AbstractMessage> response) {
12221222
operationList.add(new RequestResponsePair(request, response));
12231223
}
12241224

12251225
void initializeStub(
12261226
ArgumentCaptor<? extends Message> argumentCaptor, FirestoreImpl firestoreMock) {
12271227
Stubber stubber = null;
12281228
for (final RequestResponsePair entry : operationList) {
1229-
Answer<ApiFuture<? extends GeneratedMessageV3>> answer =
1229+
Answer<ApiFuture<? extends AbstractMessage>> answer =
12301230
invocationOnMock -> {
12311231
actualRequestList.add(invocationOnMock.getArguments()[0]);
12321232
return entry.response;

google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import com.google.firestore.v1.BatchGetDocumentsRequest;
6565
import com.google.firestore.v1.DocumentMask;
6666
import com.google.firestore.v1.Write;
67-
import com.google.protobuf.GeneratedMessageV3;
67+
import com.google.protobuf.AbstractMessage;
6868
import com.google.protobuf.Message;
6969
import io.grpc.Status;
7070
import java.util.ArrayList;
@@ -88,7 +88,7 @@
8888
@RunWith(MockitoJUnitRunner.class)
8989
public class TransactionTest {
9090

91-
private final ApiFuture<GeneratedMessageV3> RETRYABLE_API_EXCEPTION =
91+
private final ApiFuture<AbstractMessage> RETRYABLE_API_EXCEPTION =
9292
immediateFailedFuture(
9393
new ApiException(
9494
new Exception("Test exception"), GrpcStatusCode.of(Status.Code.UNKNOWN), true));

0 commit comments

Comments
 (0)