refactor(core): Remove usage of deprecated Injector.create() (#49606)

JeanMeche · atscott · commit 74adf81446c2 · 2023-03-28T10:15:35.000-07:00
This commit removes all usages of the deprecated `Injector.create` method but does not remove the deprecated signature itself. PR Close #49606
diff --git a/packages/benchpress/src/runner.ts b/packages/benchpress/src/runner.ts
@@ -61,7 +61,7 @@ export class Runner {
       sampleProviders.push(providers);
     }
 
-    const inj = Injector.create(sampleProviders);
+    const inj = Injector.create({providers: sampleProviders});
     const adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
 
     return Promise
@@ -75,11 +75,13 @@ export class Runner {
           // Only WebDriverAdapter is reused.
           // TODO(vsavkin): consider changing it when toAsyncFactory is added back or when child
           // injectors are handled better.
-          const injector = Injector.create([
-            sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
-            {provide: Options.USER_AGENT, useValue: userAgent},
-            {provide: WebDriverAdapter, useValue: adapter}
-          ]);
+          const injector = Injector.create({
+            providers: [
+              sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
+              {provide: Options.USER_AGENT, useValue: userAgent},
+              {provide: WebDriverAdapter, useValue: adapter}
+            ]
+          });
 
           // TODO: With TypeScript 2.5 injector.get does not infer correctly the
           // return type. Remove 'any' and investigate the issue.
diff --git a/packages/benchpress/test/metric/multi_metric_spec.ts b/packages/benchpress/test/metric/multi_metric_spec.ts
@@ -11,10 +11,12 @@ import {Injector, Metric, MultiMetric} from '../../index';
 (function() {
 function createMetric(ids: any[]) {
   const m = Injector
-                .create([
-                  ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
-                  MultiMetric.provideWith(ids)
-                ])
+                .create({
+                  providers: [
+                    ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
+                    MultiMetric.provideWith(ids)
+                  ]
+                })
                 .get<MultiMetric>(MultiMetric);
   return Promise.resolve(m);
 }
diff --git a/packages/benchpress/test/metric/perflog_metric_spec.ts b/packages/benchpress/test/metric/perflog_metric_spec.ts
@@ -62,7 +62,7 @@ function createMetric(
   if (ignoreNavigation != null) {
     providers.push({provide: PerflogMetric.IGNORE_NAVIGATION, useValue: ignoreNavigation});
   }
-  return Injector.create(providers).get(PerflogMetric);
+  return Injector.create({providers}).get(PerflogMetric);
 }
 
 describe('perflog metric', () => {
diff --git a/packages/benchpress/test/metric/user_metric_spec.ts b/packages/benchpress/test/metric/user_metric_spec.ts
@@ -29,7 +29,7 @@ function createMetric(
     {provide: Options.USER_METRICS, useValue: userMetrics},
     {provide: WebDriverAdapter, useValue: wdAdapter}
   ];
-  return Injector.create(providers).get(UserMetric);
+  return Injector.create({providers}).get(UserMetric);
 }
 
 describe('user metric', () => {
diff --git a/packages/benchpress/test/reporter/json_file_reporter_spec.ts b/packages/benchpress/test/reporter/json_file_reporter_spec.ts
@@ -32,7 +32,7 @@ import {Injector, JsonFileReporter, MeasureValues, Options, SampleDescription} f
           }
         }
       ];
-      return Injector.create(providers).get<JsonFileReporter>(JsonFileReporter);
+      return Injector.create({providers}).get<JsonFileReporter>(JsonFileReporter);
     }
 
     it('should write all data into a file', done => {
diff --git a/packages/benchpress/test/reporter/multi_reporter_spec.ts b/packages/benchpress/test/reporter/multi_reporter_spec.ts
@@ -11,10 +11,12 @@ import {Injector, MeasureValues, MultiReporter, Reporter} from '../../index';
 (function() {
 function createReporters(ids: any[]) {
   const r = Injector
-                .create([
-                  ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
-                  MultiReporter.provideWith(ids)
-                ])
+                .create({
+                  providers: [
+                    ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
+                    MultiReporter.provideWith(ids)
+                  ]
+                })
                 .get<MultiReporter>(MultiReporter);
   return Promise.resolve(r);
 }
diff --git a/packages/benchpress/test/sampler_spec.ts b/packages/benchpress/test/sampler_spec.ts
@@ -42,7 +42,7 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
         providers.push({provide: Options.PREPARE, useValue: prepare});
       }
 
-      sampler = Injector.create(providers).get(Sampler);
+      sampler = Injector.create({providers}).get(Sampler);
     }
 
     it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor', done => {
diff --git a/packages/benchpress/test/validator/regression_slope_validator_spec.ts b/packages/benchpress/test/validator/regression_slope_validator_spec.ts
@@ -14,11 +14,13 @@ import {Injector, MeasureValues, RegressionSlopeValidator} from '../../index';
 
     function createValidator({size, metric}: {size: number, metric: string}) {
       validator = Injector
-                      .create([
-                        RegressionSlopeValidator.PROVIDERS,
-                        {provide: RegressionSlopeValidator.METRIC, useValue: metric},
-                        {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
-                      ])
+                      .create({
+                        providers: [
+                          RegressionSlopeValidator.PROVIDERS,
+                          {provide: RegressionSlopeValidator.METRIC, useValue: metric},
+                          {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
+                        ]
+                      })
                       .get(RegressionSlopeValidator);
     }
 
diff --git a/packages/benchpress/test/validator/size_validator_spec.ts b/packages/benchpress/test/validator/size_validator_spec.ts
@@ -15,8 +15,10 @@ import {Injector, MeasureValues, SizeValidator} from '../../index';
     function createValidator(size: number) {
       validator =
           Injector
-              .create(
-                  [SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}])
+              .create({
+                providers:
+                    [SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}]
+              })
               .get(SizeValidator);
     }
 
diff --git a/packages/benchpress/test/web_driver_extension_spec.ts b/packages/benchpress/test/web_driver_extension_spec.ts
@@ -13,11 +13,13 @@ function createExtension(ids: any[], caps: any) {
   return new Promise<any>((res, rej) => {
     try {
       res(Injector
-              .create([
-                ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
-                {provide: Options.CAPABILITIES, useValue: caps},
-                WebDriverExtension.provideFirstSupported(ids)
-              ])
+              .create({
+                providers: [
+                  ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
+                  {provide: Options.CAPABILITIES, useValue: caps},
+                  WebDriverExtension.provideFirstSupported(ids)
+                ]
+              })
               .get(WebDriverExtension));
     } catch (e) {
       rej(e);
diff --git a/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@@ -40,14 +40,16 @@ import {TraceEventFactory} from '../trace_event_factory';
       }
       log = [];
       extension = Injector
-                      .create([
-                        ChromeDriverExtension.PROVIDERS, {
-                          provide: WebDriverAdapter,
-                          useValue: new MockDriverAdapter(log, perfRecords, messageMethod)
-                        },
-                        {provide: Options.USER_AGENT, useValue: userAgent},
-                        {provide: Options.RAW_PERFLOG_PATH, useValue: null}
-                      ])
+                      .create({
+                        providers: [
+                          ChromeDriverExtension.PROVIDERS, {
+                            provide: WebDriverAdapter,
+                            useValue: new MockDriverAdapter(log, perfRecords, messageMethod)
+                          },
+                          {provide: Options.USER_AGENT, useValue: userAgent},
+                          {provide: Options.RAW_PERFLOG_PATH, useValue: null}
+                        ]
+                      })
                       .get(ChromeDriverExtension);
       return extension;
     }
diff --git a/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts b/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts
@@ -23,10 +23,12 @@ import {TraceEventFactory} from '../trace_event_factory';
       log = [];
       extension =
           Injector
-              .create([
-                IOsDriverExtension.PROVIDERS,
-                {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
-              ])
+              .create({
+                providers: [
+                  IOsDriverExtension.PROVIDERS,
+                  {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
+                ]
+              })
               .get(IOsDriverExtension);
       return extension;
     }
diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
@@ -2428,7 +2428,7 @@ describe('di', () => {
       }
 
       const testBedInjector: Injector = TestBed.get(Injector);
-      const childInjector = Injector.create([], testBedInjector);
+      const childInjector = Injector.create({providers: [], parent: testBedInjector});
 
       const anyService = childInjector.get(AnyService);
       expect(anyService.injector).toBe(childInjector);
diff --git a/packages/core/test/acceptance/providers_spec.ts b/packages/core/test/acceptance/providers_spec.ts
@@ -666,14 +666,15 @@ describe('providers', () => {
     class OtherService {}
 
     it('should support Optional flag in deps', () => {
-      const injector =
-          Injector.create([{provide: MyService, deps: [[new Optional(), OtherService]]}]);
+      const injector = Injector.create(
+          {providers: [{provide: MyService, deps: [[new Optional(), OtherService]]}]});
 
       expect(injector.get(MyService).value).toBe(null);
     });
 
     it('should support Optional flag in deps without instantiating it', () => {
-      const injector = Injector.create([{provide: MyService, deps: [[Optional, OtherService]]}]);
+      const injector =
+          Injector.create({providers: [{provide: MyService, deps: [[Optional, OtherService]]}]});
 
       expect(injector.get(MyService).value).toBe(null);
     });
diff --git a/packages/core/test/change_detection/differs/iterable_differs_spec.ts b/packages/core/test/change_detection/differs/iterable_differs_spec.ts
@@ -50,8 +50,10 @@ import {TestBed} from '@angular/core/testing';
     describe('.extend()', () => {
       it('should extend di-inherited differs', () => {
         const parent = new IterableDiffers([factory1]);
-        const injector = Injector.create([{provide: IterableDiffers, useValue: parent}]);
-        const childInjector = Injector.create([IterableDiffers.extend([factory2])], injector);
+        const injector =
+            Injector.create({providers: [{provide: IterableDiffers, useValue: parent}]});
+        const childInjector =
+            Injector.create({providers: [IterableDiffers.extend([factory2])], parent: injector});
 
         expect(injector.get<IterableDiffers>(IterableDiffers).factories).toEqual([factory1]);
         expect(childInjector.get<IterableDiffers>(IterableDiffers).factories).toEqual([
diff --git a/packages/core/test/di/static_injector_spec.ts b/packages/core/test/di/static_injector_spec.ts
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
diff --git a/packages/core/test/render3/component_ref_spec.ts b/packages/core/test/render3/component_ref_spec.ts
diff --git a/packages/platform-browser-dynamic/src/compiler_factory.ts b/packages/platform-browser-dynamic/src/compiler_factory.ts
diff --git a/packages/platform-browser/test/browser/tools/tools_spec.ts b/packages/platform-browser/test/browser/tools/tools_spec.ts

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function createMetric(`
`62`	`62`	`if (ignoreNavigation != null) {`
`63`	`63`	`providers.push({provide: PerflogMetric.IGNORE_NAVIGATION, useValue: ignoreNavigation});`
`64`	`64`	`}`
`65`		`- return Injector.create(providers).get(PerflogMetric);`
	`65`	`+ return Injector.create({providers}).get(PerflogMetric);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`describe('perflog metric', () => {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function createMetric(`
`29`	`29`	`{provide: Options.USER_METRICS, useValue: userMetrics},`
`30`	`30`	`{provide: WebDriverAdapter, useValue: wdAdapter}`
`31`	`31`	`];`
`32`		`- return Injector.create(providers).get(UserMetric);`
	`32`	`+ return Injector.create({providers}).get(UserMetric);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`describe('user metric', () => {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import {Injector, JsonFileReporter, MeasureValues, Options, SampleDescription} f`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`];`
`35`		`- return Injector.create(providers).get<JsonFileReporter>(JsonFileReporter);`
	`35`	`+ return Injector.create({providers}).get<JsonFileReporter>(JsonFileReporter);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`it('should write all data into a file', done => {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,`
`42`	`42`	`providers.push({provide: Options.PREPARE, useValue: prepare});`
`43`	`43`	`}`
`44`	`44`
`45`		`- sampler = Injector.create(providers).get(Sampler);`
	`45`	`+ sampler = Injector.create({providers}).get(Sampler);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor', done => {`