Skip to content

Commit d2e17f0

Browse files
fix: update gapic-generator-java with mock service generation fixes (googleapis#794)
* fix!: remove Application and Profile services and and related protos, enums, and messages PiperOrigin-RevId: 453241222 Source-Link: googleapis/googleapis@7837470 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ae2c052743706161ac95adc5048ad5a3de8a6585 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWUyYzA1Mjc0MzcwNjE2MWFjOTVhZGM1MDQ4YWQ1YTNkZThhNjU4NSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Integrate new gapic-generator-java and rules_gapic PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Enable REST transport for most of Java and Go clients PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update pom.xml * fix: update gapic-generator-java with mock service generation fixes PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>
1 parent 4db2ff4 commit d2e17f0

File tree

237 files changed

+13313
-118086
lines changed

Some content is hidden

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

237 files changed

+13313
-118086
lines changed

java-talent/google-cloud-talent/pom.xml

+16
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>
@@ -89,12 +93,24 @@
8993
<scope>test</scope>
9094
</dependency>
9195
<!-- Need testing utility classes for generated gRPC clients tests -->
96+
<dependency>
97+
<groupId>com.google.api</groupId>
98+
<artifactId>gax</artifactId>
99+
<classifier>testlib</classifier>
100+
<scope>test</scope>
101+
</dependency>
92102
<dependency>
93103
<groupId>com.google.api</groupId>
94104
<artifactId>gax-grpc</artifactId>
95105
<classifier>testlib</classifier>
96106
<scope>test</scope>
97107
</dependency>
108+
<dependency>
109+
<groupId>com.google.api</groupId>
110+
<artifactId>gax-httpjson</artifactId>
111+
<classifier>testlib</classifier>
112+
<scope>test</scope>
113+
</dependency>
98114
</dependencies>
99115

100116
<profiles>

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/CompanyServiceClient.java

+15-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,20 @@
9999
* CompanyServiceClient companyServiceClient = CompanyServiceClient.create(companyServiceSettings);
100100
* }</pre>
101101
*
102+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
103+
* the wire:
104+
*
105+
* <pre>{@code
106+
* // This snippet has been automatically generated for illustrative purposes only.
107+
* // It may require modifications to work in your environment.
108+
* CompanyServiceSettings companyServiceSettings =
109+
* CompanyServiceSettings.newBuilder()
110+
* .setTransportChannelProvider(
111+
* CompanyServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
112+
* .build();
113+
* CompanyServiceClient companyServiceClient = CompanyServiceClient.create(companyServiceSettings);
114+
* }</pre>
115+
*
102116
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
103117
*/
104118
@Generated("by gapic-generator-java")
@@ -680,7 +694,7 @@ public final ListCompaniesPagedResponse listCompanies(ListCompaniesRequest reque
680694
* .build();
681695
* while (true) {
682696
* ListCompaniesResponse response = companyServiceClient.listCompaniesCallable().call(request);
683-
* for (Company element : response.getResponsesList()) {
697+
* for (Company element : response.getCompaniesList()) {
684698
* // doThingsWith(element);
685699
* }
686700
* String nextPageToken = response.getNextPageToken();

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/CompanyServiceSettings.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.core.GoogleCredentialsProvider;
2424
import com.google.api.gax.core.InstantiatingExecutorProvider;
2525
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
26+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2627
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2728
import com.google.api.gax.rpc.ClientContext;
2829
import com.google.api.gax.rpc.ClientSettings;
@@ -123,11 +124,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
123124
return CompanyServiceStubSettings.defaultCredentialsProviderBuilder();
124125
}
125126

126-
/** Returns a builder for the default ChannelProvider for this service. */
127+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
127128
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
128129
return CompanyServiceStubSettings.defaultGrpcTransportProviderBuilder();
129130
}
130131

132+
/** Returns a builder for the default REST ChannelProvider for this service. */
133+
@BetaApi
134+
public static InstantiatingHttpJsonChannelProvider.Builder
135+
defaultHttpJsonTransportProviderBuilder() {
136+
return CompanyServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
137+
}
138+
131139
public static TransportChannelProvider defaultTransportChannelProvider() {
132140
return CompanyServiceStubSettings.defaultTransportChannelProvider();
133141
}
@@ -137,11 +145,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
137145
return CompanyServiceStubSettings.defaultApiClientHeaderProviderBuilder();
138146
}
139147

140-
/** Returns a new builder for this class. */
148+
/** Returns a new gRPC builder for this class. */
141149
public static Builder newBuilder() {
142150
return Builder.createDefault();
143151
}
144152

153+
/** Returns a new REST builder for this class. */
154+
@BetaApi
155+
public static Builder newHttpJsonBuilder() {
156+
return Builder.createHttpJsonDefault();
157+
}
158+
145159
/** Returns a new builder for this class. */
146160
public static Builder newBuilder(ClientContext clientContext) {
147161
return new Builder(clientContext);
@@ -179,6 +193,11 @@ private static Builder createDefault() {
179193
return new Builder(CompanyServiceStubSettings.newBuilder());
180194
}
181195

196+
@BetaApi
197+
private static Builder createHttpJsonDefault() {
198+
return new Builder(CompanyServiceStubSettings.newHttpJsonBuilder());
199+
}
200+
182201
public CompanyServiceStubSettings.Builder getStubSettingsBuilder() {
183202
return ((CompanyServiceStubSettings.Builder) getStubSettings());
184203
}

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/CompletionClient.java

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

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/CompletionSettings.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;
@@ -96,11 +97,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
9697
return CompletionStubSettings.defaultCredentialsProviderBuilder();
9798
}
9899

99-
/** Returns a builder for the default ChannelProvider for this service. */
100+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
100101
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
101102
return CompletionStubSettings.defaultGrpcTransportProviderBuilder();
102103
}
103104

