feat: (a) Add additional binding for session with environment. (b) Allow force delete entity types and webhooks.

google-cloud-dialogflow-cx/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/SessionEntityTypesClient.java

@@ -174,7 +174,9 @@ public SessionEntityTypesStub getStub() {
    *
    * @param parent Required. The session to list all session entity types from. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>`.
+   *     ID>/sessions/<Session ID>` or `projects/<Project ID>/locations/<Location
+   *     ID>/agents/<Agent ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>`. If `Environment ID` is not specified, we assume default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(SessionName parent) {
@@ -202,7 +204,9 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(SessionN
    *
    * @param parent Required. The session to list all session entity types from. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>`.
+   *     ID>/sessions/<Session ID>` or `projects/<Project ID>/locations/<Location
+   *     ID>/agents/<Agent ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>`. If `Environment ID` is not specified, we assume default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(String parent) {
@@ -309,7 +313,10 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(
    *
    * @param name Required. The name of the session entity type. Format: `projects/<Project
    *     ID>/locations/<Location ID>/agents/<Agent ID>/sessions/<Session
-   *     ID>/entityTypes/<Entity Type ID>`.
+   *     ID>/entityTypes/<Entity Type ID>` or `projects/<Project
+   *     ID>/locations/<Location ID>/agents/<Agent ID>/environments/<Environment
+   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>`. If `Environment ID`
+   *     is not specified, we assume default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final SessionEntityType getSessionEntityType(SessionEntityTypeName name) {
@@ -335,7 +342,10 @@ public final SessionEntityType getSessionEntityType(SessionEntityTypeName name)
    *
    * @param name Required. The name of the session entity type. Format: `projects/<Project
    *     ID>/locations/<Location ID>/agents/<Agent ID>/sessions/<Session
-   *     ID>/entityTypes/<Entity Type ID>`.
+   *     ID>/entityTypes/<Entity Type ID>` or `projects/<Project
+   *     ID>/locations/<Location ID>/agents/<Agent ID>/environments/<Environment
+   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>`. If `Environment ID`
+   *     is not specified, we assume default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final SessionEntityType getSessionEntityType(String name) {
@@ -408,7 +418,9 @@ public final SessionEntityType getSessionEntityType(GetSessionEntityTypeRequest
    *
    * @param parent Required. The session to create a session entity type for. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>`.
+   *     ID>/sessions/<Session ID>` or `projects/<Project ID>/locations/<Location
+   *     ID>/agents/<Agent ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>`. If `Environment ID` is not specified, we assume default 'draft' environment.
    * @param sessionEntityType Required. The session entity type to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -440,7 +452,9 @@ public final SessionEntityType createSessionEntityType(
    *
    * @param parent Required. The session to create a session entity type for. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>`.
+   *     ID>/sessions/<Session ID>` or `projects/<Project ID>/locations/<Location
+   *     ID>/agents/<Agent ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>`. If `Environment ID` is not specified, we assume default 'draft' environment.
    * @param sessionEntityType Required. The session entity type to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -524,7 +538,11 @@ public final SessionEntityType createSessionEntityType(CreateSessionEntityTypeRe
    *
    * @param sessionEntityType Required. The session entity type to update. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>`.
+   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>` or
+   *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+   *     ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>/entityTypes/<Entity Type ID>`. If `Environment ID` is not specified, we assume
+   *     default 'draft' environment.
    * @param updateMask The mask to control which fields get updated.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -599,7 +617,11 @@ public final SessionEntityType updateSessionEntityType(UpdateSessionEntityTypeRe
    *
    * @param name Required. The name of the session entity type to delete. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>`.
+   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>` or
+   *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+   *     ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>/entityTypes/<Entity Type ID>`. If `Environment ID` is not specified, we assume
+   *     default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final void deleteSessionEntityType(SessionEntityTypeName name) {
@@ -625,7 +647,11 @@ public final void deleteSessionEntityType(SessionEntityTypeName name) {
    *
    * @param name Required. The name of the session entity type to delete. Format:
    *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>`.
+   *     ID>/sessions/<Session ID>/entityTypes/<Entity Type ID>` or
+   *     `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+   *     ID>/environments/<Environment ID>/sessions/<Session
+   *     ID>/entityTypes/<Entity Type ID>`. If `Environment ID` is not specified, we assume
+   *     default 'draft' environment.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final void deleteSessionEntityType(String name) {

grpc-google-cloud-dialogflow-cx-v3beta1/pom.xml

@@ -37,6 +37,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-common-protos</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>

grpc-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/EntityTypesGrpc.java

@@ -26,7 +26,8 @@
  *
  *
  * <pre>
- * Service for managing [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
+ * Service for managing
+ * [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -314,7 +315,8 @@ public EntityTypesFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
+   * Service for managing
+   * [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
    * </pre>
    */
   public abstract static class EntityTypesImplBase implements io.grpc.BindableService {
@@ -433,7 +435,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
+   * Service for managing
+   * [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
    * </pre>
    */
   public static final class EntityTypesStub
@@ -536,7 +539,8 @@ public void deleteEntityType(
    *
    *
    * <pre>
-   * Service for managing [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
+   * Service for managing
+   * [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
    * </pre>
    */
   public static final class EntityTypesBlockingStub
@@ -619,7 +623,8 @@ public com.google.protobuf.Empty deleteEntityType(
    *
    *
    * <pre>
-   * Service for managing [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
+   * Service for managing
+   * [EntityTypes][google.cloud.dialogflow.cx.v3beta1.EntityType].
    * </pre>
    */
   public static final class EntityTypesFutureStub

grpc-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/SessionEntityTypesGrpc.java

@@ -26,7 +26,8 @@
  *
  *
  * <pre>
- * Service for managing [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
+ * Service for managing
+ * [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -337,7 +338,8 @@ public SessionEntityTypesFutureStub newStub(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
    * </pre>
    */
   public abstract static class SessionEntityTypesImplBase implements io.grpc.BindableService {
@@ -459,7 +461,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesStub
@@ -566,7 +569,8 @@ public void deleteSessionEntityType(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesBlockingStub
@@ -655,7 +659,8 @@ public com.google.protobuf.Empty deleteSessionEntityType(
    *
    *
    * <pre>
-   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
+   * Service for managing
+   * [SessionEntityTypes][google.cloud.dialogflow.cx.v3beta1.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesFutureStub

grpc-google-cloud-dialogflow-cx-v3beta1/src/main/java/com/google/cloud/dialogflow/cx/v3beta1/SessionsGrpc.java

@@ -30,8 +30,9 @@
  *
  * <pre>
  * A session represents an interaction with a user. You retrieve user input
- * and pass it to the [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent] method to determine
- * user intent and respond.
+ * and pass it to the
+ * [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent]
+ * method to determine user intent and respond.
  * </pre>
  */
 @javax.annotation.Generated(
@@ -276,8 +277,9 @@ public SessionsFutureStub newStub(
    *
    * <pre>
    * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent] method to determine
-   * user intent and respond.
+   * and pass it to the
+   * [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent]
+   * method to determine user intent and respond.
    * </pre>
    */
   public abstract static class SessionsImplBase implements io.grpc.BindableService {
@@ -336,9 +338,13 @@ public void matchIntent(
      *
      *
      * <pre>
-     * Fulfills a matched intent returned by [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
-     * Must be called after [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent], with input from
-     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse]. Otherwise, the behavior is undefined.
+     * Fulfills a matched intent returned by
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
+     * Must be called after
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent],
+     * with input from
+     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse].
+     * Otherwise, the behavior is undefined.
      * </pre>
      */
     public void fulfillIntent(
@@ -388,8 +394,9 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    * <pre>
    * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent] method to determine
-   * user intent and respond.
+   * and pass it to the
+   * [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent]
+   * method to determine user intent and respond.
    * </pre>
    */
   public static final class SessionsStub extends io.grpc.stub.AbstractAsyncStub<SessionsStub> {
@@ -464,9 +471,13 @@ public void matchIntent(
      *
      *
      * <pre>
-     * Fulfills a matched intent returned by [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
-     * Must be called after [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent], with input from
-     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse]. Otherwise, the behavior is undefined.
+     * Fulfills a matched intent returned by
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
+     * Must be called after
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent],
+     * with input from
+     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse].
+     * Otherwise, the behavior is undefined.
      * </pre>
      */
     public void fulfillIntent(
@@ -485,8 +496,9 @@ public void fulfillIntent(
    *
    * <pre>
    * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent] method to determine
-   * user intent and respond.
+   * and pass it to the
+   * [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent]
+   * method to determine user intent and respond.
    * </pre>
    */
   public static final class SessionsBlockingStub
@@ -532,9 +544,13 @@ public com.google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse matchIntent(
      *
      *
      * <pre>
-     * Fulfills a matched intent returned by [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
-     * Must be called after [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent], with input from
-     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse]. Otherwise, the behavior is undefined.
+     * Fulfills a matched intent returned by
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
+     * Must be called after
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent],
+     * with input from
+     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse].
+     * Otherwise, the behavior is undefined.
      * </pre>
      */
     public com.google.cloud.dialogflow.cx.v3beta1.FulfillIntentResponse fulfillIntent(
@@ -548,8 +564,9 @@ public com.google.cloud.dialogflow.cx.v3beta1.FulfillIntentResponse fulfillInten
    *
    * <pre>
    * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent] method to determine
-   * user intent and respond.
+   * and pass it to the
+   * [DetectIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.DetectIntent]
+   * method to determine user intent and respond.
    * </pre>
    */
   public static final class SessionsFutureStub
@@ -599,9 +616,13 @@ protected SessionsFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      *
      *
      * <pre>
-     * Fulfills a matched intent returned by [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
-     * Must be called after [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent], with input from
-     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse]. Otherwise, the behavior is undefined.
+     * Fulfills a matched intent returned by
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent].
+     * Must be called after
+     * [MatchIntent][google.cloud.dialogflow.cx.v3beta1.Sessions.MatchIntent],
+     * with input from
+     * [MatchIntentResponse][google.cloud.dialogflow.cx.v3beta1.MatchIntentResponse].
+     * Otherwise, the behavior is undefined.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<

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

@@ -58,10 +58,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n5google/cloud/dialogflow/cx/v3beta1/aud"
           + "io_config.proto\022\"google.cloud.dialogflow"
-          + ".cx.v3beta1\032\037google/api/field_behavior.p"
-          + "roto\032\031google/api/resource.proto\032\036google/"
-          + "protobuf/duration.proto\032\034google/api/anno"
-          + "tations.proto\"\222\001\n\016SpeechWordInfo\022\014\n\004word"
+          + ".cx.v3beta1\032\034google/api/annotations.prot"
+          + "o\032\037google/api/field_behavior.proto\032\031goog"
+          + "le/api/resource.proto\032\036google/protobuf/d"
+          + "uration.proto\"\222\001\n\016SpeechWordInfo\022\014\n\004word"
           + "\030\003 \001(\t\022/\n\014start_offset\030\001 \001(\0132\031.google.pr"
           + "otobuf.Duration\022-\n\nend_offset\030\002 \001(\0132\031.go"
           + "ogle.protobuf.Duration\022\022\n\nconfidence\030\004 \001"
@@ -115,10 +115,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
+              com.google.api.AnnotationsProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.ResourceProto.getDescriptor(),
               com.google.protobuf.DurationProto.getDescriptor(),
-              com.google.api.AnnotationsProto.getDescriptor(),
             });
     internal_static_google_cloud_dialogflow_cx_v3beta1_SpeechWordInfo_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -171,10 +171,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
     com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
         descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.ResourceProto.getDescriptor();
     com.google.protobuf.DurationProto.getDescriptor();
-    com.google.api.AnnotationsProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)