From e65c7333f2f272137d5dfe4ec4cdaab1e7dbe0f8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 20:40:18 +0000 Subject: [PATCH] feat: added the display name of the current page in webhook requests (#381) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 417856932 Source-Link: https://github.com/googleapis/googleapis/commit/16ecf078815cb7e28b0bb30a086fdc1ed12ed54e Source-Link: https://github.com/googleapis/googleapis-gen/commit/d2955219b65fb7f47fce96c93dfbf25c2fde1d82 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDI5NTUyMTliNjVmYjdmNDdmY2U5NmM5M2RmYmYyNWMyZmRlMWQ4MiJ9 --- .../cloud/dialogflow/cx/v3/PageInfo.java | 186 ++++++++++++++++++ .../dialogflow/cx/v3/PageInfoOrBuilder.java | 27 +++ .../cloud/dialogflow/cx/v3/WebhookProto.java | 113 +++++------ .../cloud/dialogflow/cx/v3/webhook.proto | 4 + .../cloud/dialogflow/cx/v3beta1/PageInfo.java | 186 ++++++++++++++++++ .../cx/v3beta1/PageInfoOrBuilder.java | 27 +++ .../dialogflow/cx/v3beta1/WebhookProto.java | 118 +++++------ .../cloud/dialogflow/cx/v3beta1/webhook.proto | 4 + 8 files changed, 550 insertions(+), 115 deletions(-) diff --git a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfo.java b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfo.java index 45a52f9a9..38c899111 100644 --- a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfo.java +++ b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfo.java @@ -39,6 +39,7 @@ private PageInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { private PageInfo() { currentPage_ = ""; + displayName_ = ""; } @java.lang.Override @@ -92,6 +93,13 @@ private PageInfo( formInfo_ = subBuilder.buildPartial(); } + break; + } + case 34: + { + java.lang.String s = input.readStringRequireUtf8(); + + displayName_ = s; break; } default: @@ -3021,6 +3029,57 @@ public com.google.protobuf.ByteString getCurrentPageBytes() { } } + public static final int DISPLAY_NAME_FIELD_NUMBER = 4; + private volatile java.lang.Object displayName_; + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + @java.lang.Override + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } + } + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + @java.lang.Override + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + public static final int FORM_INFO_FIELD_NUMBER = 3; private com.google.cloud.dialogflow.cx.v3.PageInfo.FormInfo formInfo_; /** @@ -3092,6 +3151,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (formInfo_ != null) { output.writeMessage(3, getFormInfo()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, displayName_); + } unknownFields.writeTo(output); } @@ -3107,6 +3169,9 @@ public int getSerializedSize() { if (formInfo_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getFormInfo()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, displayName_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -3124,6 +3189,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.dialogflow.cx.v3.PageInfo) obj; if (!getCurrentPage().equals(other.getCurrentPage())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; if (hasFormInfo() != other.hasFormInfo()) return false; if (hasFormInfo()) { if (!getFormInfo().equals(other.getFormInfo())) return false; @@ -3141,6 +3207,8 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CURRENT_PAGE_FIELD_NUMBER; hash = (53 * hash) + getCurrentPage().hashCode(); + hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; + hash = (53 * hash) + getDisplayName().hashCode(); if (hasFormInfo()) { hash = (37 * hash) + FORM_INFO_FIELD_NUMBER; hash = (53 * hash) + getFormInfo().hashCode(); @@ -3292,6 +3360,8 @@ public Builder clear() { super.clear(); currentPage_ = ""; + displayName_ = ""; + if (formInfoBuilder_ == null) { formInfo_ = null; } else { @@ -3326,6 +3396,7 @@ public com.google.cloud.dialogflow.cx.v3.PageInfo buildPartial() { com.google.cloud.dialogflow.cx.v3.PageInfo result = new com.google.cloud.dialogflow.cx.v3.PageInfo(this); result.currentPage_ = currentPage_; + result.displayName_ = displayName_; if (formInfoBuilder_ == null) { result.formInfo_ = formInfo_; } else { @@ -3384,6 +3455,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.cx.v3.PageInfo other) { currentPage_ = other.currentPage_; onChanged(); } + if (!other.getDisplayName().isEmpty()) { + displayName_ = other.displayName_; + onChanged(); + } if (other.hasFormInfo()) { mergeFormInfo(other.getFormInfo()); } @@ -3537,6 +3612,117 @@ public Builder setCurrentPageBytes(com.google.protobuf.ByteString value) { return this; } + private java.lang.Object displayName_ = ""; + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @param value The displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + displayName_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return This builder for chaining. + */ + public Builder clearDisplayName() { + + displayName_ = getDefaultInstance().getDisplayName(); + onChanged(); + return this; + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @param value The bytes for displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + displayName_ = value; + onChanged(); + return this; + } + private com.google.cloud.dialogflow.cx.v3.PageInfo.FormInfo formInfo_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.cx.v3.PageInfo.FormInfo, diff --git a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfoOrBuilder.java b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfoOrBuilder.java index ffd1c2e6a..8099256fe 100644 --- a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfoOrBuilder.java +++ b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/PageInfoOrBuilder.java @@ -54,6 +54,33 @@ public interface PageInfoOrBuilder */ com.google.protobuf.ByteString getCurrentPageBytes(); + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + java.lang.String getDisplayName(); + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + com.google.protobuf.ByteString getDisplayNameBytes(); + /** * * diff --git a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/WebhookProto.java b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/WebhookProto.java index 8705ad94b..21055b4c4 100644 --- a/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/WebhookProto.java +++ b/proto-google-cloud-dialogflow-cx-v3/src/main/java/com/google/cloud/dialogflow/cx/v3/WebhookProto.java @@ -225,61 +225,62 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ulfillmentResponse.MergeBehavior\"H\n\rMerg" + "eBehavior\022\036\n\032MERGE_BEHAVIOR_UNSPECIFIED\020" + "\000\022\n\n\006APPEND\020\001\022\013\n\007REPLACE\020\002B\014\n\ntransition" - + "\"\235\004\n\010PageInfo\0229\n\014current_page\030\001 \001(\tB#\372A " - + "\n\036dialogflow.googleapis.com/Page\022C\n\tform" - + "_info\030\003 \001(\01320.google.cloud.dialogflow.cx" - + ".v3.PageInfo.FormInfo\032\220\003\n\010FormInfo\022V\n\016pa" - + "rameter_info\030\002 \003(\0132>.google.cloud.dialog" - + "flow.cx.v3.PageInfo.FormInfo.ParameterIn" - + "fo\032\253\002\n\rParameterInfo\022\024\n\014display_name\030\001 \001" - + "(\t\022\020\n\010required\030\002 \001(\010\022\\\n\005state\030\003 \001(\0162M.go" - + "ogle.cloud.dialogflow.cx.v3.PageInfo.For" - + "mInfo.ParameterInfo.ParameterState\022%\n\005va" - + "lue\030\004 \001(\0132\026.google.protobuf.Value\022\026\n\016jus" - + "t_collected\030\005 \001(\010\"U\n\016ParameterState\022\037\n\033P" - + "ARAMETER_STATE_UNSPECIFIED\020\000\022\t\n\005EMPTY\020\001\022" - + "\013\n\007INVALID\020\002\022\n\n\006FILLED\020\003\"\341\001\n\013SessionInfo" - + "\0227\n\007session\030\001 \001(\tB&\372A#\n!dialogflow.googl" - + "eapis.com/Session\022N\n\nparameters\030\002 \003(\0132:." - + "google.cloud.dialogflow.cx.v3.SessionInf" - + "o.ParametersEntry\032I\n\017ParametersEntry\022\013\n\003" - + "key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.protob" - + "uf.Value:\0028\0012\267\010\n\010Webhooks\022\277\001\n\014ListWebhoo" - + "ks\0222.google.cloud.dialogflow.cx.v3.ListW" - + "ebhooksRequest\0323.google.cloud.dialogflow" - + ".cx.v3.ListWebhooksResponse\"F\202\323\344\223\0027\0225/v3" - + "/{parent=projects/*/locations/*/agents/*" - + "}/webhooks\332A\006parent\022\254\001\n\nGetWebhook\0220.goo" - + "gle.cloud.dialogflow.cx.v3.GetWebhookReq" - + "uest\032&.google.cloud.dialogflow.cx.v3.Web" - + "hook\"D\202\323\344\223\0027\0225/v3/{name=projects/*/locat" - + "ions/*/agents/*/webhooks/*}\332A\004name\022\305\001\n\rC" - + "reateWebhook\0223.google.cloud.dialogflow.c" - + "x.v3.CreateWebhookRequest\032&.google.cloud" - + ".dialogflow.cx.v3.Webhook\"W\202\323\344\223\002@\"5/v3/{" - + "parent=projects/*/locations/*/agents/*}/" - + "webhooks:\007webhook\332A\016parent,webhook\022\322\001\n\rU" - + "pdateWebhook\0223.google.cloud.dialogflow.c" - + "x.v3.UpdateWebhookRequest\032&.google.cloud" - + ".dialogflow.cx.v3.Webhook\"d\202\323\344\223\002H2=/v3/{" - + "webhook.name=projects/*/locations/*/agen" - + "ts/*/webhooks/*}:\007webhook\332A\023webhook,upda" - + "te_mask\022\242\001\n\rDeleteWebhook\0223.google.cloud" - + ".dialogflow.cx.v3.DeleteWebhookRequest\032\026" - + ".google.protobuf.Empty\"D\202\323\344\223\0027*5/v3/{nam" - + "e=projects/*/locations/*/agents/*/webhoo" - + "ks/*}\332A\004name\032x\312A\031dialogflow.googleapis.c" - + "om\322AYhttps://www.googleapis.com/auth/clo" - + "ud-platform,https://www.googleapis.com/a" - + "uth/dialogflowB\277\002\n!com.google.cloud.dial" - + "ogflow.cx.v3B\014WebhookProtoP\001Z?google.gol" - + "ang.org/genproto/googleapis/cloud/dialog" - + "flow/cx/v3;cx\370\001\001\242\002\002DF\252\002\035Google.Cloud.Dia" - + "logflow.Cx.V3\352\002!Google::Cloud::Dialogflo" - + "w::CX::V3\352A|\n\'servicedirectory.googleapi" - + "s.com/Service\022Qprojects/{project}/locati" - + "ons/{location}/namespaces/{namespace}/se" - + "rvices/{service}b\006proto3" + + "\"\263\004\n\010PageInfo\0229\n\014current_page\030\001 \001(\tB#\372A " + + "\n\036dialogflow.googleapis.com/Page\022\024\n\014disp" + + "lay_name\030\004 \001(\t\022C\n\tform_info\030\003 \001(\01320.goog" + + "le.cloud.dialogflow.cx.v3.PageInfo.FormI" + + "nfo\032\220\003\n\010FormInfo\022V\n\016parameter_info\030\002 \003(\013" + + "2>.google.cloud.dialogflow.cx.v3.PageInf" + + "o.FormInfo.ParameterInfo\032\253\002\n\rParameterIn" + + "fo\022\024\n\014display_name\030\001 \001(\t\022\020\n\010required\030\002 \001" + + "(\010\022\\\n\005state\030\003 \001(\0162M.google.cloud.dialogf" + + "low.cx.v3.PageInfo.FormInfo.ParameterInf" + + "o.ParameterState\022%\n\005value\030\004 \001(\0132\026.google" + + ".protobuf.Value\022\026\n\016just_collected\030\005 \001(\010\"" + + "U\n\016ParameterState\022\037\n\033PARAMETER_STATE_UNS" + + "PECIFIED\020\000\022\t\n\005EMPTY\020\001\022\013\n\007INVALID\020\002\022\n\n\006FI" + + "LLED\020\003\"\341\001\n\013SessionInfo\0227\n\007session\030\001 \001(\tB" + + "&\372A#\n!dialogflow.googleapis.com/Session\022" + + "N\n\nparameters\030\002 \003(\0132:.google.cloud.dialo" + + "gflow.cx.v3.SessionInfo.ParametersEntry\032" + + "I\n\017ParametersEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value" + + "\030\002 \001(\0132\026.google.protobuf.Value:\0028\0012\267\010\n\010W" + + "ebhooks\022\277\001\n\014ListWebhooks\0222.google.cloud." + + "dialogflow.cx.v3.ListWebhooksRequest\0323.g" + + "oogle.cloud.dialogflow.cx.v3.ListWebhook" + + "sResponse\"F\202\323\344\223\0027\0225/v3/{parent=projects/" + + "*/locations/*/agents/*}/webhooks\332A\006paren" + + "t\022\254\001\n\nGetWebhook\0220.google.cloud.dialogfl" + + "ow.cx.v3.GetWebhookRequest\032&.google.clou" + + "d.dialogflow.cx.v3.Webhook\"D\202\323\344\223\0027\0225/v3/" + + "{name=projects/*/locations/*/agents/*/we" + + "bhooks/*}\332A\004name\022\305\001\n\rCreateWebhook\0223.goo" + + "gle.cloud.dialogflow.cx.v3.CreateWebhook" + + "Request\032&.google.cloud.dialogflow.cx.v3." + + "Webhook\"W\202\323\344\223\002@\"5/v3/{parent=projects/*/" + + "locations/*/agents/*}/webhooks:\007webhook\332" + + "A\016parent,webhook\022\322\001\n\rUpdateWebhook\0223.goo" + + "gle.cloud.dialogflow.cx.v3.UpdateWebhook" + + "Request\032&.google.cloud.dialogflow.cx.v3." + + "Webhook\"d\202\323\344\223\002H2=/v3/{webhook.name=proje" + + "cts/*/locations/*/agents/*/webhooks/*}:\007" + + "webhook\332A\023webhook,update_mask\022\242\001\n\rDelete" + + "Webhook\0223.google.cloud.dialogflow.cx.v3." + + "DeleteWebhookRequest\032\026.google.protobuf.E" + + "mpty\"D\202\323\344\223\0027*5/v3/{name=projects/*/locat" + + "ions/*/agents/*/webhooks/*}\332A\004name\032x\312A\031d" + + "ialogflow.googleapis.com\322AYhttps://www.g" + + "oogleapis.com/auth/cloud-platform,https:" + + "//www.googleapis.com/auth/dialogflowB\277\002\n" + + "!com.google.cloud.dialogflow.cx.v3B\014Webh" + + "ookProtoP\001Z?google.golang.org/genproto/g" + + "oogleapis/cloud/dialogflow/cx/v3;cx\370\001\001\242\002" + + "\002DF\252\002\035Google.Cloud.Dialogflow.Cx.V3\352\002!Go" + + "ogle::Cloud::Dialogflow::CX::V3\352A|\n\'serv" + + "icedirectory.googleapis.com/Service\022Qpro" + + "jects/{project}/locations/{location}/nam" + + "espaces/{namespace}/services/{service}b\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -484,7 +485,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_dialogflow_cx_v3_PageInfo_descriptor, new java.lang.String[] { - "CurrentPage", "FormInfo", + "CurrentPage", "DisplayName", "FormInfo", }); internal_static_google_cloud_dialogflow_cx_v3_PageInfo_FormInfo_descriptor = internal_static_google_cloud_dialogflow_cx_v3_PageInfo_descriptor.getNestedTypes().get(0); diff --git a/proto-google-cloud-dialogflow-cx-v3/src/main/proto/google/cloud/dialogflow/cx/v3/webhook.proto b/proto-google-cloud-dialogflow-cx-v3/src/main/proto/google/cloud/dialogflow/cx/v3/webhook.proto index 9ab52a1e1..b2d7f3618 100644 --- a/proto-google-cloud-dialogflow-cx-v3/src/main/proto/google/cloud/dialogflow/cx/v3/webhook.proto +++ b/proto-google-cloud-dialogflow-cx-v3/src/main/proto/google/cloud/dialogflow/cx/v3/webhook.proto @@ -509,6 +509,10 @@ message PageInfo { type: "dialogflow.googleapis.com/Page" }]; + // Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse]. + // The display name of the current page. + string display_name = 4; + // Optional for both [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest] and [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse]. // Information about the form. FormInfo form_info = 3; diff --git a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfo.java b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfo.java index 2f3fc3e92..569b31a19 100644 --- a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfo.java +++ b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfo.java @@ -39,6 +39,7 @@ private PageInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { private PageInfo() { currentPage_ = ""; + displayName_ = ""; } @java.lang.Override @@ -92,6 +93,13 @@ private PageInfo( formInfo_ = subBuilder.buildPartial(); } + break; + } + case 34: + { + java.lang.String s = input.readStringRequireUtf8(); + + displayName_ = s; break; } default: @@ -3044,6 +3052,57 @@ public com.google.protobuf.ByteString getCurrentPageBytes() { } } + public static final int DISPLAY_NAME_FIELD_NUMBER = 4; + private volatile java.lang.Object displayName_; + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + @java.lang.Override + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } + } + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + @java.lang.Override + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + public static final int FORM_INFO_FIELD_NUMBER = 3; private com.google.cloud.dialogflow.cx.v3beta1.PageInfo.FormInfo formInfo_; /** @@ -3115,6 +3174,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (formInfo_ != null) { output.writeMessage(3, getFormInfo()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, displayName_); + } unknownFields.writeTo(output); } @@ -3130,6 +3192,9 @@ public int getSerializedSize() { if (formInfo_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getFormInfo()); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, displayName_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -3147,6 +3212,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.dialogflow.cx.v3beta1.PageInfo) obj; if (!getCurrentPage().equals(other.getCurrentPage())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; if (hasFormInfo() != other.hasFormInfo()) return false; if (hasFormInfo()) { if (!getFormInfo().equals(other.getFormInfo())) return false; @@ -3164,6 +3230,8 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CURRENT_PAGE_FIELD_NUMBER; hash = (53 * hash) + getCurrentPage().hashCode(); + hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; + hash = (53 * hash) + getDisplayName().hashCode(); if (hasFormInfo()) { hash = (37 * hash) + FORM_INFO_FIELD_NUMBER; hash = (53 * hash) + getFormInfo().hashCode(); @@ -3315,6 +3383,8 @@ public Builder clear() { super.clear(); currentPage_ = ""; + displayName_ = ""; + if (formInfoBuilder_ == null) { formInfo_ = null; } else { @@ -3349,6 +3419,7 @@ public com.google.cloud.dialogflow.cx.v3beta1.PageInfo buildPartial() { com.google.cloud.dialogflow.cx.v3beta1.PageInfo result = new com.google.cloud.dialogflow.cx.v3beta1.PageInfo(this); result.currentPage_ = currentPage_; + result.displayName_ = displayName_; if (formInfoBuilder_ == null) { result.formInfo_ = formInfo_; } else { @@ -3408,6 +3479,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.cx.v3beta1.PageInfo other) currentPage_ = other.currentPage_; onChanged(); } + if (!other.getDisplayName().isEmpty()) { + displayName_ = other.displayName_; + onChanged(); + } if (other.hasFormInfo()) { mergeFormInfo(other.getFormInfo()); } @@ -3561,6 +3636,117 @@ public Builder setCurrentPageBytes(com.google.protobuf.ByteString value) { return this; } + private java.lang.Object displayName_ = ""; + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @param value The displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + displayName_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @return This builder for chaining. + */ + public Builder clearDisplayName() { + + displayName_ = getDefaultInstance().getDisplayName(); + onChanged(); + return this; + } + /** + * + * + *
+     * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+     * The display name of the current page.
+     * 
+ * + * string display_name = 4; + * + * @param value The bytes for displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + displayName_ = value; + onChanged(); + return this; + } + private com.google.cloud.dialogflow.cx.v3beta1.PageInfo.FormInfo formInfo_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.cx.v3beta1.PageInfo.FormInfo, diff --git a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfoOrBuilder.java b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfoOrBuilder.java index a6608831f..ab7d24512 100644 --- a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfoOrBuilder.java +++ b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/PageInfoOrBuilder.java @@ -54,6 +54,33 @@ public interface PageInfoOrBuilder */ com.google.protobuf.ByteString getCurrentPageBytes(); + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The displayName. + */ + java.lang.String getDisplayName(); + /** + * + * + *
+   * Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse].
+   * The display name of the current page.
+   * 
+ * + * string display_name = 4; + * + * @return The bytes for displayName. + */ + com.google.protobuf.ByteString getDisplayNameBytes(); + /** * * diff --git a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/WebhookProto.java b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/WebhookProto.java index 77c26af47..a998137f9 100644 --- a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/WebhookProto.java +++ b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/WebhookProto.java @@ -227,65 +227,65 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ogflow.cx.v3beta1.WebhookResponse.Fulfil" + "lmentResponse.MergeBehavior\"H\n\rMergeBeha" + "vior\022\036\n\032MERGE_BEHAVIOR_UNSPECIFIED\020\000\022\n\n\006" - + "APPEND\020\001\022\013\n\007REPLACE\020\002B\014\n\ntransition\"\254\004\n\010" + + "APPEND\020\001\022\013\n\007REPLACE\020\002B\014\n\ntransition\"\302\004\n\010" + "PageInfo\0229\n\014current_page\030\001 \001(\tB#\372A \n\036dia" - + "logflow.googleapis.com/Page\022H\n\tform_info" - + "\030\003 \001(\01325.google.cloud.dialogflow.cx.v3be" - + "ta1.PageInfo.FormInfo\032\232\003\n\010FormInfo\022[\n\016pa" - + "rameter_info\030\002 \003(\0132C.google.cloud.dialog" - + "flow.cx.v3beta1.PageInfo.FormInfo.Parame" - + "terInfo\032\260\002\n\rParameterInfo\022\024\n\014display_nam" - + "e\030\001 \001(\t\022\020\n\010required\030\002 \001(\010\022a\n\005state\030\003 \001(\016" - + "2R.google.cloud.dialogflow.cx.v3beta1.Pa" - + "geInfo.FormInfo.ParameterInfo.ParameterS" - + "tate\022%\n\005value\030\004 \001(\0132\026.google.protobuf.Va" - + "lue\022\026\n\016just_collected\030\005 \001(\010\"U\n\016Parameter" - + "State\022\037\n\033PARAMETER_STATE_UNSPECIFIED\020\000\022\t" - + "\n\005EMPTY\020\001\022\013\n\007INVALID\020\002\022\n\n\006FILLED\020\003\"\346\001\n\013S" - + "essionInfo\0227\n\007session\030\001 \001(\tB&\372A#\n!dialog" - + "flow.googleapis.com/Session\022S\n\nparameter" - + "s\030\002 \003(\0132?.google.cloud.dialogflow.cx.v3b" - + "eta1.SessionInfo.ParametersEntry\032I\n\017Para" - + "metersEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132" - + "\026.google.protobuf.Value:\0028\0012\375\010\n\010Webhooks" - + "\022\316\001\n\014ListWebhooks\0227.google.cloud.dialogf" - + "low.cx.v3beta1.ListWebhooksRequest\0328.goo" - + "gle.cloud.dialogflow.cx.v3beta1.ListWebh" - + "ooksResponse\"K\202\323\344\223\002<\022:/v3beta1/{parent=p" - + "rojects/*/locations/*/agents/*}/webhooks" - + "\332A\006parent\022\273\001\n\nGetWebhook\0225.google.cloud." - + "dialogflow.cx.v3beta1.GetWebhookRequest\032" - + "+.google.cloud.dialogflow.cx.v3beta1.Web" - + "hook\"I\202\323\344\223\002<\022:/v3beta1/{name=projects/*/" - + "locations/*/agents/*/webhooks/*}\332A\004name\022" - + "\324\001\n\rCreateWebhook\0228.google.cloud.dialogf" - + "low.cx.v3beta1.CreateWebhookRequest\032+.go" - + "ogle.cloud.dialogflow.cx.v3beta1.Webhook" - + "\"\\\202\323\344\223\002E\":/v3beta1/{parent=projects/*/lo" - + "cations/*/agents/*}/webhooks:\007webhook\332A\016" - + "parent,webhook\022\341\001\n\rUpdateWebhook\0228.googl" - + "e.cloud.dialogflow.cx.v3beta1.UpdateWebh" - + "ookRequest\032+.google.cloud.dialogflow.cx." - + "v3beta1.Webhook\"i\202\323\344\223\002M2B/v3beta1/{webho" - + "ok.name=projects/*/locations/*/agents/*/" - + "webhooks/*}:\007webhook\332A\023webhook,update_ma" - + "sk\022\254\001\n\rDeleteWebhook\0228.google.cloud.dial" - + "ogflow.cx.v3beta1.DeleteWebhookRequest\032\026" - + ".google.protobuf.Empty\"I\202\323\344\223\002<*:/v3beta1" - + "/{name=projects/*/locations/*/agents/*/w" - + "ebhooks/*}\332A\004name\032x\312A\031dialogflow.googlea" - + "pis.com\322AYhttps://www.googleapis.com/aut" - + "h/cloud-platform,https://www.googleapis." - + "com/auth/dialogflowB\323\002\n&com.google.cloud" - + ".dialogflow.cx.v3beta1B\014WebhookProtoP\001ZD" - + "google.golang.org/genproto/googleapis/cl" - + "oud/dialogflow/cx/v3beta1;cx\370\001\001\242\002\002DF\252\002\"G" - + "oogle.Cloud.Dialogflow.Cx.V3Beta1\352\002&Goog" - + "le::Cloud::Dialogflow::CX::V3beta1\352A|\n\'s" - + "ervicedirectory.googleapis.com/Service\022Q" - + "projects/{project}/locations/{location}/" - + "namespaces/{namespace}/services/{service" - + "}b\006proto3" + + "logflow.googleapis.com/Page\022\024\n\014display_n" + + "ame\030\004 \001(\t\022H\n\tform_info\030\003 \001(\01325.google.cl" + + "oud.dialogflow.cx.v3beta1.PageInfo.FormI" + + "nfo\032\232\003\n\010FormInfo\022[\n\016parameter_info\030\002 \003(\013" + + "2C.google.cloud.dialogflow.cx.v3beta1.Pa" + + "geInfo.FormInfo.ParameterInfo\032\260\002\n\rParame" + + "terInfo\022\024\n\014display_name\030\001 \001(\t\022\020\n\010require" + + "d\030\002 \001(\010\022a\n\005state\030\003 \001(\0162R.google.cloud.di" + + "alogflow.cx.v3beta1.PageInfo.FormInfo.Pa" + + "rameterInfo.ParameterState\022%\n\005value\030\004 \001(" + + "\0132\026.google.protobuf.Value\022\026\n\016just_collec" + + "ted\030\005 \001(\010\"U\n\016ParameterState\022\037\n\033PARAMETER" + + "_STATE_UNSPECIFIED\020\000\022\t\n\005EMPTY\020\001\022\013\n\007INVAL" + + "ID\020\002\022\n\n\006FILLED\020\003\"\346\001\n\013SessionInfo\0227\n\007sess" + + "ion\030\001 \001(\tB&\372A#\n!dialogflow.googleapis.co" + + "m/Session\022S\n\nparameters\030\002 \003(\0132?.google.c" + + "loud.dialogflow.cx.v3beta1.SessionInfo.P" + + "arametersEntry\032I\n\017ParametersEntry\022\013\n\003key" + + "\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.protobuf." + + "Value:\0028\0012\375\010\n\010Webhooks\022\316\001\n\014ListWebhooks\022" + + "7.google.cloud.dialogflow.cx.v3beta1.Lis" + + "tWebhooksRequest\0328.google.cloud.dialogfl" + + "ow.cx.v3beta1.ListWebhooksResponse\"K\202\323\344\223" + + "\002<\022:/v3beta1/{parent=projects/*/location" + + "s/*/agents/*}/webhooks\332A\006parent\022\273\001\n\nGetW" + + "ebhook\0225.google.cloud.dialogflow.cx.v3be" + + "ta1.GetWebhookRequest\032+.google.cloud.dia" + + "logflow.cx.v3beta1.Webhook\"I\202\323\344\223\002<\022:/v3b" + + "eta1/{name=projects/*/locations/*/agents" + + "/*/webhooks/*}\332A\004name\022\324\001\n\rCreateWebhook\022" + + "8.google.cloud.dialogflow.cx.v3beta1.Cre" + + "ateWebhookRequest\032+.google.cloud.dialogf" + + "low.cx.v3beta1.Webhook\"\\\202\323\344\223\002E\":/v3beta1" + + "/{parent=projects/*/locations/*/agents/*" + + "}/webhooks:\007webhook\332A\016parent,webhook\022\341\001\n" + + "\rUpdateWebhook\0228.google.cloud.dialogflow" + + ".cx.v3beta1.UpdateWebhookRequest\032+.googl" + + "e.cloud.dialogflow.cx.v3beta1.Webhook\"i\202" + + "\323\344\223\002M2B/v3beta1/{webhook.name=projects/*" + + "/locations/*/agents/*/webhooks/*}:\007webho" + + "ok\332A\023webhook,update_mask\022\254\001\n\rDeleteWebho" + + "ok\0228.google.cloud.dialogflow.cx.v3beta1." + + "DeleteWebhookRequest\032\026.google.protobuf.E" + + "mpty\"I\202\323\344\223\002<*:/v3beta1/{name=projects/*/" + + "locations/*/agents/*/webhooks/*}\332A\004name\032" + + "x\312A\031dialogflow.googleapis.com\322AYhttps://" + + "www.googleapis.com/auth/cloud-platform,h" + + "ttps://www.googleapis.com/auth/dialogflo" + + "wB\323\002\n&com.google.cloud.dialogflow.cx.v3b" + + "eta1B\014WebhookProtoP\001ZDgoogle.golang.org/" + + "genproto/googleapis/cloud/dialogflow/cx/" + + "v3beta1;cx\370\001\001\242\002\002DF\252\002\"Google.Cloud.Dialog" + + "flow.Cx.V3Beta1\352\002&Google::Cloud::Dialogf" + + "low::CX::V3beta1\352A|\n\'servicedirectory.go" + + "ogleapis.com/Service\022Qprojects/{project}" + + "/locations/{location}/namespaces/{namesp" + + "ace}/services/{service}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -494,7 +494,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_dialogflow_cx_v3beta1_PageInfo_descriptor, new java.lang.String[] { - "CurrentPage", "FormInfo", + "CurrentPage", "DisplayName", "FormInfo", }); internal_static_google_cloud_dialogflow_cx_v3beta1_PageInfo_FormInfo_descriptor = internal_static_google_cloud_dialogflow_cx_v3beta1_PageInfo_descriptor diff --git a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/proto/google/cloud/dialogflow/cx/v3beta1/webhook.proto b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/proto/google/cloud/dialogflow/cx/v3beta1/webhook.proto index a9c9f9b9a..662a0458a 100644 --- a/proto-google-cloud-dialogflow-cx-v3beta1/src/main/proto/google/cloud/dialogflow/cx/v3beta1/webhook.proto +++ b/proto-google-cloud-dialogflow-cx-v3beta1/src/main/proto/google/cloud/dialogflow/cx/v3beta1/webhook.proto @@ -509,6 +509,10 @@ message PageInfo { type: "dialogflow.googleapis.com/Page" }]; + // Always present for [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse]. + // The display name of the current page. + string display_name = 4; + // Optional for both [WebhookRequest][google.cloud.dialogflow.cx.v3beta1.WebhookRequest] and [WebhookResponse][google.cloud.dialogflow.cx.v3beta1.WebhookResponse]. // Information about the form. FormInfo form_info = 3;