105+
/** Returns a builder for the default REST ChannelProvider for this service. */
106+
@BetaApi
107+
public static InstantiatingHttpJsonChannelProvider.Builder
108+
defaultHttpJsonTransportProviderBuilder() {
109+
return CompletionStubSettings.defaultHttpJsonTransportProviderBuilder();
110+
}
111+
104112
public static TransportChannelProvider defaultTransportChannelProvider() {
105113
return CompletionStubSettings.defaultTransportChannelProvider();
106114
}
@@ -110,11 +118,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
110118
return CompletionStubSettings.defaultApiClientHeaderProviderBuilder();
111119
}
112120

113-
/** Returns a new builder for this class. */
121+
/** Returns a new gRPC builder for this class. */
114122
public static Builder newBuilder() {
115123
return Builder.createDefault();
116124
}
117125

126+
/** Returns a new REST builder for this class. */
127+
@BetaApi
128+
public static Builder newHttpJsonBuilder() {
129+
return Builder.createHttpJsonDefault();
130+
}
131+
118132
/** Returns a new builder for this class. */
119133
public static Builder newBuilder(ClientContext clientContext) {
120134
return new Builder(clientContext);
@@ -152,6 +166,11 @@ private static Builder createDefault() {
152166
return new Builder(CompletionStubSettings.newBuilder());
153167
}
154168

169+
@BetaApi
170+
private static Builder createHttpJsonDefault() {
171+
return new Builder(CompletionStubSettings.newHttpJsonBuilder());
172+
}
173+
155174
public CompletionStubSettings.Builder getStubSettingsBuilder() {
156175
return ((CompletionStubSettings.Builder) getStubSettings());
157176
}

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/EventServiceClient.java

+14
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@
8989
* EventServiceClient eventServiceClient = EventServiceClient.create(eventServiceSettings);
9090
* }</pre>
9191
*
92+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
93+
* the wire:
94+
*
95+
* <pre>{@code
96+
* // This snippet has been automatically generated for illustrative purposes only.
97+
* // It may require modifications to work in your environment.
98+
* EventServiceSettings eventServiceSettings =
99+
* EventServiceSettings.newBuilder()
100+
* .setTransportChannelProvider(
101+
* EventServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
102+
* .build();
103+
* EventServiceClient eventServiceClient = EventServiceClient.create(eventServiceSettings);
104+
* }</pre>
105+
*
92106
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
93107
*/
94108
@Generated("by gapic-generator-java")

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/EventServiceSettings.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;
@@ -97,11 +98,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
9798
return EventServiceStubSettings.defaultCredentialsProviderBuilder();
9899
}
99100

100-
/** Returns a builder for the default ChannelProvider for this service. */
101+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
101102
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
102103
return EventServiceStubSettings.defaultGrpcTransportProviderBuilder();
103104
}
104105

106+
/** Returns a builder for the default REST ChannelProvider for this service. */
107+
@BetaApi
108+
public static InstantiatingHttpJsonChannelProvider.Builder
109+
defaultHttpJsonTransportProviderBuilder() {
110+
return EventServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
111+
}
112+
105113
public static TransportChannelProvider defaultTransportChannelProvider() {
106114
return EventServiceStubSettings.defaultTransportChannelProvider();
107115
}
@@ -111,11 +119,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
111119
return EventServiceStubSettings.defaultApiClientHeaderProviderBuilder();
112120
}
113121

114-
/** Returns a new builder for this class. */
122+
/** Returns a new gRPC builder for this class. */
115123
public static Builder newBuilder() {
116124
return Builder.createDefault();
117125
}
118126

