|
46 | 46 | import com.google.common.collect.Range;
|
47 | 47 | import com.google.common.util.concurrent.MoreExecutors;
|
48 | 48 | import com.google.protobuf.AbstractMessage;
|
49 |
| -import com.google.protobuf.GeneratedMessageV3; |
| 49 | +import com.google.protobuf.Message; |
50 | 50 | import com.google.spanner.v1.BatchCreateSessionsRequest;
|
51 | 51 | import com.google.spanner.v1.BeginTransactionRequest;
|
52 | 52 | import com.google.spanner.v1.CommitRequest;
|
@@ -346,7 +346,7 @@ public void asyncTransactionManagerFireAndForgetInvalidUpdate() throws Exception
|
346 | 346 | }
|
347 | 347 | }
|
348 | 348 | }
|
349 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 349 | + ImmutableList<Class<? extends Message>> expectedRequests = |
350 | 350 | ImmutableList.of(
|
351 | 351 | BatchCreateSessionsRequest.class,
|
352 | 352 | // The first update that fails. This will cause a transaction retry.
|
@@ -671,7 +671,7 @@ public void asyncTransactionManagerFireAndForgetInvalidBatchUpdate() throws Exce
|
671 | 671 | }
|
672 | 672 | }
|
673 | 673 | }
|
674 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 674 | + ImmutableList<Class<? extends Message>> expectedRequests = |
675 | 675 | ImmutableList.of(
|
676 | 676 | BatchCreateSessionsRequest.class,
|
677 | 677 | ExecuteBatchDmlRequest.class,
|
@@ -714,7 +714,7 @@ public void asyncTransactionManagerBatchUpdateAborted() throws Exception {
|
714 | 714 | assertThat(attempt.get()).isEqualTo(2);
|
715 | 715 | // There should only be 1 CommitRequest, as the first attempt should abort already after the
|
716 | 716 | // ExecuteBatchDmlRequest.
|
717 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 717 | + ImmutableList<Class<? extends Message>> expectedRequests = |
718 | 718 | ImmutableList.of(
|
719 | 719 | BatchCreateSessionsRequest.class,
|
720 | 720 | ExecuteBatchDmlRequest.class,
|
@@ -756,7 +756,7 @@ public void asyncTransactionManagerBatchUpdateAbortedBeforeFirstStatement() thro
|
756 | 756 | assertThat(attempt.get()).isEqualTo(2);
|
757 | 757 | // There should only be 1 CommitRequest, as the first attempt should abort already after the
|
758 | 758 | // ExecuteBatchDmlRequest.
|
759 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 759 | + ImmutableList<Class<? extends Message>> expectedRequests = |
760 | 760 | ImmutableList.of(
|
761 | 761 | BatchCreateSessionsRequest.class,
|
762 | 762 | ExecuteBatchDmlRequest.class,
|
@@ -816,7 +816,7 @@ public void asyncTransactionManagerWithBatchUpdateCommitAborted() throws Excepti
|
816 | 816 | } finally {
|
817 | 817 | mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
|
818 | 818 | }
|
819 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 819 | + ImmutableList<Class<? extends Message>> expectedRequests = |
820 | 820 | ImmutableList.of(
|
821 | 821 | BatchCreateSessionsRequest.class,
|
822 | 822 | ExecuteBatchDmlRequest.class,
|
@@ -914,7 +914,7 @@ public void asyncTransactionManagerWithBatchUpdateCommitFails() {
|
914 | 914 | assertThat(e.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
|
915 | 915 | assertThat(e.getMessage()).contains("mutation limit exceeded");
|
916 | 916 | }
|
917 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 917 | + ImmutableList<Class<? extends Message>> expectedRequests = |
918 | 918 | ImmutableList.of(
|
919 | 919 | BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
|
920 | 920 | if (isMultiplexedSessionsEnabled()) {
|
@@ -945,7 +945,7 @@ public void asyncTransactionManagerWaitsUntilAsyncBatchUpdateHasFinished() throw
|
945 | 945 | }
|
946 | 946 | }
|
947 | 947 | }
|
948 |
| - ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests = |
| 948 | + ImmutableList<Class<? extends Message>> expectedRequests = |
949 | 949 | ImmutableList.of(
|
950 | 950 | BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
|
951 | 951 | if (isMultiplexedSessionsEnabled()) {
|
|
0 commit comments