Skip to content

Commit 4145eb6

Browse files
abhinav-qlogicsduskis
authored andcommitted
---
yaml --- r: 35713 b: refs/heads/autosynth-iamcredentials c: 9d9404b h: refs/heads/master i: 35711: c18e351
1 parent 9c65865 commit 4145eb6

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ refs/heads/pubsub-ordering-keys: 3ea3dc93288c90e1776339a2c059a076e2e2fd1d
159159
refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
160160
refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
161161
refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
162-
refs/heads/autosynth-iamcredentials: b2dc157752bd9421852da50d941557bf72cd935e
162+
refs/heads/autosynth-iamcredentials: 9d9404b35b673a885e270b39b8c441d35c5bdadd
163163
refs/heads/release-google-cloud-java-v0.78.0: fae5e980779cf0173a152636b278015b9f60ee55
164164
refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
165165
refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb

branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.cloud.firestore.spi.v1.FirestoreRpc;
3030
import com.google.common.base.Preconditions;
3131
import com.google.common.collect.ImmutableMap;
32+
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.firestore.v1.BatchGetDocumentsRequest;
3334
import com.google.firestore.v1.BatchGetDocumentsResponse;
3435
import com.google.firestore.v1.DatabaseRootName;
@@ -339,9 +340,11 @@ public void onSuccess(List<WriteResult> writeResults) {
339340
span.end();
340341
resultFuture.set(userResult);
341342
}
342-
});
343+
},
344+
MoreExecutors.directExecutor());
343345
}
344-
});
346+
},
347+
MoreExecutors.directExecutor());
345348
}
346349

347350
private SettableApiFuture<T> invokeUserCallback() {
@@ -396,12 +399,14 @@ public void onFailure(Throwable throwable) {
396399
public void onSuccess(Void ignored) {
397400
resultFuture.setException(throwable);
398401
}
399-
});
402+
},
403+
MoreExecutors.directExecutor());
400404
} else {
401405
resultFuture.setException(throwable);
402406
}
403407
}
404-
});
408+
},
409+
MoreExecutors.directExecutor());
405410
}
406411

407412
/** Returns whether the user has opted into receiving dates as com.google.cloud.Timestamp. */

branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public GrpcFirestoreRpc(final FirestoreOptions options) throws IOException {
8585
|| NoCredentials.getInstance().equals(options.getCredentials())) {
8686
ManagedChannel managedChannel =
8787
ManagedChannelBuilder.forTarget(options.getHost())
88-
.usePlaintext(true)
88+
.usePlaintext()
8989
.executor(executor)
9090
.build();
9191
TransportChannel transportChannel = GrpcTransportChannel.create(managedChannel);

0 commit comments

Comments
 (0)