Skip to content

Commit a82410e

Browse files
feat: Enable REST transport for most of Java and Go clients (googleapis#694)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9
1 parent ecb4469 commit a82410e

File tree

9 files changed

+1521
-7
lines changed

9 files changed

+1521
-7
lines changed

java-os-login/.github/.OwlBot.lock.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:58ccd4737212f64a7dd4b3063d447447acf71a2b9d409eab19fc7a00b18eadc0
17-
# created: 2022-06-10T19:20:11.004014696Z
16+
digest: sha256:bb0871486fc5f95f969df8fa65e002c0cf952cb7dd3bf647475c1d49ae0535b7
17+

java-os-login/google-cloud-os-login/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<groupId>com.google.api</groupId>
5959
<artifactId>gax-grpc</artifactId>
6060
</dependency>
61+
<dependency>
62+
<groupId>com.google.api</groupId>
63+
<artifactId>gax-httpjson</artifactId>
64+
</dependency>
6165
<dependency>
6266
<groupId>org.threeten</groupId>
6367
<artifactId>threetenbp</artifactId>
@@ -88,12 +92,24 @@
8892
<scope>test</scope>
8993
</dependency>
9094
<!-- Need testing utility classes for generated gRPC clients tests -->
95+
<dependency>
96+
<groupId>com.google.api</groupId>
97+
<artifactId>gax</artifactId>
98+
<classifier>testlib</classifier>
99+
<scope>test</scope>
100+
</dependency>
91101
<dependency>
92102
<groupId>com.google.api</groupId>
93103
<artifactId>gax-grpc</artifactId>
94104
<classifier>testlib</classifier>
95105
<scope>test</scope>
96106
</dependency>
107+
<dependency>
108+
<groupId>com.google.api</groupId>
109+
<artifactId>gax-httpjson</artifactId>
110+
<classifier>testlib</classifier>
111+
<scope>test</scope>
112+
</dependency>
97113
</dependencies>
98114

99115

java-os-login/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java

+14
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,20 @@
9494
* OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create(osLoginServiceSettings);
9595
* }</pre>
9696
*
97+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
98+
* the wire:
99+
*
100+
* <pre>{@code
101+
* // This snippet has been automatically generated for illustrative purposes only.
102+
* // It may require modifications to work in your environment.
103+
* OsLoginServiceSettings osLoginServiceSettings =
104+
* OsLoginServiceSettings.newBuilder()
105+
* .setTransportChannelProvider(
106+
* OsLoginServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
107+
* .build();
108+
* OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create(osLoginServiceSettings);
109+
* }</pre>
110+
*
97111
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
98112
*/
99113
@Generated("by gapic-generator-java")

java-os-login/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.gax.core.GoogleCredentialsProvider;
2222
import com.google.api.gax.core.InstantiatingExecutorProvider;
2323
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
24+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2425
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2526
import com.google.api.gax.rpc.ClientContext;
2627
import com.google.api.gax.rpc.ClientSettings;
@@ -128,11 +129,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
128129
return OsLoginServiceStubSettings.defaultCredentialsProviderBuilder();
129130
}
130131

131-
/** Returns a builder for the default ChannelProvider for this service. */
132+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
132133
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
133134
return OsLoginServiceStubSettings.defaultGrpcTransportProviderBuilder();
134135
}
135136

137+
/** Returns a builder for the default REST ChannelProvider for this service. */
138+
@BetaApi
139+
public static InstantiatingHttpJsonChannelProvider.Builder
140+
defaultHttpJsonTransportProviderBuilder() {
141+
return OsLoginServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
142+
}
143+
136144
public static TransportChannelProvider defaultTransportChannelProvider() {
137145
return OsLoginServiceStubSettings.defaultTransportChannelProvider();
138146
}
@@ -142,11 +150,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
142150
return OsLoginServiceStubSettings.defaultApiClientHeaderProviderBuilder();
143151
}
144152

145-
/** Returns a new builder for this class. */
153+
/** Returns a new gRPC builder for this class. */
146154
public static Builder newBuilder() {
147155
return Builder.createDefault();
148156
}
149157

