fix: only import GaxCall if needed, and remove unused variables (#374)

Co-authored-by: Justin Beckwith <[email protected]>
googleapis · Mar 31, 2020 · 8b762fb · 8b762fb
1 parent 0de55ab
commit 8b762fb
Show file tree

Hide file tree

Showing 34 changed files with 45 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 %}
 }