From bfefa196a7726c07c4837dc81b8bb2560adc03f3 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Tue, 31 Mar 2020 04:03:47 -0700 Subject: [PATCH] fix: only import GaxCall if needed, and remove unused variables --- .../src/v1beta1/big_query_storage_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../src/v1beta1/echo_client.ts.baseline | 2 +- .../src/v1beta1/identity_client.ts.baseline | 2 +- .../src/v1beta1/messaging_client.ts.baseline | 2 +- .../src/v1beta1/testing_client.ts.baseline | 2 +- baselines/dlp/src/v2/dlp_service_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../src/v1/key_management_service_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../src/v2/config_service_v2_client.ts.baseline | 2 +- .../src/v2/logging_service_v2_client.ts.baseline | 2 +- .../src/v2/metrics_service_v2_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 6 +++--- .../src/v3/alert_policy_service_client.ts.baseline | 2 +- .../src/v3/group_service_client.ts.baseline | 2 +- .../src/v3/metric_service_client.ts.baseline | 2 +- .../notification_channel_service_client.ts.baseline | 2 +- .../v3/service_monitoring_service_client.ts.baseline | 2 +- .../src/v3/uptime_check_service_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 12 ++++++------ .../redis/src/v1beta1/cloud_redis_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../showcase/src/v1beta1/echo_client.ts.baseline | 2 +- .../showcase/src/v1beta1/identity_client.ts.baseline | 2 +- .../src/v1beta1/messaging_client.ts.baseline | 2 +- .../showcase/src/v1beta1/testing_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 8 ++++---- .../src/v1/text_to_speech_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../v3beta1/translation_service_client.ts.baseline | 2 +- .../fixtures/sample/src/index.ts.baseline | 2 +- .../src/$version/$service_client.ts.njk | 4 ++-- .../system-test/fixtures/sample/src/index.ts.njk | 2 +- 34 files changed, 45 insertions(+), 45 deletions(-) diff --git a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline index eaef8271c..63833138e 100644 --- a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; import * as path from 'path'; import * as protos from '../../protos/protos'; diff --git a/baselines/bigquery-storage/system-test/fixtures/sample/src/index.ts.baseline b/baselines/bigquery-storage/system-test/fixtures/sample/src/index.ts.baseline index 9dc8f6845..07ec4adf6 100644 --- a/baselines/bigquery-storage/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/bigquery-storage/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {BigQueryStorageClient} from 'storage'; function main() { - const bigQueryStorageClient = new BigQueryStorageClient(); + new BigQueryStorageClient(); } main(); diff --git a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline index e04650406..07cb67c86 100644 --- a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline index d248053df..3f8e22f3f 100644 --- a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline index da65fd669..a2bd654ee 100644 --- a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline index 892df6b4f..b487bbb65 100644 --- a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/dlp/src/v2/dlp_service_client.ts.baseline b/baselines/dlp/src/v2/dlp_service_client.ts.baseline index e9ae47f50..09d40b2c3 100644 --- a/baselines/dlp/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp/src/v2/dlp_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/dlp/system-test/fixtures/sample/src/index.ts.baseline b/baselines/dlp/system-test/fixtures/sample/src/index.ts.baseline index 01d5b26cd..1f739fd29 100644 --- a/baselines/dlp/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/dlp/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {DlpServiceClient} from 'dlp'; function main() { - const dlpServiceClient = new DlpServiceClient(); + new DlpServiceClient(); } main(); diff --git a/baselines/kms/src/v1/key_management_service_client.ts.baseline b/baselines/kms/src/v1/key_management_service_client.ts.baseline index 69729e344..1b18c48b2 100644 --- a/baselines/kms/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms/src/v1/key_management_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/kms/system-test/fixtures/sample/src/index.ts.baseline b/baselines/kms/system-test/fixtures/sample/src/index.ts.baseline index bbf918d9e..d3672ff9b 100644 --- a/baselines/kms/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/kms/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {KeyManagementServiceClient} from 'kms'; function main() { - const keyManagementServiceClient = new KeyManagementServiceClient(); + new KeyManagementServiceClient(); } main(); diff --git a/baselines/logging/src/v2/config_service_v2_client.ts.baseline b/baselines/logging/src/v2/config_service_v2_client.ts.baseline index 6674b25d0..604a625a4 100644 --- a/baselines/logging/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/config_service_v2_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline index 67f3bc126..a6cbe68e2 100644 --- a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline index 8438925f8..db427859a 100644 --- a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/logging/system-test/fixtures/sample/src/index.ts.baseline b/baselines/logging/system-test/fixtures/sample/src/index.ts.baseline index aa3614297..13a872b83 100644 --- a/baselines/logging/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/logging/system-test/fixtures/sample/src/index.ts.baseline @@ -19,9 +19,9 @@ import {ConfigServiceV2Client, LoggingServiceV2Client, MetricsServiceV2Client} from 'logging'; function main() { - const configServiceV2Client = new ConfigServiceV2Client(); - const loggingServiceV2Client = new LoggingServiceV2Client(); - const metricsServiceV2Client = new MetricsServiceV2Client(); + new ConfigServiceV2Client(); + new LoggingServiceV2Client(); + new MetricsServiceV2Client(); } main(); diff --git a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline index 31b736e12..3109714fe 100644 --- a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/src/v3/group_service_client.ts.baseline b/baselines/monitoring/src/v3/group_service_client.ts.baseline index 1b3c008dd..4cabc33c6 100644 --- a/baselines/monitoring/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/group_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/src/v3/metric_service_client.ts.baseline b/baselines/monitoring/src/v3/metric_service_client.ts.baseline index 6de244c45..ece1f202a 100644 --- a/baselines/monitoring/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/metric_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline index 02a2fad3f..2d38fa7e7 100644 --- a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline index 79dc65b98..96d611668 100644 --- a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline index fe391f65e..92104e070 100644 --- a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/monitoring/system-test/fixtures/sample/src/index.ts.baseline b/baselines/monitoring/system-test/fixtures/sample/src/index.ts.baseline index b26117e31..14ad9aa0b 100644 --- a/baselines/monitoring/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/monitoring/system-test/fixtures/sample/src/index.ts.baseline @@ -19,12 +19,12 @@ import {AlertPolicyServiceClient, GroupServiceClient, MetricServiceClient, NotificationChannelServiceClient, ServiceMonitoringServiceClient, UptimeCheckServiceClient} from 'monitoring'; function main() { - const alertPolicyServiceClient = new AlertPolicyServiceClient(); - const groupServiceClient = new GroupServiceClient(); - const metricServiceClient = new MetricServiceClient(); - const notificationChannelServiceClient = new NotificationChannelServiceClient(); - const serviceMonitoringServiceClient = new ServiceMonitoringServiceClient(); - const uptimeCheckServiceClient = new UptimeCheckServiceClient(); + new AlertPolicyServiceClient(); + new GroupServiceClient(); + new MetricServiceClient(); + new NotificationChannelServiceClient(); + new ServiceMonitoringServiceClient(); + new UptimeCheckServiceClient(); } main(); diff --git a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline index 48cfa0434..325a28dae 100644 --- a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/redis/system-test/fixtures/sample/src/index.ts.baseline b/baselines/redis/system-test/fixtures/sample/src/index.ts.baseline index 1b97268d5..6cd9cb302 100644 --- a/baselines/redis/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/redis/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {CloudRedisClient} from 'redis'; function main() { - const cloudRedisClient = new CloudRedisClient(); + new CloudRedisClient(); } main(); diff --git a/baselines/showcase/src/v1beta1/echo_client.ts.baseline b/baselines/showcase/src/v1beta1/echo_client.ts.baseline index e04650406..07cb67c86 100644 --- a/baselines/showcase/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/echo_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/showcase/src/v1beta1/identity_client.ts.baseline b/baselines/showcase/src/v1beta1/identity_client.ts.baseline index d248053df..3f8e22f3f 100644 --- a/baselines/showcase/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/identity_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline index da65fd669..a2bd654ee 100644 --- a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/showcase/src/v1beta1/testing_client.ts.baseline b/baselines/showcase/src/v1beta1/testing_client.ts.baseline index 892df6b4f..b487bbb65 100644 --- a/baselines/showcase/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/testing_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/showcase/system-test/fixtures/sample/src/index.ts.baseline b/baselines/showcase/system-test/fixtures/sample/src/index.ts.baseline index 2a3767376..853b18014 100644 --- a/baselines/showcase/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/showcase/system-test/fixtures/sample/src/index.ts.baseline @@ -19,10 +19,10 @@ import {EchoClient, IdentityClient, MessagingClient, TestingClient} from 'showcase'; function main() { - const echoClient = new EchoClient(); - const identityClient = new IdentityClient(); - const messagingClient = new MessagingClient(); - const testingClient = new TestingClient(); + new EchoClient(); + new IdentityClient(); + new MessagingClient(); + new TestingClient(); } main(); diff --git a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline index 68fc244ae..d40171388 100644 --- a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; import * as path from 'path'; import * as protos from '../../protos/protos'; diff --git a/baselines/texttospeech/system-test/fixtures/sample/src/index.ts.baseline b/baselines/texttospeech/system-test/fixtures/sample/src/index.ts.baseline index e8aafe04d..fdfc86c57 100644 --- a/baselines/texttospeech/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/texttospeech/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {TextToSpeechClient} from '@google-cloud/text-to-speech'; function main() { - const textToSpeechClient = new TextToSpeechClient(); + new TextToSpeechClient(); } main(); diff --git a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline index 41da2a0d2..2f026d200 100644 --- a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback} from 'google-gax'; +import {Callback, CallOptions, Descriptors, ClientOptions, LROperation, PaginationCallback, GaxCall} from 'google-gax'; import * as path from 'path'; import { Transform } from 'stream'; diff --git a/baselines/translate/system-test/fixtures/sample/src/index.ts.baseline b/baselines/translate/system-test/fixtures/sample/src/index.ts.baseline index a4b185af3..7a868a5a2 100644 --- a/baselines/translate/system-test/fixtures/sample/src/index.ts.baseline +++ b/baselines/translate/system-test/fixtures/sample/src/index.ts.baseline @@ -19,7 +19,7 @@ import {TranslationServiceClient} from 'translation'; function main() { - const translationServiceClient = new TranslationServiceClient(); + new TranslationServiceClient(); } main(); diff --git a/templates/typescript_gapic/src/$version/$service_client.ts.njk b/templates/typescript_gapic/src/$version/$service_client.ts.njk index 5c96915d4..c4cdc1ed2 100644 --- a/templates/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/typescript_gapic/src/$version/$service_client.ts.njk @@ -20,9 +20,9 @@ limitations under the License. {% import "../../_util.njk" as util -%} import * as gax from 'google-gax'; -import {GaxCall, Callback, CallOptions, Descriptors, ClientOptions +import {Callback, CallOptions, Descriptors, ClientOptions {%- if service.longRunning.length > 0 %}, LROperation{%- endif -%} -{%- if service.paging.length > 0 %}, PaginationCallback{%- endif -%} +{%- if service.paging.length > 0 %}, PaginationCallback, GaxCall{%- endif -%} } from 'google-gax'; import * as path from 'path'; {% if (service.paging.length > 0) %} diff --git a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk index e112eda3c..16842e693 100644 --- a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk +++ b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk @@ -27,7 +27,7 @@ import { function main() { {%- for service in api.services %} - const {{ service.name.toCamelCase() -}}Client = new {{ service.name.toPascalCase() + 'Client' -}}(); + new {{ service.name.toPascalCase() + 'Client' -}}(); {%- endfor %} }