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

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 @@ -207,6 +208,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 @@ -19,6 +19,7 @@
// [START channel_v1_generated_cloudchannelserviceclient_cancelentitlement_sync]
import com.google.cloud.channel.v1.CancelEntitlementRequest;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.protobuf.Empty;

public class SyncCancelEntitlement {

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

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

// [START
// channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_channelpartnerlinknamechannelpartnerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_channelpartnerlinknamechannelpartnerrepricingconfig_sync]
import com.google.cloud.channel.v1.ChannelPartnerLinkName;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand Down Expand Up @@ -45,5 +44,4 @@ public static void main(String[] args) throws Exception {
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_channelpartnerlinknamechannelpartnerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_channelpartnerlinknamechannelpartnerrepricingconfig_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_stringchannelpartnerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_stringchannelpartnerrepricingconfig_sync]
import com.google.cloud.channel.v1.ChannelPartnerLinkName;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand All @@ -42,5 +41,4 @@ public static void syncCreateChannelPartnerRepricingConfigStringChannelpartnerre
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_stringchannelpartnerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_createchannelpartnerrepricingconfig_stringchannelpartnerrepricingconfig_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_customernamecustomerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_customernamecustomerrepricingconfig_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.cloud.channel.v1.CustomerRepricingConfig;
Expand All @@ -41,5 +40,4 @@ public static void syncCreateCustomerRepricingConfigCustomernameCustomerrepricin
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_customernamecustomerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_customernamecustomerrepricingconfig_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_stringcustomerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_stringcustomerrepricingconfig_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.cloud.channel.v1.CustomerRepricingConfig;
Expand All @@ -41,5 +40,4 @@ public static void syncCreateCustomerRepricingConfigStringCustomerrepricingconfi
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_stringcustomerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_createcustomerrepricingconfig_stringcustomerrepricingconfig_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfigName;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.DeleteChannelPartnerRepricingConfigRequest;
import com.google.protobuf.Empty;

public class SyncDeleteChannelPartnerRepricingConfig {

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

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

// [START
// channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
// [START channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfigName;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.protobuf.Empty;

public class SyncDeleteChannelPartnerRepricingConfigChannelpartnerrepricingconfigname {

Expand All @@ -39,5 +39,4 @@ public static void syncDeleteChannelPartnerRepricingConfigChannelpartnerrepricin
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
// [END channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_string_sync]
// [START channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_string_sync]
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfigName;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.protobuf.Empty;

public class SyncDeleteChannelPartnerRepricingConfigString {

Expand All @@ -39,5 +39,4 @@ public static void syncDeleteChannelPartnerRepricingConfigString() throws Except
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_string_sync]
// [END channel_v1_generated_cloudchannelserviceclient_deletechannelpartnerrepricingconfig_string_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.cloud.channel.v1.DeleteCustomerRequest;
import com.google.protobuf.Empty;

public class SyncDeleteCustomer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START channel_v1_generated_cloudchannelserviceclient_deletecustomer_customername_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.protobuf.Empty;

public class SyncDeleteCustomerCustomername {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START channel_v1_generated_cloudchannelserviceclient_deletecustomer_string_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.protobuf.Empty;

public class SyncDeleteCustomerString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerRepricingConfigName;
import com.google.cloud.channel.v1.DeleteCustomerRepricingConfigRequest;
import com.google.protobuf.Empty;

public class SyncDeleteCustomerRepricingConfig {

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

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

// [START
// channel_v1_generated_cloudchannelserviceclient_deletecustomerrepricingconfig_customerrepricingconfigname_sync]
// [START channel_v1_generated_cloudchannelserviceclient_deletecustomerrepricingconfig_customerrepricingconfigname_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerRepricingConfigName;
import com.google.protobuf.Empty;

public class SyncDeleteCustomerRepricingConfigCustomerrepricingconfigname {

Expand All @@ -38,5 +38,4 @@ public static void syncDeleteCustomerRepricingConfigCustomerrepricingconfigname(
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_deletecustomerrepricingconfig_customerrepricingconfigname_sync]
// [END channel_v1_generated_cloudchannelserviceclient_deletecustomerrepricingconfig_customerrepricingconfigname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START channel_v1_generated_cloudchannelserviceclient_deletecustomerrepricingconfig_string_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerRepricingConfigName;
import com.google.protobuf.Empty;

public class SyncDeleteCustomerRepricingConfigString {

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

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

// [START
// channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
// [START channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfigName;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand All @@ -41,5 +40,4 @@ public static void syncGetChannelPartnerRepricingConfigChannelpartnerrepricingco
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
// [END channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_channelpartnerrepricingconfigname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_string_sync]
// [START channel_v1_generated_cloudchannelserviceclient_getchannelpartnerrepricingconfig_string_sync]
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfigName;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_getcustomerrepricingconfig_customerrepricingconfigname_sync]
// [START channel_v1_generated_cloudchannelserviceclient_getcustomerrepricingconfig_customerrepricingconfigname_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerRepricingConfig;
import com.google.cloud.channel.v1.CustomerRepricingConfigName;
Expand All @@ -38,5 +37,4 @@ public static void syncGetCustomerRepricingConfigCustomerrepricingconfigname() t
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_getcustomerrepricingconfig_customerrepricingconfigname_sync]
// [END channel_v1_generated_cloudchannelserviceclient_getcustomerrepricingconfig_customerrepricingconfigname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_paged_async]
// [START channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_paged_async]
import com.google.cloud.channel.v1.ChannelPartnerLinkName;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand Down Expand Up @@ -60,5 +59,4 @@ public static void asyncListChannelPartnerRepricingConfigsPaged() throws Excepti
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_paged_async]
// [END channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_paged_async]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_channelpartnerlinkname_sync]
// [START channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_channelpartnerlinkname_sync]
import com.google.cloud.channel.v1.ChannelPartnerLinkName;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand All @@ -42,5 +41,4 @@ public static void syncListChannelPartnerRepricingConfigsChannelpartnerlinkname(
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_channelpartnerlinkname_sync]
// [END channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_channelpartnerlinkname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_string_sync]
// [START channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_string_sync]
import com.google.cloud.channel.v1.ChannelPartnerLinkName;
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;
Expand All @@ -40,5 +39,4 @@ public static void syncListChannelPartnerRepricingConfigsString() throws Excepti
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_string_sync]
// [END channel_v1_generated_cloudchannelserviceclient_listchannelpartnerrepricingconfigs_string_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_listcustomerrepricingconfigs_customername_sync]
// [START channel_v1_generated_cloudchannelserviceclient_listcustomerrepricingconfigs_customername_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerName;
import com.google.cloud.channel.v1.CustomerRepricingConfig;
Expand All @@ -40,5 +39,4 @@ public static void syncListCustomerRepricingConfigsCustomername() throws Excepti
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_listcustomerrepricingconfigs_customername_sync]
// [END channel_v1_generated_cloudchannelserviceclient_listcustomerrepricingconfigs_customername_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.Entitlement;
import com.google.cloud.channel.v1.TransferEntitlementsToGoogleRequest;
import com.google.protobuf.Empty;
import java.util.ArrayList;

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

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

// [START
// channel_v1_generated_cloudchannelserviceclient_updatechannelpartnerrepricingconfig_channelpartnerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_updatechannelpartnerrepricingconfig_channelpartnerrepricingconfig_sync]
import com.google.cloud.channel.v1.ChannelPartnerRepricingConfig;
import com.google.cloud.channel.v1.CloudChannelServiceClient;

Expand All @@ -40,5 +39,4 @@ public static void syncUpdateChannelPartnerRepricingConfigChannelpartnerrepricin
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_updatechannelpartnerrepricingconfig_channelpartnerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_updatechannelpartnerrepricingconfig_channelpartnerrepricingconfig_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

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

// [START
// channel_v1_generated_cloudchannelserviceclient_updatecustomerrepricingconfig_customerrepricingconfig_sync]
// [START channel_v1_generated_cloudchannelserviceclient_updatecustomerrepricingconfig_customerrepricingconfig_sync]
import com.google.cloud.channel.v1.CloudChannelServiceClient;
import com.google.cloud.channel.v1.CustomerRepricingConfig;

Expand All @@ -38,5 +37,4 @@ public static void syncUpdateCustomerRepricingConfigCustomerrepricingconfig() th
}
}
}
// [END
// channel_v1_generated_cloudchannelserviceclient_updatecustomerrepricingconfig_customerrepricingconfig_sync]
// [END channel_v1_generated_cloudchannelserviceclient_updatecustomerrepricingconfig_customerrepricingconfig_sync]