more PR fixes

googleapis · gcf-merge-on-green · Mar 27, 2024 · Mar 6, 2024 · Mar 6, 2024 · Mar 6, 2024
commit 3386f1d04145cc8c4ac94499b7d6a338fbd7cbae
@@ -45,8 +45,8 @@ public ApiFuture<Void> futureCall(BulkMutation request, ApiCallContext context)
  return ApiFutures.transform(
  future,
  result -> {
- if (!result.failedMutations.isEmpty()) {
- throw MutateRowsException.create(null, result.failedMutations, result.isRetryable);
+ if (!result.getFailedMutations().isEmpty()) {
+ throw MutateRowsException.create(null, result.getFailedMutations(), result.getIsRetryable());
  }
  return null;
  },

@@ -326,9 +326,9 @@ private MutateRowsAttemptResult handleAttemptSuccess(List<MutateRowsResponse> re
 
  if (!allFailures.isEmpty()) {
  boolean isRetryable = builder.getEntriesCount() > 0;
- return new MutateRowsAttemptResult(allFailures, isRetryable);
+ return MutateRowsAttemptResult.create(allFailures, isRetryable);
  }
- return new MutateRowsAttemptResult();
+ return MutateRowsAttemptResult.success();
  }
 
  /**

@@ -16,27 +16,34 @@
 package com.google.cloud.bigtable.data.v2.stub.mutaterows;
 
 import com.google.api.core.InternalApi;
+import com.google.auto.value.AutoValue;
 import com.google.cloud.bigtable.data.v2.models.MutateRowsException.FailedMutation;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nonnull;
 
 /**
  * This class represents the result of a MutateRows attempt. It contains the list of failed
  * mutations, along with an indicator whether these errors are retryable.
  */
 @InternalApi
-public class MutateRowsAttemptResult {
+@AutoValue
+public abstract class MutateRowsAttemptResult {
 
- public final boolean isRetryable;
- public final List<FailedMutation> failedMutations;
+ public abstract List<FailedMutation> getFailedMutations();
 
- public MutateRowsAttemptResult() {
- this.failedMutations = new ArrayList<>();
- this.isRetryable = false;
+ public abstract boolean getIsRetryable();
+
+ @InternalApi
+ @Nonnull
+ public static MutateRowsAttemptResult create(
+ List<FailedMutation> failedMutations, boolean isRetryable) {
+ return new AutoValue_MutateRowsAttemptResult(failedMutations, isRetryable);
  }
 
- public MutateRowsAttemptResult(List<FailedMutation> failedMutations, boolean isRetryable) {
- this.failedMutations = failedMutations;
- this.isRetryable = isRetryable;
+ @InternalApi
+ @Nonnull
+ public static MutateRowsAttemptResult success() {
+ return new AutoValue_MutateRowsAttemptResult(new ArrayList<>(), false);
  }
 }
@@ -52,7 +52,7 @@ public void splitResponse(
  // mutation. It is important to set the correct error on the correct mutation. When the entry is
  // later read, it resolves the exception first, and only later it goes to the value set by
  // set().
- for (FailedMutation mutation : response.failedMutations) {
+ for (FailedMutation mutation : response.getFailedMutations()) {
  entries.get(mutation.getIndex()).getResultFuture().setException(mutation.getError());
  }
  for (BatchEntry<RowMutationEntry, Void> batchResponse : entries) {

@@ -39,8 +39,8 @@ public MutateRowsPartialErrorRetryAlgorithm(
  public boolean shouldRetry(
  Throwable previousThrowable, MutateRowsAttemptResult previousResponse) {
  // handle partial retryable failures
- if (previousResponse != null && !previousResponse.failedMutations.isEmpty()) {
- return previousResponse.isRetryable;
+ if (previousResponse != null && !previousResponse.getFailedMutations().isEmpty()) {
+ return previousResponse.getIsRetryable();
  }
  // business as usual
  return retryAlgorithm.shouldRetry(previousThrowable, previousResponse);
@@ -52,8 +52,8 @@ public boolean shouldRetry(
  Throwable previousThrowable,
  MutateRowsAttemptResult previousResponse) {
  // handle partial retryable failures
- if (previousResponse != null && !previousResponse.failedMutations.isEmpty()) {
- return previousResponse.isRetryable;
+ if (previousResponse != null && !previousResponse.getFailedMutations().isEmpty()) {
+ return previousResponse.getIsRetryable();
  }
  // business as usual
  return retryAlgorithm.shouldRetry(context, previousThrowable, previousResponse);

@@ -20,15 +20,12 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-import com.google.api.core.ApiFuture;
-import com.google.api.core.ApiFutures;
 import com.google.api.gax.batching.Batcher;
 import com.google.api.gax.batching.BatcherImpl;
 import com.google.api.gax.batching.FlowController;
 import com.google.api.gax.grpc.GrpcCallContext;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.UnaryCallable;
 import com.google.bigtable.v2.BigtableGrpc;
 import com.google.bigtable.v2.MutateRowsRequest;
 import com.google.bigtable.v2.MutateRowsResponse;
@@ -43,13 +40,11 @@
 import com.google.cloud.bigtable.data.v2.models.RowMutationEntry;
 import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
 import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
-import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsAttemptResult;
 import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsBatchingDescriptor;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.BytesValue;
@@ -453,7 +448,7 @@ public Object answer(InvocationOnMock invocation) {
  try (Batcher<RowMutationEntry, Void> batcher =
  new BatcherImpl<>(
  batchingDescriptor,
-  stub.internalBulkMutateRowsCallable().withDefaultCallContext(defaultContext),
+ stub.internalBulkMutateRowsCallable().withDefaultCallContext(defaultContext),
  BulkMutation.create(TABLE_ID),
  settings.getStubSettings().bulkMutateRowsSettings().getBatchingSettings(),
  Executors.newSingleThreadScheduledExecutor(),

@@ -103,8 +103,8 @@ public void singleEntrySuccessTest() throws Exception {
  MutateRowsAttemptResult result = parentFuture.attemptFuture.get();
 
  assertThat(result).isNotNull();
- assertThat(result.failedMutations).hasSize(0);
- assertThat(result.isRetryable).isFalse();
+ assertThat(result.getFailedMutations()).hasSize(0);
+ assertThat(result.getIsRetryable()).isFalse();
  // innerCallable received the request
  assertThat(innerCallable.lastRequest).isEqualTo(request);
  }
@@ -129,8 +129,8 @@ public void missingEntry() throws Exception {
 
  MutateRowsAttemptResult result = parentFuture.attemptFuture.get();
 
- assertThat(result.failedMutations).hasSize(1);
- FailedMutation failedMutation = result.failedMutations.get(0);
+ assertThat(result.getFailedMutations()).hasSize(1);
+ FailedMutation failedMutation = result.getFailedMutations().get(0);
  assertThat(failedMutation.getIndex()).isEqualTo(1);
  assertThat(failedMutation.getError())
  .hasMessageThat()
@@ -196,7 +196,7 @@ public void mixedTest() throws Exception {
 
  // Entry expectations
  @SuppressWarnings("ConstantConditions")
- List<FailedMutation> failedMutations = result.failedMutations;
+ List<FailedMutation> failedMutations = result.getFailedMutations();
  assertThat(failedMutations).hasSize(2);
 
  assertThat(failedMutations.get(0).getIndex()).isEqualTo(1);
@@ -260,7 +260,7 @@ public void nextAttemptTest() throws Exception {
 
  // Entry expectations
  @SuppressWarnings("ConstantConditions")
- List<FailedMutation> failedMutations = result.failedMutations;
+ List<FailedMutation> failedMutations = result.getFailedMutations();
  assertThat(failedMutations).hasSize(1);
 
  assertThat(failedMutations.get(0).getIndex()).isEqualTo(2);

@@ -16,6 +16,7 @@
 package com.google.cloud.bigtable.data.v2.stub.mutaterows;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import com.google.api.core.SettableApiFuture;
 import com.google.api.gax.batching.BatchEntry;
@@ -96,13 +97,13 @@ public void splitResponseTest() {
  assertThat(batchResponse.get(1).getResultFuture().isDone()).isFalse();
 
  MutateRowsBatchingDescriptor underTest = new MutateRowsBatchingDescriptor();
- underTest.splitResponse(new MutateRowsAttemptResult(), batchResponse);
+ underTest.splitResponse(MutateRowsAttemptResult.success(), batchResponse);
  assertThat(batchResponse.get(0).getResultFuture().isDone()).isTrue();
  assertThat(batchResponse.get(1).getResultFuture().isDone()).isTrue();
  }
 
  @Test
- public void splitResponsePartialErrorsTest() throws Exception {
+ public void splitResponsePartialErrorsTest() {
  BatchEntry<RowMutationEntry, Void> batchEntry1 =
  BatchEntry.create(
  RowMutationEntry.create("key1").deleteRow(), SettableApiFuture.<Void>create());
@@ -117,7 +118,7 @@ public void splitResponsePartialErrorsTest() throws Exception {
 
  MutateRowsBatchingDescriptor underTest = new MutateRowsBatchingDescriptor();
  underTest.splitResponse(
- new MutateRowsAttemptResult(
+ MutateRowsAttemptResult.create(
  Arrays.asList(
  FailedMutation.create(
  0,
@@ -140,12 +141,9 @@ public void splitResponsePartialErrorsTest() throws Exception {
  }
  assertThat(unexpectedError).isNull();
 
- Throwable actualError = null;
- try {
- batchResponse.get(0).getResultFuture().get();
- } catch (Throwable t) {
- actualError = t.getCause();
- }
+ Throwable actualError =
+ assertThrows(ExecutionException.class, () -> batchResponse.get(0).getResultFuture().get())
+ .getCause();
 
  assertThat(actualError).isInstanceOf(InternalException.class);
  assertThat(actualError).hasMessageThat().contains("error message");

@@ -59,7 +59,7 @@ public void testSuccess() {
  MutateRowsErrorConverterUnaryCallable callable =
  new MutateRowsErrorConverterUnaryCallable(innerCallable);
 
- innerResult.set(new MutateRowsAttemptResult());
+ innerResult.set(MutateRowsAttemptResult.success());
  callable.call(BulkMutation.create("fake-table"));
  }
 
@@ -69,7 +69,7 @@ public void testFailure() {
  new MutateRowsErrorConverterUnaryCallable(innerCallable);
 
  innerResult.set(
- new MutateRowsAttemptResult(
+ MutateRowsAttemptResult.create(
  Arrays.asList(
  FailedMutation.create(
  0,