---

abhinav-qlogic · sduskis · commit 3383c8d0052b · 2019-06-04T08:25:52.000-04:00
yaml --- r: 35397 b: refs/heads/pubsub-ordering-keys c: 9d9404b h: refs/heads/master i: 35395: 7dce0ad
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: b2dc157752bd9421852da50d941557bf72cd935e
+refs/heads/pubsub-ordering-keys: 9d9404b35b673a885e270b39b8c441d35c5bdadd
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
@@ -29,6 +29,7 @@
 import com.google.cloud.firestore.spi.v1.FirestoreRpc;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firestore.v1.BatchGetDocumentsRequest;
 import com.google.firestore.v1.BatchGetDocumentsResponse;
 import com.google.firestore.v1.DatabaseRootName;
@@ -339,9 +340,11 @@ public void onSuccess(List<WriteResult> writeResults) {
                             span.end();
                             resultFuture.set(userResult);
                           }
-                        });
+                        },
+                        MoreExecutors.directExecutor());
                   }
-                });
+                },
+                MoreExecutors.directExecutor());
           }
 
           private SettableApiFuture<T> invokeUserCallback() {
@@ -396,12 +399,14 @@ public void onFailure(Throwable throwable) {
                     public void onSuccess(Void ignored) {
                       resultFuture.setException(throwable);
                     }
-                  });
+                  },
+                  MoreExecutors.directExecutor());
             } else {
               resultFuture.setException(throwable);
             }
           }
-        });
+        },
+        MoreExecutors.directExecutor());
   }
 
   /** Returns whether the user has opted into receiving dates as com.google.cloud.Timestamp. */
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java
@@ -85,7 +85,7 @@ public GrpcFirestoreRpc(final FirestoreOptions options) throws IOException {
           || NoCredentials.getInstance().equals(options.getCredentials())) {
         ManagedChannel managedChannel =
             ManagedChannelBuilder.forTarget(options.getHost())
-                .usePlaintext(true)
+                .usePlaintext()
                 .executor(executor)
                 .build();
         TransportChannel transportChannel = GrpcTransportChannel.create(managedChannel);

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import com.google.cloud.firestore.spi.v1.FirestoreRpc;`
`30`	`30`	`import com.google.common.base.Preconditions;`
`31`	`31`	`import com.google.common.collect.ImmutableMap;`
	`32`	`+import com.google.common.util.concurrent.MoreExecutors;`
`32`	`33`	`import com.google.firestore.v1.BatchGetDocumentsRequest;`
`33`	`34`	`import com.google.firestore.v1.BatchGetDocumentsResponse;`
`34`	`35`	`import com.google.firestore.v1.DatabaseRootName;`
`@@ -339,9 +340,11 @@ public void onSuccess(List<WriteResult> writeResults) {`
`339`	`340`	`span.end();`
`340`	`341`	`resultFuture.set(userResult);`
`341`	`342`	`}`
`342`		`- });`
	`343`	`+ },`
	`344`	`+ MoreExecutors.directExecutor());`
`343`	`345`	`}`
`344`		`- });`
	`346`	`+ },`
	`347`	`+ MoreExecutors.directExecutor());`
`345`	`348`	`}`
`346`	`349`
`347`	`350`	`private SettableApiFuture<T> invokeUserCallback() {`
`@@ -396,12 +399,14 @@ public void onFailure(Throwable throwable) {`
`396`	`399`	`public void onSuccess(Void ignored) {`
`397`	`400`	`resultFuture.setException(throwable);`
`398`	`401`	`}`
`399`		`- });`
	`402`	`+ },`
	`403`	`+ MoreExecutors.directExecutor());`
`400`	`404`	`} else {`
`401`	`405`	`resultFuture.setException(throwable);`
`402`	`406`	`}`
`403`	`407`	`}`
`404`		`- });`
	`408`	`+ },`
	`409`	`+ MoreExecutors.directExecutor());`
`405`	`410`	`}`
`406`	`411`
`407`	`412`	`/** Returns whether the user has opted into receiving dates as com.google.cloud.Timestamp. */`