more tweaks

Change-Id: Ia1f48d96c0bb2cfd0596629de87c8015c330276d

Author: igorbernstein2

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Backup.java

@@ -223,7 +223,7 @@ public EncryptionInfo getEncryptionInfo() {
     return EncryptionInfo.fromProto(proto.getEncryptionInfo());
   }
 
-  @SuppressWarnings("EqualsIncompatibleType")
+  @SuppressWarnings("EqualsGetClass")
   @Override
   public boolean equals(Object o) {
     if (this == o) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java

@@ -1783,10 +1783,9 @@ public Batcher<RowMutationEntry, Void> newBulkMutationBatcher(@Nonnull String ta
    *     GrpcCallContext)} instead.
    */
   @Deprecated
-  @BetaApi("This surface is likely to change as the batching surface evolves.")
   public Batcher<RowMutationEntry, Void> newBulkMutationBatcher(
       @Nonnull String tableId, @Nullable GrpcCallContext ctx) {
-    return stub.newMutateRowsBatcher(tableId, ctx);
+    return stub.newMutateRowsBatcher(TableId.of(tableId), ctx);
   }
 
   /**

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java

@@ -730,7 +730,10 @@ private UnaryCallable<BulkMutation, MutateRowsAttemptResult> createMutateRowsBas
    *       com.google.cloud.bigtable.data.v2.models.MutateRowsException}.
    *   <li>Split the responses using {@link MutateRowsBatchingDescriptor}.
    * </ul>
+   *
+   * @deprecated Please use {@link #newMutateRowsBatcher(TargetId, GrpcCallContext)}
    */
+  @Deprecated
   public Batcher<RowMutationEntry, Void> newMutateRowsBatcher(
       @Nonnull String tableId, @Nullable GrpcCallContext ctx) {
     return new BatcherImpl<>(

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java

@@ -1629,7 +1629,7 @@ public void testSetIamPolicy() {
         .isEqualTo(
             Policy.newBuilder()
                 .addIdentity(Role.of("bigtable.viewer"), Identity.user("someone@example.com"))
-                .setEtag(BaseEncoding.base64().encode("my-etag".getBytes()))
+                .setEtag(BaseEncoding.base64().encode("my-etag".getBytes(StandardCharsets.UTF_8)))
                 .build());
   }
 

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java

@@ -71,8 +71,8 @@
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
 import io.grpc.stub.StreamObserver;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import javax.annotation.Generated;
@@ -85,7 +85,7 @@ public class MockBigtableTableAdminImpl extends BigtableTableAdminImplBase {
 
   public MockBigtableTableAdminImpl() {
     requests = new ArrayList<>();
-    responses = new LinkedList<>();
+    responses = new ArrayDeque<>();
   }
 
   public List<AbstractMessage> getRequests() {
@@ -97,7 +97,7 @@ public void addResponse(AbstractMessage response) {
   }
 
   public void setResponses(List<AbstractMessage> responses) {
-    this.responses = new LinkedList<Object>(responses);
+    this.responses = new ArrayDeque<>(responses);
   }
 
   public void addException(Exception exception) {
@@ -106,7 +106,7 @@ public void addException(Exception exception) {
 
   public void reset() {
     requests = new ArrayList<>();
-    responses = new LinkedList<>();
+    responses = new ArrayDeque<>();
   }
 
   @Override