From 9bbe1901097f79fa8103128a3abfcb80e3e48a40 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Thu, 19 Apr 2018 15:28:43 -0700 Subject: [PATCH] Regenerate java clients, bump proto-/grpc-artifacts dependency versions (#3173) * Regenerate java clients, bump proto-/grpc-artifacts dependency versions * . --- .../admin/v2/BigtableInstanceAdminClient.java | 2 +- .../v2/BigtableInstanceAdminSettings.java | 1 + .../admin/v2/BigtableTableAdminClient.java | 2 +- .../admin/v2/BigtableTableAdminSettings.java | 1 + .../v2/stub/BigtableInstanceAdminStub.java | 3 + .../BigtableInstanceAdminStubSettings.java | 1 + .../admin/v2/stub/BigtableTableAdminStub.java | 3 + .../stub/BigtableTableAdminStubSettings.java | 1 + .../stub/GrpcBigtableInstanceAdminStub.java | 2 +- .../v2/stub/GrpcBigtableTableAdminStub.java | 2 +- google-cloud-bom/pom.xml | 4 +- .../dialogflow/v2beta1/ContextsClient.java | 78 +++++++++++-------- .../v2beta1/SessionEntityTypesClient.java | 73 +++++++++-------- .../dialogflow/v2beta1/SessionsClient.java | 24 +++--- .../v1/VideoIntelligenceServiceClient.java | 2 +- .../v1/VideoIntelligenceServiceSettings.java | 1 + .../GrpcVideoIntelligenceServiceStub.java | 2 +- .../v1/stub/VideoIntelligenceServiceStub.java | 3 + .../VideoIntelligenceServiceStubSettings.java | 1 + .../VideoIntelligenceServiceClient.java | 2 +- .../VideoIntelligenceServiceSettings.java | 1 + .../GrpcVideoIntelligenceServiceStub.java | 2 +- .../stub/VideoIntelligenceServiceStub.java | 3 + .../VideoIntelligenceServiceStubSettings.java | 1 + .../VideoIntelligenceServiceClient.java | 2 +- .../VideoIntelligenceServiceSettings.java | 1 + .../GrpcVideoIntelligenceServiceStub.java | 2 +- .../stub/VideoIntelligenceServiceStub.java | 3 + .../VideoIntelligenceServiceStubSettings.java | 1 + pom.xml | 1 + 30 files changed, 137 insertions(+), 88 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java index d79d0ed77ac6..141aaaefbe56 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java @@ -2202,7 +2202,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq } @Override - public final void close() throws Exception { + public final void close() { stub.close(); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java index c26b67906cb3..df1d3ac34ed0 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java @@ -307,6 +307,7 @@ public BigtableInstanceAdminStubSettings.Builder getStubSettingsBuilder() { return ((BigtableInstanceAdminStubSettings.Builder) getStubSettings()); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java index 88c154f2b216..01971dc86d3d 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java @@ -1826,7 +1826,7 @@ public final UnaryCallable deleteSnapshotCallable( } @Override - public final void close() throws Exception { + public final void close() { stub.close(); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java index 33503291d325..51d88e0c95f6 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java @@ -255,6 +255,7 @@ public BigtableTableAdminStubSettings.Builder getStubSettingsBuilder() { return ((BigtableTableAdminStubSettings.Builder) getStubSettings()); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java index 53f389115a10..cb4eebe6f2b1 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java @@ -173,4 +173,7 @@ public UnaryCallable setIamPolicyCallable() { testIamPermissionsCallable() { throw new UnsupportedOperationException("Not implemented: testIamPermissionsCallable()"); } + + @Override + public abstract void close(); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java index c3278d00d99a..c3e940ab02c2 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java @@ -866,6 +866,7 @@ protected Builder(BigtableInstanceAdminStubSettings settings) { testIamPermissionsSettings); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java index f0c0f91fe645..5707daf91d44 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java @@ -136,4 +136,7 @@ public UnaryCallable listSnapshotsC public UnaryCallable deleteSnapshotCallable() { throw new UnsupportedOperationException("Not implemented: deleteSnapshotCallable()"); } + + @Override + public abstract void close(); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java index 9d0c607fadc2..5c2df3efa375 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java @@ -704,6 +704,7 @@ protected Builder(BigtableTableAdminStubSettings settings) { deleteSnapshotSettings); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java index d23e548f3c8b..663c64c8e97f 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java @@ -755,7 +755,7 @@ public UnaryCallable setIamPolicyCallable() { } @Override - public final void close() throws Exception { + public final void close() { shutdown(); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java index 8898182d332d..dd5d94165e8f 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java @@ -573,7 +573,7 @@ public UnaryCallable deleteSnapshotCallable() { } @Override - public final void close() throws Exception { + public final void close() { shutdown(); } diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 2a0e91a31307..519581973959 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -173,8 +173,8 @@ 1.23.0 1.23.0 0.40.0 - 0.9.0 - 1.8.0 + 0.10.0 + 1.9.0 diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java index 5a8779e73b3f..aa54673baaba 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java @@ -182,9 +182,10 @@ public ContextsStub getStub() { * * @param parent Required. The session to list all contexts from. Format: `projects/<Project * ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListContextsPagedResponse listContexts(SessionName parent) { @@ -212,9 +213,10 @@ public final ListContextsPagedResponse listContexts(SessionName parent) { * * @param parent Required. The session to list all contexts from. Format: `projects/<Project * ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListContextsPagedResponse listContexts(String parent) { @@ -318,10 +320,11 @@ public final UnaryCallable listContex * * @param name Required. The name of the context. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/contexts/<Context ID>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/contexts/<Context ID>`. Note: Runtimes are under construction and will be - * available soon. If <Runtime ID> is not specified, we assume default 'sandbox' - * runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/contexts/<Context ID>`. Note: Environments and + * users are under construction and will be available soon. If <Environment ID> is not + * specified, we assume default 'draft' environment. If <User ID> is not specified, we + * assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final Context getContext(ContextName name) { @@ -346,10 +349,11 @@ public final Context getContext(ContextName name) { * * @param name Required. The name of the context. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/contexts/<Context ID>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/contexts/<Context ID>`. Note: Runtimes are under construction and will be - * available soon. If <Runtime ID> is not specified, we assume default 'sandbox' - * runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/contexts/<Context ID>`. Note: Environments and + * users are under construction and will be available soon. If <Environment ID> is not + * specified, we assume default 'draft' environment. If <User ID> is not specified, we + * assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final Context getContext(String name) { @@ -419,9 +423,10 @@ public final UnaryCallable getContextCallable() { * * @param parent Required. The session to create a context for. Format: `projects/<Project * ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @param context Required. The context to create. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -451,9 +456,10 @@ public final Context createContext(SessionName parent, Context context) { * * @param parent Required. The session to create a context for. Format: `projects/<Project * ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @param context Required. The context to create. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -595,10 +601,11 @@ public final UnaryCallable updateContextCallable( * * @param name Required. The name of the context to delete. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/contexts/<Context ID>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/contexts/<Context ID>`. Note: Runtimes are under construction and will be - * available soon. If <Runtime ID> is not specified, we assume default 'sandbox' - * runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/contexts/<Context ID>`. Note: Environments and + * users are under construction and will be available soon. If <Environment ID> is not + * specified, we assume default 'draft' environment. If <User ID> is not specified, we + * assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteContext(ContextName name) { @@ -623,10 +630,11 @@ public final void deleteContext(ContextName name) { * * @param name Required. The name of the context to delete. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/contexts/<Context ID>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/contexts/<Context ID>`. Note: Runtimes are under construction and will be - * available soon. If <Runtime ID> is not specified, we assume default 'sandbox' - * runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/contexts/<Context ID>`. Note: Environments and + * users are under construction and will be available soon. If <Environment ID> is not + * specified, we assume default 'draft' environment. If <User ID> is not specified, we + * assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteContext(String name) { @@ -695,9 +703,10 @@ public final UnaryCallable deleteContextCallable() * * @param parent Required. The name of the session to delete all contexts from. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteAllContexts(SessionName parent) { @@ -724,9 +733,10 @@ public final void deleteAllContexts(SessionName parent) { * * @param parent Required. The name of the session to delete all contexts from. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteAllContexts(String parent) { diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java index c890c97b4e74..b9cc593089b1 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java @@ -180,9 +180,10 @@ public SessionEntityTypesStub getStub() { * * @param parent Required. The session to list all session entity types from. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/ + * sessions/<Session ID>`. Note: Environments and users are under construction and will + * be available soon. If <Environment ID> is not specified, we assume default 'draft' + * environment. If <User ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(SessionName parent) { @@ -210,9 +211,10 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(SessionN * * @param parent Required. The session to list all session entity types from. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/ + * sessions/<Session ID>`. Note: Environments and users are under construction and will + * be available soon. If <Environment ID> is not specified, we assume default 'draft' + * environment. If <User ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(String parent) { @@ -319,10 +321,11 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes( * * @param name Required. The name of the session entity type. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type Display Name>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/entityTypes/<Entity Type Display Name>`. Note: Runtimes are under construction - * and will be available soon. If <Runtime ID> is not specified, we assume default - * 'sandbox' runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/ entityTypes/<Entity Type Display Name>`. Note: + * Environments and users re under construction and will be available soon. If <Environment + * ID> is not specified, we assume default 'draft' environment. If <User ID> is not + * specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final SessionEntityType getSessionEntityType(SessionEntityTypeName name) { @@ -349,10 +352,11 @@ public final SessionEntityType getSessionEntityType(SessionEntityTypeName name) * * @param name Required. The name of the session entity type. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type Display Name>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/entityTypes/<Entity Type Display Name>`. Note: Runtimes are under construction - * and will be available soon. If <Runtime ID> is not specified, we assume default - * 'sandbox' runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/ entityTypes/<Entity Type Display Name>`. Note: + * Environments and users re under construction and will be available soon. If <Environment + * ID> is not specified, we assume default 'draft' environment. If <User ID> is not + * specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final SessionEntityType getSessionEntityType(String name) { @@ -424,9 +428,10 @@ private final SessionEntityType getSessionEntityType(GetSessionEntityTypeRequest * * @param parent Required. The session to create a session entity type for. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/ + * sessions/<Session ID>`. Note: Environments and users are under construction and will + * be available soon. If <Environment ID> is not specified, we assume default 'draft' + * environment. If <User ID> is not specified, we assume default '-' user. * @param sessionEntityType Required. The session entity type to create. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -457,9 +462,10 @@ public final SessionEntityType createSessionEntityType( * * @param parent Required. The session to create a session entity type for. Format: * `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. + * ID>/agent/environments/<Environment ID>/users/<User ID>/ + * sessions/<Session ID>`. Note: Environments and users are under construction and will + * be available soon. If <Environment ID> is not specified, we assume default 'draft' + * environment. If <User ID> is not specified, we assume default '-' user. * @param sessionEntityType Required. The session entity type to create. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -539,10 +545,11 @@ public final SessionEntityType createSessionEntityType(CreateSessionEntityTypeRe * * @param sessionEntityType Required. The entity type to update. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type Display Name>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/entityTypes/<Entity Type Display Name>`. Note: Runtimes are under construction - * and will be available soon. If <Runtime ID> is not specified, we assume default - * 'sandbox' runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/entityTypes/<Entity Type Display Name>`. Note: + * Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final SessionEntityType updateSessionEntityType(SessionEntityType sessionEntityType) { @@ -613,10 +620,11 @@ public final SessionEntityType updateSessionEntityType(UpdateSessionEntityTypeRe * * @param name Required. The name of the entity type to delete. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type Display Name>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/entityTypes/<Entity Type Display Name>`. Note: Runtimes are under construction - * and will be available soon. If <Runtime ID> is not specified, we assume default - * 'sandbox' runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/entityTypes/<Entity Type Display Name>`. Note: + * Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteSessionEntityType(SessionEntityTypeName name) { @@ -643,10 +651,11 @@ public final void deleteSessionEntityType(SessionEntityTypeName name) { * * @param name Required. The name of the entity type to delete. Format: `projects/<Project * ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type Display Name>` or - * `projects/<Project ID>/agent/runtimes/<Runtime ID>/sessions/<Session - * ID>/entityTypes/<Entity Type Display Name>`. Note: Runtimes are under construction - * and will be available soon. If <Runtime ID> is not specified, we assume default - * 'sandbox' runtime. + * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User + * ID>/sessions/<Session ID>/entityTypes/<Entity Type Display Name>`. Note: + * Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we assume default '-' user. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteSessionEntityType(String name) { diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java index d2e9b23907ae..800c4e3be19f 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java @@ -165,11 +165,13 @@ public SessionsStub getStub() { * * @param session Required. The name of the session this query is sent to. Format: * `projects/<Project ID>/agent/sessions/<Session ID>`, or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. It's up to the API caller to choose an appropriate - * session ID. It can be a random number or some type of user identifier (preferably hashed). - * The length of the session ID must not exceed 36 bytes. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we are using "-". It’s up to the API caller to choose an + * appropriate <Session ID>. and <User Id>. They can be a random numbers or some + * type of user and session identifiers (preferably hashed). The length of the <Session + * ID> and <User ID> must not exceed 36 characters. * @param queryInput Required. The input specification. It can be set to: *

1. an audio config which instructs the speech recognizer how to process the speech * audio, @@ -205,11 +207,13 @@ public final DetectIntentResponse detectIntent(SessionName session, QueryInput q * * @param session Required. The name of the session this query is sent to. Format: * `projects/<Project ID>/agent/sessions/<Session ID>`, or `projects/<Project - * ID>/agent/runtimes/<Runtime ID>/sessions/<Session ID>`. Note: Runtimes are - * under construction and will be available soon. If <Runtime ID> is not specified, we - * assume default 'sandbox' runtime. It's up to the API caller to choose an appropriate - * session ID. It can be a random number or some type of user identifier (preferably hashed). - * The length of the session ID must not exceed 36 bytes. + * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session + * ID>`. Note: Environments and users are under construction and will be available soon. If + * <Environment ID> is not specified, we assume default 'draft' environment. If <User + * ID> is not specified, we are using "-". It’s up to the API caller to choose an + * appropriate <Session ID>. and <User Id>. They can be a random numbers or some + * type of user and session identifiers (preferably hashed). The length of the <Session + * ID> and <User ID> must not exceed 36 characters. * @param queryInput Required. The input specification. It can be set to: *

1. an audio config which instructs the speech recognizer how to process the speech * audio, diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java index 197f5be8f5cc..f5e413a775e7 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java @@ -290,7 +290,7 @@ public final UnaryCallable annotateVideoCallabl } @Override - public final void close() throws Exception { + public final void close() { stub.close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java index ad9008306598..53dcfa8cfc62 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java @@ -160,6 +160,7 @@ public VideoIntelligenceServiceStubSettings.Builder getStubSettingsBuilder() { return ((VideoIntelligenceServiceStubSettings.Builder) getStubSettings()); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java index 93a91062b888..91b470340c83 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java @@ -138,7 +138,7 @@ public UnaryCallable annotateVideoCallable() { } @Override - public final void close() throws Exception { + public final void close() { shutdown(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java index b322f92bbfd2..934291332fae 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java @@ -48,4 +48,7 @@ public OperationsStub getOperationsStub() { public UnaryCallable annotateVideoCallable() { throw new UnsupportedOperationException("Not implemented: annotateVideoCallable()"); } + + @Override + public abstract void close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java index 88b2f426bf36..82becea4075d 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java @@ -283,6 +283,7 @@ protected Builder(VideoIntelligenceServiceStubSettings settings) { ImmutableList.>of(annotateVideoSettings); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java index 131e92b0574e..dc8c02e8dfee 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java @@ -290,7 +290,7 @@ public final UnaryCallable annotateVideoCallabl } @Override - public final void close() throws Exception { + public final void close() { stub.close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java index dea9309efe19..a08bc2f68fd7 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java @@ -160,6 +160,7 @@ public VideoIntelligenceServiceStubSettings.Builder getStubSettingsBuilder() { return ((VideoIntelligenceServiceStubSettings.Builder) getStubSettings()); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java index b6ab8ec850ad..ba2bf9f5bf2d 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java @@ -138,7 +138,7 @@ public UnaryCallable annotateVideoCallable() { } @Override - public final void close() throws Exception { + public final void close() { shutdown(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java index c7d49c7ca3fb..bbae4c58d187 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java @@ -48,4 +48,7 @@ public OperationsStub getOperationsStub() { public UnaryCallable annotateVideoCallable() { throw new UnsupportedOperationException("Not implemented: annotateVideoCallable()"); } + + @Override + public abstract void close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java index 4da697fb1e53..706aa36bb4e3 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java @@ -283,6 +283,7 @@ protected Builder(VideoIntelligenceServiceStubSettings settings) { ImmutableList.>of(annotateVideoSettings); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java index fd8bd71161ec..dddfdaee896d 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java @@ -290,7 +290,7 @@ public final UnaryCallable annotateVideoCallabl } @Override - public final void close() throws Exception { + public final void close() { stub.close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java index 3cfb898fd5a2..d7d501dee1a4 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java @@ -160,6 +160,7 @@ public VideoIntelligenceServiceStubSettings.Builder getStubSettingsBuilder() { return ((VideoIntelligenceServiceStubSettings.Builder) getStubSettings()); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java index 7fea64e1f0bd..7609ae85f799 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java @@ -138,7 +138,7 @@ public UnaryCallable annotateVideoCallable() { } @Override - public final void close() throws Exception { + public final void close() { shutdown(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java index 6cf5324f40bb..734b4940e897 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java @@ -48,4 +48,7 @@ public OperationsStub getOperationsStub() { public UnaryCallable annotateVideoCallable() { throw new UnsupportedOperationException("Not implemented: annotateVideoCallable()"); } + + @Override + public abstract void close(); } diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java index 2e37558e95a2..c33c55ae0f76 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java @@ -283,6 +283,7 @@ protected Builder(VideoIntelligenceServiceStubSettings settings) { ImmutableList.>of(annotateVideoSettings); } + // NEXT_MAJOR_VER: remove 'throws Exception' /** * Applies the given settings updater function to all of the unary API methods in this service. * diff --git a/pom.xml b/pom.xml index c966409d5f75..78cfeb61c9f1 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,7 @@ + Google