deprecated warnings removed (#5459)

abhinav-qlogic · sduskis · commit 68de41e08129 · 2019-06-11T17:00:11.000-04:00
diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java
@@ -23,6 +23,7 @@
 import com.google.api.gax.rpc.ApiExceptions;
 import com.google.cloud.firestore.v1.FirestoreClient.ListDocumentsPagedResponse;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firestore.v1.Document;
 import com.google.firestore.v1.DocumentMask;
 import com.google.firestore.v1.ListDocumentsRequest;
@@ -187,7 +188,8 @@ public ApiFuture<DocumentReference> add(@Nonnull final Map<String, Object> field
           public DocumentReference apply(WriteResult writeResult) {
             return documentReference;
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /**
diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java
@@ -22,6 +22,7 @@
 import com.google.api.gax.rpc.ApiException;
 import com.google.api.gax.rpc.ApiExceptions;
 import com.google.cloud.firestore.v1.FirestoreClient.ListCollectionIdsPagedResponse;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firestore.v1.ListCollectionIdsRequest;
 import java.util.Iterator;
 import java.util.List;
@@ -130,7 +131,8 @@ private <T> ApiFuture<T> extractFirst(ApiFuture<List<T>> results) {
           public T apply(List<T> results) {
             return results.isEmpty() ? null : results.get(0);
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /**
diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java
@@ -20,6 +20,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firestore.v1.BeginTransactionRequest;
 import com.google.firestore.v1.BeginTransactionResponse;
 import com.google.firestore.v1.RollbackRequest;
@@ -93,7 +94,8 @@ public Void apply(BeginTransactionResponse beginTransactionResponse) {
             pending = true;
             return null;
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /** Commits a transaction. */
@@ -120,7 +122,8 @@ ApiFuture<Void> rollback() {
           public Void apply(Empty beginTransactionResponse) {
             return null;
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /**
@@ -140,7 +143,8 @@ public ApiFuture<DocumentSnapshot> get(@Nonnull DocumentReference documentRef) {
           public DocumentSnapshot apply(List<DocumentSnapshot> snapshots) {
             return snapshots.isEmpty() ? null : snapshots.get(0);
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /**
diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
@@ -22,6 +22,7 @@
 import com.google.cloud.firestore.UserDataConverter.EncodingOptions;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firestore.v1.CommitRequest;
 import com.google.firestore.v1.CommitResponse;
 import com.google.firestore.v1.Write;
@@ -657,7 +658,8 @@ public List<WriteResult> apply(CommitResponse commitResponse) {
 
             return result;
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /** Checks whether any updates have been queued. */
diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java
@@ -23098,7 +23098,7 @@ public int getKindValue() {
     /** <code>.tests.DocChange.Kind kind = 1;</code> */
     public com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind getKind() {
       com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind result =
-          com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.valueOf(kind_);
+          com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.forNumber(kind_);
       return result == null
           ? com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.UNRECOGNIZED
           : result;
@@ -23510,7 +23510,7 @@ public Builder setKindValue(int value) {
       /** <code>.tests.DocChange.Kind kind = 1;</code> */
       public com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind getKind() {
         com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind result =
-            com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.valueOf(kind_);
+            com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.forNumber(kind_);
         return result == null
             ? com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind.UNRECOGNIZED
             : result;

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import com.google.api.core.ApiFuture;`
`21`	`21`	`import com.google.api.core.ApiFutures;`
`22`	`22`	`import com.google.common.base.Preconditions;`
	`23`	`+import com.google.common.util.concurrent.MoreExecutors;`
`23`	`24`	`import com.google.firestore.v1.BeginTransactionRequest;`
`24`	`25`	`import com.google.firestore.v1.BeginTransactionResponse;`
`25`	`26`	`import com.google.firestore.v1.RollbackRequest;`
`@@ -93,7 +94,8 @@ public Void apply(BeginTransactionResponse beginTransactionResponse) {`
`93`	`94`	`pending = true;`
`94`	`95`	`return null;`
`95`	`96`	`}`
`96`		`- });`
	`97`	`+ },`
	`98`	`+ MoreExecutors.directExecutor());`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`/** Commits a transaction. */`
`@@ -120,7 +122,8 @@ ApiFuture<Void> rollback() {`
`120`	`122`	`public Void apply(Empty beginTransactionResponse) {`
`121`	`123`	`return null;`
`122`	`124`	`}`
`123`		`- });`
	`125`	`+ },`
	`126`	`+ MoreExecutors.directExecutor());`
`124`	`127`	`}`
`125`	`128`
`126`	`129`	`/**`
`@@ -140,7 +143,8 @@ public ApiFuture<DocumentSnapshot> get(@Nonnull DocumentReference documentRef) {`
`140`	`143`	`public DocumentSnapshot apply(List<DocumentSnapshot> snapshots) {`
`141`	`144`	`return snapshots.isEmpty() ? null : snapshots.get(0);`
`142`	`145`	`}`
`143`		`- });`
	`146`	`+ },`
	`147`	`+ MoreExecutors.directExecutor());`
`144`	`148`	`}`
`145`	`149`
`146`	`150`	`/**`