Skip to content

Commit 9cb4048

Browse files
fix!: correct broken ConversationModelEvaluation resource pattern (#914)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 442646533 Source-Link: googleapis/googleapis@b62c562 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f5c157c68115847d78eb8412734cb82e7d5515b4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjVjMTU3YzY4MTE1ODQ3ZDc4ZWI4NDEyNzM0Y2I4MmU3ZDU1MTViNCJ9
1 parent 06bad32 commit 9cb4048

File tree

6 files changed

+579
-174
lines changed

6 files changed

+579
-174
lines changed

java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,10 @@ public void undeployConversationModelExceptionTest() throws Exception {
372372
public void getConversationModelEvaluationTest() throws Exception {
373373
ConversationModelEvaluation expectedResponse =
374374
ConversationModelEvaluation.newBuilder()
375-
.setName("name3373707")
375+
.setName(
376+
ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
377+
"[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
378+
.toString())
376379
.setDisplayName("displayName1714148973")
377380
.setEvaluationConfig(EvaluationConfig.newBuilder().build())
378381
.setCreateTime(Timestamp.newBuilder().build())
@@ -462,7 +465,10 @@ public void listConversationModelEvaluationsExceptionTest() throws Exception {
462465
public void createConversationModelEvaluationTest() throws Exception {
463466
ConversationModelEvaluation expectedResponse =
464467
ConversationModelEvaluation.newBuilder()
465-
.setName("name3373707")
468+
.setName(
469+
ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
470+
"[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
471+
.toString())
466472
.setDisplayName("displayName1714148973")
467473
.setEvaluationConfig(EvaluationConfig.newBuilder().build())
468474
.setCreateTime(Timestamp.newBuilder().build())
@@ -523,7 +529,10 @@ public void createConversationModelEvaluationExceptionTest() throws Exception {
523529
public void createConversationModelEvaluationTest2() throws Exception {
524530
ConversationModelEvaluation expectedResponse =
525531
ConversationModelEvaluation.newBuilder()
526-
.setName("name3373707")
532+
.setName(
533+
ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
534+
"[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
535+
.toString())
527536
.setDisplayName("displayName1714148973")
528537
.setEvaluationConfig(EvaluationConfig.newBuilder().build())
529538
.setCreateTime(Timestamp.newBuilder().build())

java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
117117
+ "OUTPUT_AUDIO_ENCODING_MP3\020\002\022%\n!OUTPUT_AU"
118118
+ "DIO_ENCODING_MP3_64_KBPS\020\004\022\"\n\036OUTPUT_AUD"
119119
+ "IO_ENCODING_OGG_OPUS\020\003\022\037\n\033OUTPUT_AUDIO_E"
120-
+ "NCODING_MULAW\020\005B\237\001\n\036com.google.cloud.dia"
120+
+ "NCODING_MULAW\020\005B\367\001\n\036com.google.cloud.dia"
121121
+ "logflow.v2B\020AudioConfigProtoP\001ZDgoogle.g"
122122
+ "olang.org/genproto/googleapis/cloud/dial"
123123
+ "ogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cl"
124-
+ "oud.Dialogflow.V2b\006proto3"
124+
+ "oud.Dialogflow.V2\352AU\n\033automl.googleapis."
125+
+ "com/Model\0226projects/{project}/locations/"
126+
+ "{location}/models/{model}b\006proto3"
125127
};
126128
descriptor =
127129
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -199,6 +201,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
199201
com.google.protobuf.ExtensionRegistry registry =
200202
com.google.protobuf.ExtensionRegistry.newInstance();
201203
registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
204+
registry.add(com.google.api.ResourceProto.resourceDefinition);
202205
com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
203206
descriptor, registry);
204207
com.google.api.FieldBehaviorProto.getDescriptor();

0 commit comments

Comments
 (0)