Move CredentialProvider up to ClientSettings #305

pongad · 2017-05-08T05:55:11Z

Updates googleapis/google-cloud-java#2034.

This commit should resolve the first 3 bullets in the
linked issue.

The generated code needs to be updated to take advantage
of this added functionality.

Updates googleapis/google-cloud-java#2034. This commit should resolve the first 3 bullets in the linked issue. The generated code needs to be updated to take advantage of this added functionality.

codecov-io · 2017-05-08T05:58:41Z

Codecov Report

Merging #305 into master will decrease coverage by 1.04%.
The diff coverage is 61.53%.

@@             Coverage Diff              @@
##             master     #305      +/-   ##
============================================
- Coverage     70.98%   69.93%   -1.05%     
- Complexity      350      352       +2     
============================================
  Files            69       72       +3     
  Lines          1844     1906      +62     
  Branches        154      155       +1     
============================================
+ Hits           1309     1333      +24     
- Misses          469      506      +37     
- Partials         66       67       +1

Impacted Files	Coverage Δ	Complexity Δ
.../com/google/longrunning/PagedResponseWrappers.java	`83.33% <ø> (ø)`	`0 <0> (ø)`	⬇️
...va/com/google/api/gax/grpc/ChannelAndExecutor.java	`0% <ø> (-75%)`	`0 <0> (-3)`
...gle/api/gax/grpc/InstantiatingChannelProvider.java	`47.95% <ø> (ø)`	`9 <0> (ø)`	⬇️
...com/google/api/gax/grpc/OperationCallSettings.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...com/google/api/gax/core/NoCredentialsProvider.java	`0% <0%> (ø)`	`0 <0> (?)`
.../com/google/api/gax/grpc/BatchingCallSettings.java	`76.47% <0%> (-2.32%)`	`3 <0> (ø)`
.../java/com/google/longrunning/OperationsClient.java	`95.45% <100%> (+2.59%)`	`17 <0> (ø)`	⬇️
...ava/com/google/api/gax/grpc/PagedCallSettings.java	`91.66% <100%> (ø)`	`5 <2> (ø)`	⬇️
...om/google/api/gax/grpc/UnaryCallSettingsTyped.java	`90% <100%> (+1.11%)`	`3 <0> (ø)`	⬇️
...va/com/google/api/gax/grpc/SimpleCallSettings.java	`100% <100%> (ø)`	`4 <1> (ø)`	⬇️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ab7aa82...994737d. Read the comment docs.

gax-grpc/src/main/java/com/google/api/gax/grpc/UnaryCallable.java

@@ -328,4 +329,8 @@ public ResponseT call(RequestT request) {
    return new UnaryCallable<>(
        new BatchingCallable<>(callable, batchingDescriptor, batcherFactory), channel, settings);
  }
+
+  UnaryCallable<RequestT, ResponseT> auth(CallCredentials credentials) {


gax-grpc/src/main/java/com/google/api/gax/grpc/AuthCallable.java

+import com.google.common.base.Preconditions;
+import io.grpc.CallCredentials;
+
+class AuthCallable<RequestT, ResponseT> implements FutureCallable<RequestT, ResponseT> {


gax-grpc/src/main/java/com/google/api/gax/grpc/UnaryCallable.java

@@ -328,4 +329,8 @@ public ResponseT call(RequestT request) {
    return new UnaryCallable<>(
        new BatchingCallable<>(callable, batchingDescriptor, batcherFactory), channel, settings);
  }
+
+  UnaryCallable<RequestT, ResponseT> auth(CallCredentials credentials) {


garrettjonesgoogle

I think we should see how this looks in the generated code before submitting this PR.

gax-grpc/src/main/java/com/google/api/gax/grpc/AuthCallable.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016, Google Inc. All rights reserved.


gax-grpc/src/main/java/com/google/api/gax/grpc/UnaryCallable.java

@@ -328,4 +329,8 @@ public ResponseT call(RequestT request) {
    return new UnaryCallable<>(
        new BatchingCallable<>(callable, batchingDescriptor, batcherFactory), channel, settings);
  }
+
+  UnaryCallable<RequestT, ResponseT> auth(CallCredentials credentials) {


gax-grpc/src/main/java/com/google/api/gax/grpc/UnaryCallable.java

@@ -328,4 +329,8 @@ public ResponseT call(RequestT request) {
    return new UnaryCallable<>(
        new BatchingCallable<>(callable, batchingDescriptor, batcherFactory), channel, settings);
  }
+
+  UnaryCallable<RequestT, ResponseT> auth(CallCredentials credentials) {


pongad · 2017-05-08T23:45:16Z

@garrettjonesgoogle @shinfan PTAL.

garrettjonesgoogle · 2017-05-08T23:49:37Z

LGTM pending how generated code looks

pongad · 2017-05-09T11:15:33Z

@shinfan @garrettjonesgoogle Sorry this is actually a lot bigger than I thought. PTAL.

Due to how much this touches the callable stack, I think this deserves a smoke-test session to verify. I didn't have time to do this today, but the code should be close enough to review.

Major changes are: - ClientContext is added to pull together channel, executor, and credentials, which are often needed together. This change will also simplify future work if more ClientSettings are added. - The above change requires a corresponding change in toolkit. OperationsClient is updated using the new toolkit.