158+
/** Returns a new REST builder for this class. */
159+
@BetaApi
160+
public static Builder newHttpJsonBuilder() {
161+
return Builder.createHttpJsonDefault();
162+
}
163+
150164
/** Returns a new builder for this class. */
151165
public static Builder newBuilder(ClientContext clientContext) {
152166
return new Builder(clientContext);
@@ -184,6 +198,11 @@ private static Builder createDefault() {
184198
return new Builder(OsLoginServiceStubSettings.newBuilder());
185199
}
186200

201+
@BetaApi
202+
private static Builder createHttpJsonDefault() {
203+
return new Builder(OsLoginServiceStubSettings.newHttpJsonBuilder());
204+
}
205+
187206
public OsLoginServiceStubSettings.Builder getStubSettingsBuilder() {
188207
return ((OsLoginServiceStubSettings.Builder) getStubSettings());
189208
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.oslogin.v1.stub;
18+
19+
import com.google.api.core.BetaApi;
20+
import com.google.api.gax.httpjson.HttpJsonCallSettings;
21+
import com.google.api.gax.httpjson.HttpJsonCallableFactory;
22+
import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
23+
import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
24+
import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
25+
import com.google.api.gax.rpc.BatchingCallSettings;
26+
import com.google.api.gax.rpc.ClientContext;
27+
import com.google.api.gax.rpc.OperationCallSettings;
28+
import com.google.api.gax.rpc.OperationCallable;
29+
import com.google.api.gax.rpc.PagedCallSettings;
30+
import com.google.api.gax.rpc.ServerStreamingCallSettings;
31+
import com.google.api.gax.rpc.ServerStreamingCallable;
32+
import com.google.api.gax.rpc.UnaryCallSettings;
33+
import com.google.api.gax.rpc.UnaryCallable;
34+
import com.google.longrunning.Operation;
35+
import javax.annotation.Generated;
36+
37+
// AUTO-GENERATED DOCUMENTATION AND CLASS.
38+
/**
39+
* REST callable factory implementation for the OsLoginService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonOsLoginServiceCallableFactory
46+
implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
47+
48+
@Override
49+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
50+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
51+
UnaryCallSettings<RequestT, ResponseT> callSettings,
52+
ClientContext clientContext) {
53+
return HttpJsonCallableFactory.createUnaryCallable(
54+
httpJsonCallSettings, callSettings, clientContext);
55+
}
56+
57+
@Override
58+
public <RequestT, ResponseT, PagedListResponseT>
59+
UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
60+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
61+
PagedCallSettings<RequestT, ResponseT, PagedListResponseT> callSettings,
62+
ClientContext clientContext) {
63+
return HttpJsonCallableFactory.createPagedCallable(
64+
httpJsonCallSettings, callSettings, clientContext);
65+
}
66+
67+
@Override
68+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
69+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
70+
BatchingCallSettings<RequestT, ResponseT> callSettings,
71+
ClientContext clientContext) {
72+
return HttpJsonCallableFactory.createBatchingCallable(
73+
httpJsonCallSettings, callSettings, clientContext);
74+
}
75+
76+
@BetaApi(
77+
"The surface for long-running operations is not stable yet and may change in the future.")
78+
@Override
79+
public <RequestT, ResponseT, MetadataT>
80+
OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
81+
HttpJsonCallSettings<RequestT, Operation> httpJsonCallSettings,
82+
OperationCallSettings<RequestT, ResponseT, MetadataT> callSettings,
83+
ClientContext clientContext,
84+
OperationsStub operationsStub) {
85+
UnaryCallable<RequestT, Operation> innerCallable =
86+
HttpJsonCallableFactory.createBaseUnaryCallable(
87+
httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
88+
HttpJsonOperationSnapshotCallable<RequestT, Operation> initialCallable =
89+
new HttpJsonOperationSnapshotCallable<RequestT, Operation>(
90+
innerCallable,
91+
httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
92+
return HttpJsonCallableFactory.createOperationCallable(
93+
callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
94+
}
95+
96+
@Override
97+
public <RequestT, ResponseT>
98+
ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
99+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
100+
ServerStreamingCallSettings<RequestT, ResponseT> callSettings,
101+
ClientContext clientContext) {
102+
return HttpJsonCallableFactory.createServerStreamingCallable(
103+
httpJsonCallSettings, callSettings, clientContext);
104+
}
105+
}

0 commit comments

Comments
 (0)