fix!: correct broken ConversationModelEvaluation resource pattern (#914)

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 442646533 Source-Link: googleapis/googleapis@b62c562 Source-Link: googleapis/googleapis-gen@f5c157c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjVjMTU3YzY4MTE1ODQ3ZDc4ZWI4NDEyNzM0Y2I4MmU3ZDU1MTViNCJ9
googleapis · Apr 19, 2022 · 2c812e1 · 2c812e1
1 parent 8613d6b
commit 2c812e1
Show file tree

Hide file tree

Showing 6 changed files with 579 additions and 174 deletions.
diff --git a/...dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java b/...dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ConversationModelsClientTest.java
@@ -372,7 +372,10 @@ public void undeployConversationModelExceptionTest() throws Exception {
   public void getConversationModelEvaluationTest() throws Exception {
     ConversationModelEvaluation expectedResponse =
         ConversationModelEvaluation.newBuilder()
-            .setName("name3373707")
+            .setName(
+                ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
+                        "[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
+                    .toString())
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
@@ -462,7 +465,10 @@ public void listConversationModelEvaluationsExceptionTest() throws Exception {
   public void createConversationModelEvaluationTest() throws Exception {
     ConversationModelEvaluation expectedResponse =
         ConversationModelEvaluation.newBuilder()
-            .setName("name3373707")
+            .setName(
+                ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
+                        "[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
+                    .toString())
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())
@@ -523,7 +529,10 @@ public void createConversationModelEvaluationExceptionTest() throws Exception {
   public void createConversationModelEvaluationTest2() throws Exception {
     ConversationModelEvaluation expectedResponse =
         ConversationModelEvaluation.newBuilder()
-            .setName("name3373707")
+            .setName(
+                ConversationModelEvaluationName.ofProjectConversationModelEvaluationName(
+                        "[PROJECT]", "[CONVERSATION_MODEL]", "[EVALUATION]")
+                    .toString())
             .setDisplayName("displayName1714148973")
             .setEvaluationConfig(EvaluationConfig.newBuilder().build())
             .setCreateTime(Timestamp.newBuilder().build())

diff --git a/...le-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java b/...le-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AudioConfigProto.java
@@ -117,11 +117,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "OUTPUT_AUDIO_ENCODING_MP3\020\002\022%\n!OUTPUT_AU"
           + "DIO_ENCODING_MP3_64_KBPS\020\004\022\"\n\036OUTPUT_AUD"
           + "IO_ENCODING_OGG_OPUS\020\003\022\037\n\033OUTPUT_AUDIO_E"
-          + "NCODING_MULAW\020\005B\237\001\n\036com.google.cloud.dia"
+          + "NCODING_MULAW\020\005B\367\001\n\036com.google.cloud.dia"
           + "logflow.v2B\020AudioConfigProtoP\001ZDgoogle.g"
           + "olang.org/genproto/googleapis/cloud/dial"
           + "ogflow/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cl"
-          + "oud.Dialogflow.V2b\006proto3"
+          + "oud.Dialogflow.V2\352AU\n\033automl.googleapis."
+          + "com/Model\0226projects/{project}/locations/"
+          + "{location}/models/{model}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -199,6 +201,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
+    registry.add(com.google.api.ResourceProto.resourceDefinition);
     com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
         descriptor, registry);
     com.google.api.FieldBehaviorProto.getDescriptor();