127+
/** Returns a new REST builder for this class. */
128+
@BetaApi
129+
public static Builder newHttpJsonBuilder() {
130+
return Builder.createHttpJsonDefault();
131+
}
132+
119133
/** Returns a new builder for this class. */
120134
public static Builder newBuilder(ClientContext clientContext) {
121135
return new Builder(clientContext);
@@ -153,6 +167,11 @@ private static Builder createDefault() {
153167
return new Builder(EventServiceStubSettings.newBuilder());
154168
}
155169

170+
@BetaApi
171+
private static Builder createHttpJsonDefault() {
172+
return new Builder(EventServiceStubSettings.newHttpJsonBuilder());
173+
}
174+
156175
public EventServiceStubSettings.Builder getStubSettingsBuilder() {
157176
return ((EventServiceStubSettings.Builder) getStubSettings());
158177
}

java-talent/google-cloud-talent/src/main/java/com/google/cloud/talent/v4/JobServiceClient.java

+35-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
21+
import com.google.api.core.BetaApi;
2122
import com.google.api.gax.core.BackgroundResource;
23+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2224
import com.google.api.gax.longrunning.OperationFuture;
2325
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2426
import com.google.api.gax.paging.AbstractPage;
@@ -30,7 +32,6 @@
3032
import com.google.cloud.talent.v4.stub.JobServiceStubSettings;
3133
import com.google.common.util.concurrent.MoreExecutors;
3234
import com.google.longrunning.Operation;
33-
import com.google.longrunning.OperationsClient;
3435
import com.google.protobuf.Empty;
3536
import com.google.protobuf.FieldMask;
3637
import java.io.IOException;
@@ -104,13 +105,28 @@
104105
* JobServiceClient jobServiceClient = JobServiceClient.create(jobServiceSettings);
105106
* }</pre>
106107
*
108+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
109+
* the wire:
110+
*
111+
* <pre>{@code
112+
* // This snippet has been automatically generated for illustrative purposes only.
113+
* // It may require modifications to work in your environment.
114+
* JobServiceSettings jobServiceSettings =
115+
* JobServiceSettings.newBuilder()
116+
* .setTransportChannelProvider(
117+
* JobServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
118+
* .build();
119+
* JobServiceClient jobServiceClient = JobServiceClient.create(jobServiceSettings);
120+
* }</pre>
121+
*
107122
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
108123
*/
109124
@Generated("by gapic-generator-java")
110125
public class JobServiceClient implements BackgroundResource {
111126
private final JobServiceSettings settings;
112127
private final JobServiceStub stub;
113-
private final OperationsClient operationsClient;
128+
private final OperationsClient httpJsonOperationsClient;
129+
private final com.google.longrunning.OperationsClient operationsClient;
114130

115131
/** Constructs an instance of JobServiceClient with default settings. */
116132
public static final JobServiceClient create() throws IOException {
@@ -140,13 +156,17 @@ public static final JobServiceClient create(JobServiceStub stub) {
140156
protected JobServiceClient(JobServiceSettings settings) throws IOException {
141157
this.settings = settings;
142158
this.stub = ((JobServiceStubSettings) settings.getStubSettings()).createStub();
143-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
159+
this.operationsClient =
160+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
161+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
144162
}
145163

146164
protected JobServiceClient(JobServiceStub stub) {
147165
this.settings = null;
148166
this.stub = stub;
149-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
167+
this.operationsClient =
168+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
169+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
150170
}
151171

152172
public final JobServiceSettings getSettings() {
@@ -161,10 +181,19 @@ public JobServiceStub getStub() {
161181
* Returns the OperationsClient that can be used to query the status of a long-running operation
162182
* returned by another API method call.
163183
*/
164-
public final OperationsClient getOperationsClient() {
184+
public final com.google.longrunning.OperationsClient getOperationsClient() {
165185
return operationsClient;
166186
}
167187

188+
/**
189+
* Returns the OperationsClient that can be used to query the status of a long-running operation
190+
* returned by another API method call.
191+
*/
192+
@BetaApi
193+
public final OperationsClient getHttpJsonOperationsClient() {
194+
return httpJsonOperationsClient;
195+
}
196+
168197
// AUTO-GENERATED DOCUMENTATION AND METHOD.
169198
/**
170199
* Creates a new job.
@@ -1197,7 +1226,7 @@ public final UnaryCallable<ListJobsRequest, ListJobsPagedResponse> listJobsPaged
11971226
* .build();
11981227
* while (true) {
11991228
* ListJobsResponse response = jobServiceClient.listJobsCallable().call(request);
1200-
* for (Job element : response.getResponsesList()) {
1229+
* for (Job element : response.getJobsList()) {
12011230
* // doThingsWith(element);
12021231
* }
12031232
* String nextPageToken = response.getNextPageToken();

0 commit comments

Comments
 (0)