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

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

Merged
merged 4 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 @@ -185,6 +186,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 @@ -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 @@ -196,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 @@ -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 @@ -191,6 +192,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 @@ -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 @@ -196,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 @@ -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 @@ -189,6 +190,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 @@ -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 @@ -187,6 +188,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 @@ -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 @@ -186,6 +187,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 @@ -187,6 +187,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 @@ -198,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 @@ -191,6 +191,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 @@ -191,6 +191,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 @@ -188,6 +188,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 @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.DeleteAgentRequest;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncDeleteAgent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_deleteagent_locationname_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.LocationName;
import com.google.protobuf.Empty;

public class SyncDeleteAgentLocationname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_deleteagent_projectname_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncDeleteAgentProjectname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_deleteagent_string_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncDeleteAgentString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ImportAgentRequest;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncImportAgent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.cloud.dialogflow.v2.RestoreAgentRequest;
import com.google.protobuf.Empty;

public class SyncRestoreAgent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.cloud.dialogflow.v2.TrainAgentRequest;
import com.google.protobuf.Empty;

public class SyncTrainAgent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_trainagent_locationname_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.LocationName;
import com.google.protobuf.Empty;

public class SyncTrainAgentLocationname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_trainagent_projectname_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncTrainAgentProjectname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_agentsclient_trainagent_string_sync]
import com.google.cloud.dialogflow.v2.AgentsClient;
import com.google.cloud.dialogflow.v2.ProjectName;
import com.google.protobuf.Empty;

public class SyncTrainAgentString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.cloud.dialogflow.v2.DeleteAllContextsRequest;
import com.google.cloud.dialogflow.v2.SessionName;
import com.google.protobuf.Empty;

public class SyncDeleteAllContexts {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_contextsclient_deleteallcontexts_sessionname_sync]
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.cloud.dialogflow.v2.SessionName;
import com.google.protobuf.Empty;

public class SyncDeleteAllContextsSessionname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_contextsclient_deleteallcontexts_string_sync]
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.cloud.dialogflow.v2.SessionName;
import com.google.protobuf.Empty;

public class SyncDeleteAllContextsString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.ContextName;
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.cloud.dialogflow.v2.DeleteContextRequest;
import com.google.protobuf.Empty;

public class SyncDeleteContext {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_contextsclient_deletecontext_contextname_sync]
import com.google.cloud.dialogflow.v2.ContextName;
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.protobuf.Empty;

public class SyncDeleteContextContextname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_contextsclient_deletecontext_string_sync]
import com.google.cloud.dialogflow.v2.ContextName;
import com.google.cloud.dialogflow.v2.ContextsClient;
import com.google.protobuf.Empty;

public class SyncDeleteContextString {

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

package com.google.cloud.dialogflow.v2.samples;

// [START
// dialogflow_v2_generated_conversationdatasetsclient_createconversationdataset_stringconversationdataset_sync]
// [START dialogflow_v2_generated_conversationdatasetsclient_createconversationdataset_stringconversationdataset_sync]
import com.google.cloud.dialogflow.v2.ConversationDataset;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;

Expand All @@ -41,5 +40,4 @@ public static void syncCreateConversationDatasetStringConversationdataset() thro
}
}
}
// [END
// dialogflow_v2_generated_conversationdatasetsclient_createconversationdataset_stringconversationdataset_sync]
// [END dialogflow_v2_generated_conversationdatasetsclient_createconversationdataset_stringconversationdataset_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.dialogflow.v2.ConversationDatasetName;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;
import com.google.cloud.dialogflow.v2.DeleteConversationDatasetRequest;
import com.google.protobuf.Empty;

public class SyncDeleteConversationDataset {

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

package com.google.cloud.dialogflow.v2.samples;

// [START
// dialogflow_v2_generated_conversationdatasetsclient_deleteconversationdataset_conversationdatasetname_sync]
// [START dialogflow_v2_generated_conversationdatasetsclient_deleteconversationdataset_conversationdatasetname_sync]
import com.google.cloud.dialogflow.v2.ConversationDatasetName;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;
import com.google.protobuf.Empty;

public class SyncDeleteConversationDatasetConversationdatasetname {

Expand All @@ -38,5 +38,4 @@ public static void syncDeleteConversationDatasetConversationdatasetname() throws
}
}
}
// [END
// dialogflow_v2_generated_conversationdatasetsclient_deleteconversationdataset_conversationdatasetname_sync]
// [END dialogflow_v2_generated_conversationdatasetsclient_deleteconversationdataset_conversationdatasetname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START dialogflow_v2_generated_conversationdatasetsclient_deleteconversationdataset_string_sync]
import com.google.cloud.dialogflow.v2.ConversationDatasetName;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;
import com.google.protobuf.Empty;

public class SyncDeleteConversationDatasetString {

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

package com.google.cloud.dialogflow.v2.samples;

// [START
// dialogflow_v2_generated_conversationdatasetsclient_getconversationdataset_conversationdatasetname_sync]
// [START dialogflow_v2_generated_conversationdatasetsclient_getconversationdataset_conversationdatasetname_sync]
import com.google.cloud.dialogflow.v2.ConversationDataset;
import com.google.cloud.dialogflow.v2.ConversationDatasetName;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;
Expand All @@ -39,5 +38,4 @@ public static void syncGetConversationDatasetConversationdatasetname() throws Ex
}
}
}
// [END
// dialogflow_v2_generated_conversationdatasetsclient_getconversationdataset_conversationdatasetname_sync]
// [END dialogflow_v2_generated_conversationdatasetsclient_getconversationdataset_conversationdatasetname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.dialogflow.v2.samples;

// [START
// dialogflow_v2_generated_conversationdatasetsclient_listconversationdatasets_locationname_sync]
// [START dialogflow_v2_generated_conversationdatasetsclient_listconversationdatasets_locationname_sync]
import com.google.cloud.dialogflow.v2.ConversationDataset;
import com.google.cloud.dialogflow.v2.ConversationDatasetsClient;
import com.google.cloud.dialogflow.v2.LocationName;
Expand All @@ -41,5 +40,4 @@ public static void syncListConversationDatasetsLocationname() throws Exception {
}
}
}
// [END
// dialogflow_v2_generated_conversationdatasetsclient_listconversationdatasets_locationname_sync]
// [END dialogflow_v2_generated_conversationdatasetsclient_listconversationdatasets_locationname_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.dialogflow.v2.samples;

// [START
// dialogflow_v2_generated_conversationmodelsclient_createconversationmodel_stringconversationmodel_sync]
// [START dialogflow_v2_generated_conversationmodelsclient_createconversationmodel_stringconversationmodel_sync]
import com.google.cloud.dialogflow.v2.ConversationModel;
import com.google.cloud.dialogflow.v2.ConversationModelsClient;

Expand All @@ -38,5 +37,4 @@ public static void syncCreateConversationModelStringConversationmodel() throws E
}
}
}
// [END
// dialogflow_v2_generated_conversationmodelsclient_createconversationmodel_stringconversationmodel_sync]
// [END dialogflow_v2_generated_conversationmodelsclient_createconversationmodel_stringconversationmodel_sync]
Loading