Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 7348caf

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: update gapic-generator-java (#854)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 454939894 Source-Link: googleapis/googleapis@519ca44 Source-Link: https://github.com/googleapis/googleapis-gen/commit/fc639d21a7cbc30aa0a9b862586942a0fb46c5c8 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZmM2MzlkMjFhN2NiYzMwYWEwYTliODYyNTg2OTQyYTBmYjQ2YzVjOCJ9 feat: Add Java REST transport to analytics, servicecontrol, servicemanagement, serviceusage and langauge APIs PiperOrigin-RevId: 454254635 Source-Link: googleapis/googleapis@84fb822 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ffb61264d6fb634c430829dd2da75c5bed08304 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZmYjYxMjY0ZDZmYjYzNGM0MzA4MjlkZDJkYTc1YzViZWQwODMwNCJ9
1 parent b9d245a commit 7348caf

13 files changed

+2511
-10
lines changed

‎google-cloud-language/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
<groupId>com.google.api</groupId>
6363
<artifactId>gax-grpc</artifactId>
6464
</dependency>
65+
<dependency>
66+
<groupId>com.google.api</groupId>
67+
<artifactId>gax-httpjson</artifactId>
68+
</dependency>
6569
<dependency>
6670
<groupId>org.threeten</groupId>
6771
<artifactId>threetenbp</artifactId>
@@ -85,12 +89,24 @@
8589
<scope>test</scope>
8690
</dependency>
8791
<!-- Need testing utility classes for generated gRPC clients tests -->
92+
<dependency>
93+
<groupId>com.google.api</groupId>
94+
<artifactId>gax</artifactId>
95+
<classifier>testlib</classifier>
96+
<scope>test</scope>
97+
</dependency>
8898
<dependency>
8999
<groupId>com.google.api</groupId>
90100
<artifactId>gax-grpc</artifactId>
91101
<classifier>testlib</classifier>
92102
<scope>test</scope>
93103
</dependency>
104+
<dependency>
105+
<groupId>com.google.api</groupId>
106+
<artifactId>gax-httpjson</artifactId>
107+
<classifier>testlib</classifier>
108+
<scope>test</scope>
109+
</dependency>
94110
</dependencies>
95111

96112
<profiles>

‎google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,21 @@
9292
* LanguageServiceClient.create(languageServiceSettings);
9393
* }</pre>
9494
*
95+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
96+
* the wire:
97+
*
98+
* <pre>{@code
99+
* // This snippet has been automatically generated for illustrative purposes only.
100+
* // It may require modifications to work in your environment.
101+
* LanguageServiceSettings languageServiceSettings =
102+
* LanguageServiceSettings.newBuilder()
103+
* .setTransportChannelProvider(
104+
* LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
105+
* .build();
106+
* LanguageServiceClient languageServiceClient =
107+
* LanguageServiceClient.create(languageServiceSettings);
108+
* }</pre>
109+
*
95110
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
96111
*/
97112
@Generated("by gapic-generator-java")

‎google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java‎

Lines changed: 21 additions & 2 deletions
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;
@@ -126,11 +127,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
126127
return LanguageServiceStubSettings.defaultCredentialsProviderBuilder();
127128
}
128129

129-
/** Returns a builder for the default ChannelProvider for this service. */
130+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
130131
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
131132
return LanguageServiceStubSettings.defaultGrpcTransportProviderBuilder();
132133
}
133134

135+
/** Returns a builder for the default REST ChannelProvider for this service. */
136+
@BetaApi
137+
public static InstantiatingHttpJsonChannelProvider.Builder
138+
defaultHttpJsonTransportProviderBuilder() {
139+
return LanguageServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
140+
}
141+
134142
public static TransportChannelProvider defaultTransportChannelProvider() {
135143
return LanguageServiceStubSettings.defaultTransportChannelProvider();
136144
}
@@ -140,11 +148,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
140148
return LanguageServiceStubSettings.defaultApiClientHeaderProviderBuilder();
141149
}
142150

143-
/** Returns a new builder for this class. */
151+
/** Returns a new gRPC builder for this class. */
144152
public static Builder newBuilder() {
145153
return Builder.createDefault();
146154
}
147155

156+
/** Returns a new REST builder for this class. */
157+
@BetaApi
158+
public static Builder newHttpJsonBuilder() {
159+
return Builder.createHttpJsonDefault();
160+
}
161+
148162
/** Returns a new builder for this class. */
149163
public static Builder newBuilder(ClientContext clientContext) {
150164
return new Builder(clientContext);
@@ -182,6 +196,11 @@ private static Builder createDefault() {
182196
return new Builder(LanguageServiceStubSettings.newBuilder());
183197
}
184198

199+
@BetaApi
200+
private static Builder createHttpJsonDefault() {
201+
return new Builder(LanguageServiceStubSettings.newHttpJsonBuilder());
202+
}
203+
185204
public LanguageServiceStubSettings.Builder getStubSettingsBuilder() {
186205
return ((LanguageServiceStubSettings.Builder) getStubSettings());
187206
}

‎google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/HttpJsonLanguageServiceCallableFactory.java‎

Lines changed: 105 additions & 0 deletions
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.language.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 LanguageService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@Generated("by gapic-generator-java")
44+
@BetaApi
45+
public class HttpJsonLanguageServiceCallableFactory
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)