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 #491

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 @@ -197,6 +198,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 @@ -199,6 +199,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.osconfig.v1.samples;

// [START
// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
// [START osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeployments;
import com.google.cloud.osconfig.v1.ProjectName;
Expand All @@ -42,5 +41,4 @@ public static void syncCreatePatchDeploymentProjectnamePatchdeploymentspatchdepl
}
}
}
// [END
// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
// [END osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_projectnamepatchdeploymentspatchdeploymentstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
// [START osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeployments;
import com.google.cloud.osconfig.v1.ProjectName;
Expand All @@ -42,5 +41,4 @@ public static void syncCreatePatchDeploymentStringPatchdeploymentspatchdeploymen
}
}
}
// [END
// osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
// [END osconfig_v1_generated_osconfigserviceclient_createpatchdeployment_stringpatchdeploymentspatchdeploymentstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeploymentName;
import com.google.cloud.osconfig.v1.PatchDeployments;
import com.google.protobuf.Empty;

public class SyncDeletePatchDeployment {

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

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

// [START
// osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_patchdeploymentname_sync]
// [START osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_patchdeploymentname_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeploymentName;
import com.google.protobuf.Empty;

public class SyncDeletePatchDeploymentPatchdeploymentname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START osconfig_v1_generated_osconfigserviceclient_deletepatchdeployment_string_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeploymentName;
import com.google.protobuf.Empty;

public class SyncDeletePatchDeploymentString {

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

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

// [START
// osconfig_v1_generated_osconfigserviceclient_resumepatchdeployment_patchdeploymentname_sync]
// [START osconfig_v1_generated_osconfigserviceclient_resumepatchdeployment_patchdeploymentname_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeploymentName;
import com.google.cloud.osconfig.v1.PatchDeployments;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
// [START osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
import com.google.cloud.osconfig.v1.OsConfigServiceClient;
import com.google.cloud.osconfig.v1.PatchDeployments;
import com.google.protobuf.FieldMask;
Expand All @@ -41,5 +40,4 @@ public static void syncUpdatePatchDeploymentPatchdeploymentspatchdeploymentField
}
}
}
// [END
// osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
// [END osconfig_v1_generated_osconfigserviceclient_updatepatchdeployment_patchdeploymentspatchdeploymentfieldmask_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
import com.google.cloud.osconfig.v1.LocationName;
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -44,5 +43,4 @@ public static void syncCreateOSPolicyAssignmentLocationnameOspolicyassignmentStr
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
import com.google.cloud.osconfig.v1.LocationName;
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -43,5 +42,4 @@ public static void syncCreateOSPolicyAssignmentStringOspolicyassignmentString()
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.osconfig.v1.DeleteOSPolicyAssignmentRequest;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.protobuf.Empty;

public class SyncDeleteOSPolicyAssignment {

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

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.protobuf.Empty;

public class SyncDeleteOSPolicyAssignmentOspolicyassignmentname {

Expand All @@ -38,5 +38,4 @@ public static void syncDeleteOSPolicyAssignmentOspolicyassignmentname() throws E
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_ospolicyassignmentname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START osconfig_v1_generated_osconfigzonalserviceclient_deleteospolicyassignment_string_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.protobuf.Empty;

public class SyncDeleteOSPolicyAssignmentString {

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

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -39,5 +38,4 @@ public static void syncGetOSPolicyAssignmentOspolicyassignmentname() throws Exce
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignment_ospolicyassignmentname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentReportName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -41,5 +40,4 @@ public static void syncGetOSPolicyAssignmentReportOspolicyassignmentreportname()
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_getospolicyassignmentreport_ospolicyassignmentreportname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.cloud.osconfig.v1.VulnerabilityReport;
import com.google.cloud.osconfig.v1.VulnerabilityReportName;
Expand All @@ -39,5 +38,4 @@ public static void syncGetVulnerabilityReportVulnerabilityreportname() throws Ex
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_getvulnerabilityreport_vulnerabilityreportname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_paged_async]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_paged_async]
import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentReportsRequest;
import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentReportsResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -44,5 +43,4 @@ public static void syncListOSPolicyAssignmentReportsInstanceospolicyassignmentna
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_instanceospolicyassignmentname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_string_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentreports_string_sync]
import com.google.cloud.osconfig.v1.InstanceOSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentReport;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentRevisionsRequest;
import com.google.cloud.osconfig.v1.ListOSPolicyAssignmentRevisionsResponse;
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
Expand Down Expand Up @@ -60,5 +59,4 @@ public static void asyncListOSPolicyAssignmentRevisionsPaged() throws Exception
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_paged_async]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -42,5 +41,4 @@ public static void syncListOSPolicyAssignmentRevisionsOspolicyassignmentname() t
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_ospolicyassignmentname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OSPolicyAssignmentName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand All @@ -42,5 +41,4 @@ public static void syncListOSPolicyAssignmentRevisionsString() throws Exception
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignmentrevisions_string_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignments_locationname_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listospolicyassignments_locationname_sync]
import com.google.cloud.osconfig.v1.LocationName;
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_listvulnerabilityreports_instancename_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_listvulnerabilityreports_instancename_sync]
import com.google.cloud.osconfig.v1.InstanceName;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.cloud.osconfig.v1.VulnerabilityReport;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
// [START osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
import com.google.cloud.osconfig.v1.OSPolicyAssignment;
import com.google.cloud.osconfig.v1.OsConfigZonalServiceClient;
import com.google.protobuf.FieldMask;
Expand All @@ -42,5 +41,4 @@ public static void syncUpdateOSPolicyAssignmentOspolicyassignmentFieldmask() thr
}
}
}
// [END
// osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
// [END osconfig_v1_generated_osconfigzonalserviceclient_updateospolicyassignment_ospolicyassignmentfieldmask_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.osconfig.v1alpha.samples;

// [START
// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
// [START osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
import com.google.cloud.osconfig.v1alpha.LocationName;
import com.google.cloud.osconfig.v1alpha.OSPolicyAssignment;
import com.google.cloud.osconfig.v1alpha.OsConfigZonalServiceClient;
Expand All @@ -44,5 +43,4 @@ public static void syncCreateOSPolicyAssignmentLocationnameOspolicyassignmentStr
}
}
}
// [END
// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
// [END osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_locationnameospolicyassignmentstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.osconfig.v1alpha.samples;

// [START
// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
// [START osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
import com.google.cloud.osconfig.v1alpha.LocationName;
import com.google.cloud.osconfig.v1alpha.OSPolicyAssignment;
import com.google.cloud.osconfig.v1alpha.OsConfigZonalServiceClient;
Expand All @@ -43,5 +42,4 @@ public static void syncCreateOSPolicyAssignmentStringOspolicyassignmentString()
}
}
}
// [END
// osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
// [END osconfig_v1alpha_generated_osconfigzonalserviceclient_createospolicyassignment_stringospolicyassignmentstring_sync]
Loading