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

fix: update gapic-generator-java with mock service generation fixes #450

Merged
merged 2 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.httpjson.longrunning.OperationsClient;
import com.google.api.gax.longrunning.OperationFuture;
Expand Down Expand Up @@ -195,6 +196,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
@BetaApi
public final OperationsClient getHttpJsonOperationsClient() {
return httpJsonOperationsClient;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
@BetaApi
public final OperationsClient getHttpJsonOperationsClient() {
return httpJsonOperationsClient;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceSettings;
Expand All @@ -40,5 +39,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception {
AssuredWorkloadsServiceClient.create(assuredWorkloadsServiceSettings);
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceSettings;

Expand All @@ -39,5 +38,4 @@ public static void syncCreateSetCredentialsProvider1() throws Exception {
AssuredWorkloadsServiceClient.create(assuredWorkloadsServiceSettings);
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.LocationName;
import com.google.cloud.assuredworkloads.v1.Workload;
Expand All @@ -39,5 +38,4 @@ public static void syncCreateWorkloadLocationnameWorkload() throws Exception {
}
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.LocationName;
import com.google.cloud.assuredworkloads.v1.Workload;
Expand All @@ -39,5 +38,4 @@ public static void syncCreateWorkloadStringWorkload() throws Exception {
}
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.DeleteWorkloadRequest;
import com.google.cloud.assuredworkloads.v1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkload {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_deleteworkload_string_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkloadString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkloadWorkloadname {

Expand All @@ -37,5 +37,4 @@ public static void syncDeleteWorkloadWorkloadname() throws Exception {
}
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.LocationName;
import com.google.cloud.assuredworkloads.v1.Workload;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1.samples;

// [START
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
// [START assuredworkloads_v1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
import com.google.cloud.assuredworkloads.v1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1.Workload;
import com.google.protobuf.FieldMask;
Expand All @@ -39,5 +38,4 @@ public static void syncUpdateWorkloadWorkloadFieldmask() throws Exception {
}
}
}
// [END
// assuredworkloads_v1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
// [END assuredworkloads_v1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceSettings;
Expand All @@ -40,5 +39,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception {
AssuredWorkloadsServiceClient.create(assuredWorkloadsServiceSettings);
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceSettings;

Expand All @@ -39,5 +38,4 @@ public static void syncCreateSetCredentialsProvider1() throws Exception {
AssuredWorkloadsServiceClient.create(assuredWorkloadsServiceSettings);
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_create_setcredentialsprovider1_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.LocationName;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
Expand All @@ -39,5 +38,4 @@ public static void syncCreateWorkloadLocationnameWorkload() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_locationnameworkload_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.LocationName;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
Expand All @@ -39,5 +38,4 @@ public static void syncCreateWorkloadStringWorkload() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_createworkload_stringworkload_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.DeleteWorkloadRequest;
import com.google.cloud.assuredworkloads.v1beta1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkload {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_string_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_string_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkloadString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.WorkloadName;
import com.google.protobuf.Empty;

public class SyncDeleteWorkloadWorkloadname {

Expand All @@ -37,5 +37,4 @@ public static void syncDeleteWorkloadWorkloadname() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_deleteworkload_workloadname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_getworkload_workloadname_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_getworkload_workloadname_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
import com.google.cloud.assuredworkloads.v1beta1.WorkloadName;
Expand All @@ -38,5 +37,4 @@ public static void syncGetWorkloadWorkloadname() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_getworkload_workloadname_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_getworkload_workloadname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_paged_async]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_paged_async]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.ListWorkloadsRequest;
import com.google.cloud.assuredworkloads.v1beta1.ListWorkloadsResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.LocationName;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
Expand All @@ -40,5 +39,4 @@ public static void syncListWorkloadsLocationname() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_locationname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_string_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_listworkloads_string_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.LocationName;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
import com.google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsServiceClient;
import com.google.cloud.assuredworkloads.v1beta1.Workload;
import com.google.protobuf.FieldMask;
Expand All @@ -39,5 +38,4 @@ public static void syncUpdateWorkloadWorkloadFieldmask() throws Exception {
}
}
}
// [END
// assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
// [END assuredworkloads_v1beta1_generated_assuredworkloadsserviceclient_updateworkload_workloadfieldmask_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.assuredworkloads.v1beta1.stub.samples;

// [START
// assuredworkloads_v1beta1_generated_assuredworkloadsservicestubsettings_updateworkload_sync]
// [START assuredworkloads_v1beta1_generated_assuredworkloadsservicestubsettings_updateworkload_sync]
import com.google.cloud.assuredworkloads.v1beta1.stub.AssuredWorkloadsServiceStubSettings;
import java.time.Duration;

Expand Down