Skip to content

Commit 78b77a0

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Enable REST transport for most of Java and Go clients (googleapis#426)
- [ ] 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 3f1381b commit 78b77a0

255 files changed

Lines changed: 22413 additions & 22 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-security-private-ca/google-cloud-security-private-ca/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
<groupId>com.google.api</groupId>
7575
<artifactId>gax-grpc</artifactId>
7676
</dependency>
77+
<dependency>
78+
<groupId>com.google.api</groupId>
79+
<artifactId>gax-httpjson</artifactId>
80+
</dependency>
7781
<dependency>
7882
<groupId>org.threeten</groupId>
7983
<artifactId>threetenbp</artifactId>
@@ -98,12 +102,24 @@
98102
<scope>test</scope>
99103
</dependency>
100104
<!-- Need testing utility classes for generated gRPC clients tests -->
105+
<dependency>
106+
<groupId>com.google.api</groupId>
107+
<artifactId>gax</artifactId>
108+
<classifier>testlib</classifier>
109+
<scope>test</scope>
110+
</dependency>
101111
<dependency>
102112
<groupId>com.google.api</groupId>
103113
<artifactId>gax-grpc</artifactId>
104114
<classifier>testlib</classifier>
105115
<scope>test</scope>
106116
</dependency>
117+
<dependency>
118+
<groupId>com.google.api</groupId>
119+
<artifactId>gax-httpjson</artifactId>
120+
<classifier>testlib</classifier>
121+
<scope>test</scope>
122+
</dependency>
107123
</dependencies>
108124

109125
<profiles>

‎java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
2121
import com.google.api.gax.core.BackgroundResource;
22+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2223
import com.google.api.gax.longrunning.OperationFuture;
2324
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2425
import com.google.api.gax.paging.AbstractPage;
@@ -39,7 +40,6 @@
3940
import com.google.iam.v1.TestIamPermissionsRequest;
4041
import com.google.iam.v1.TestIamPermissionsResponse;
4142
import com.google.longrunning.Operation;
42-
import com.google.longrunning.OperationsClient;
4343
import com.google.protobuf.Empty;
4444
import com.google.protobuf.FieldMask;
4545
import java.io.IOException;
@@ -120,13 +120,30 @@
120120
* CertificateAuthorityServiceClient.create(certificateAuthorityServiceSettings);
121121
* }</pre>
122122
*
123+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
124+
* the wire:
125+
*
126+
* <pre>{@code
127+
* // This snippet has been automatically generated for illustrative purposes only.
128+
* // It may require modifications to work in your environment.
129+
* CertificateAuthorityServiceSettings certificateAuthorityServiceSettings =
130+
* CertificateAuthorityServiceSettings.newBuilder()
131+
* .setTransportChannelProvider(
132+
* CertificateAuthorityServiceSettings.defaultHttpJsonTransportProviderBuilder()
133+
* .build())
134+
* .build();
135+
* CertificateAuthorityServiceClient certificateAuthorityServiceClient =
136+
* CertificateAuthorityServiceClient.create(certificateAuthorityServiceSettings);
137+
* }</pre>
138+
*
123139
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
124140
*/
125141
@Generated("by gapic-generator-java")
126142
public class CertificateAuthorityServiceClient implements BackgroundResource {
127143
private final CertificateAuthorityServiceSettings settings;
128144
private final CertificateAuthorityServiceStub stub;
129-
private final OperationsClient operationsClient;
145+
private final OperationsClient httpJsonOperationsClient;
146+
private final com.google.longrunning.OperationsClient operationsClient;
130147

131148
/** Constructs an instance of CertificateAuthorityServiceClient with default settings. */
132149
public static final CertificateAuthorityServiceClient create() throws IOException {
@@ -161,13 +178,17 @@ protected CertificateAuthorityServiceClient(CertificateAuthorityServiceSettings
161178
throws IOException {
162179
this.settings = settings;
163180
this.stub = ((CertificateAuthorityServiceStubSettings) settings.getStubSettings()).createStub();
164-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
181+
this.operationsClient =
182+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
183+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
165184
}
166185

167186
protected CertificateAuthorityServiceClient(CertificateAuthorityServiceStub stub) {
168187
this.settings = null;
169188
this.stub = stub;
170-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
189+
this.operationsClient =
190+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
191+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
171192
}
172193

173194
public final CertificateAuthorityServiceSettings getSettings() {
@@ -182,10 +203,18 @@ public CertificateAuthorityServiceStub getStub() {
182203
* Returns the OperationsClient that can be used to query the status of a long-running operation
183204
* returned by another API method call.
184205
*/
185-
public final OperationsClient getOperationsClient() {
206+
public final com.google.longrunning.OperationsClient getOperationsClient() {
186207
return operationsClient;
187208
}
188209

210+
/**
211+
* Returns the OperationsClient that can be used to query the status of a long-running operation
212+
* returned by another API method call.
213+
*/
214+
public final OperationsClient getHttpJsonOperationsClient() {
215+
return httpJsonOperationsClient;
216+
}
217+
189218
// AUTO-GENERATED DOCUMENTATION AND METHOD.
190219
/**
191220
* Create a new [Certificate][google.cloud.security.privateca.v1.Certificate] in a given Project,

‎java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceSettings.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.google.api.gax.core.GoogleCredentialsProvider;
2929
import com.google.api.gax.core.InstantiatingExecutorProvider;
3030
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
31+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3132
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3233
import com.google.api.gax.rpc.ClientContext;
3334
import com.google.api.gax.rpc.ClientSettings;
@@ -448,11 +449,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
448449
return CertificateAuthorityServiceStubSettings.defaultCredentialsProviderBuilder();
449450
}
450451

451-
/** Returns a builder for the default ChannelProvider for this service. */
452+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
452453
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
453454
return CertificateAuthorityServiceStubSettings.defaultGrpcTransportProviderBuilder();
454455
}
455456

457+
/** Returns a builder for the default REST ChannelProvider for this service. */
458+
@BetaApi
459+
public static InstantiatingHttpJsonChannelProvider.Builder
460+
defaultHttpJsonTransportProviderBuilder() {
461+
return CertificateAuthorityServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
462+
}
463+
456464
public static TransportChannelProvider defaultTransportChannelProvider() {
457465
return CertificateAuthorityServiceStubSettings.defaultTransportChannelProvider();
458466
}
@@ -462,11 +470,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
462470
return CertificateAuthorityServiceStubSettings.defaultApiClientHeaderProviderBuilder();
463471
}
464472

465-
/** Returns a new builder for this class. */
473+
/** Returns a new gRPC builder for this class. */
466474
public static Builder newBuilder() {
467475
return Builder.createDefault();
468476
}
469477

478+
/** Returns a new REST builder for this class. */
479+
@BetaApi
480+
public static Builder newHttpJsonBuilder() {
481+
return Builder.createHttpJsonDefault();
482+
}
483+
470484
/** Returns a new builder for this class. */
471485
public static Builder newBuilder(ClientContext clientContext) {
472486
return new Builder(clientContext);
@@ -505,6 +519,11 @@ private static Builder createDefault() {
505519
return new Builder(CertificateAuthorityServiceStubSettings.newBuilder());
506520
}
507521

522+
@BetaApi
523+
private static Builder createHttpJsonDefault() {
524+
return new Builder(CertificateAuthorityServiceStubSettings.newHttpJsonBuilder());
525+
}
526+
508527
public CertificateAuthorityServiceStubSettings.Builder getStubSettingsBuilder() {
509528
return ((CertificateAuthorityServiceStubSettings.Builder) getStubSettings());
510529
}

‎java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStub.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@
9292
public abstract class CertificateAuthorityServiceStub implements BackgroundResource {
9393

9494
public OperationsStub getOperationsStub() {
95-
throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
95+
return null;
96+
}
97+
98+
public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
99+
return null;
96100
}
97101

98102
public UnaryCallable<CreateCertificateRequest, Certificate> createCertificateCallable() {

‎java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStubSettings.java‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
import com.google.api.gax.grpc.GrpcTransportChannel;
3434
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
3535
import com.google.api.gax.grpc.ProtoOperationTransformers;
36+
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
37+
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
38+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3639
import com.google.api.gax.longrunning.OperationSnapshot;
3740
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
3841
import com.google.api.gax.retrying.RetrySettings;
@@ -961,6 +964,11 @@ public CertificateAuthorityServiceStub createStub() throws IOException {
961964
.equals(GrpcTransportChannel.getGrpcTransportName())) {
962965
return GrpcCertificateAuthorityServiceStub.create(this);
963966
}
967+
if (getTransportChannelProvider()
968+
.getTransportName()
969+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
970+
return HttpJsonCertificateAuthorityServiceStub.create(this);
971+
}
964972
throw new UnsupportedOperationException(
965973
String.format(
966974
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -993,30 +1001,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
9931001
.setUseJwtAccessWithScope(true);
9941002
}
9951003

996-
/** Returns a builder for the default ChannelProvider for this service. */
1004+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
9971005
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
9981006
return InstantiatingGrpcChannelProvider.newBuilder()
9991007
.setMaxInboundMessageSize(Integer.MAX_VALUE);
10001008
}
10011009

1010+
/** Returns a builder for the default REST ChannelProvider for this service. */
1011+
@BetaApi
1012+
public static InstantiatingHttpJsonChannelProvider.Builder
1013+
defaultHttpJsonTransportProviderBuilder() {
1014+
return InstantiatingHttpJsonChannelProvider.newBuilder();
1015+
}
1016+
10021017
public static TransportChannelProvider defaultTransportChannelProvider() {
10031018
return defaultGrpcTransportProviderBuilder().build();
10041019
}
10051020

10061021
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
1007-
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
1022+
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
10081023
return ApiClientHeaderProvider.newBuilder()
10091024
.setGeneratedLibToken(
10101025
"gapic", GaxProperties.getLibraryVersion(CertificateAuthorityServiceStubSettings.class))
10111026
.setTransportToken(
10121027
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
10131028
}
10141029

1015-
/** Returns a new builder for this class. */
1030+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
1031+
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
1032+
return ApiClientHeaderProvider.newBuilder()
1033+
.setGeneratedLibToken(
1034+
"gapic", GaxProperties.getLibraryVersion(CertificateAuthorityServiceStubSettings.class))
1035+
.setTransportToken(
1036+
GaxHttpJsonProperties.getHttpJsonTokenName(),
1037+
GaxHttpJsonProperties.getHttpJsonVersion());
1038+
}
1039+
1040+
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
1041+
return CertificateAuthorityServiceStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
1042+
}
1043+
1044+
/** Returns a new gRPC builder for this class. */
10161045
public static Builder newBuilder() {
10171046
return Builder.createDefault();
10181047
}
10191048

1049+
/** Returns a new REST builder for this class. */
1050+
public static Builder newHttpJsonBuilder() {
1051+
return Builder.createHttpJsonDefault();
1052+
}
1053+
10201054
/** Returns a new builder for this class. */
10211055
public static Builder newBuilder(ClientContext clientContext) {
10221056
return new Builder(clientContext);
@@ -1475,6 +1509,19 @@ private static Builder createDefault() {
14751509
return initDefaults(builder);
14761510
}
14771511

1512+
private static Builder createHttpJsonDefault() {
1513+
Builder builder = new Builder(((ClientContext) null));
1514+
1515+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
1516+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
1517+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
1518+
builder.setEndpoint(getDefaultEndpoint());
1519+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
1520+
builder.setSwitchToMtlsEndpointAllowed(true);
1521+
1522+
return initDefaults(builder);
1523+
}
1524+
14781525
private static Builder initDefaults(Builder builder) {
14791526
builder
14801527
.createCertificateSettings()

0 commit comments

Comments
 (0)