Skip to content

Commit 74adf81

Browse files
JeanMecheatscott
JeanMeche
authored and
atscott
committed
refactor(core): Remove usage of deprecated Injector.create() (angular#49606)
This commit removes all usages of the deprecated `Injector.create` method but does not remove the deprecated signature itself. PR Close angular#49606
1 parent 48eff1e commit 74adf81

20 files changed

+230
-164
lines changed

‎packages/benchpress/src/runner.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class Runner {
6161
sampleProviders.push(providers);
6262
}
6363

64-
const inj = Injector.create(sampleProviders);
64+
const inj = Injector.create({providers: sampleProviders});
6565
const adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
6666

6767
return Promise
@@ -75,11 +75,13 @@ export class Runner {
7575
// Only WebDriverAdapter is reused.
7676
// TODO(vsavkin): consider changing it when toAsyncFactory is added back or when child
7777
// injectors are handled better.
78-
const injector = Injector.create([
79-
sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
80-
{provide: Options.USER_AGENT, useValue: userAgent},
81-
{provide: WebDriverAdapter, useValue: adapter}
82-
]);
78+
const injector = Injector.create({
79+
providers: [
80+
sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
81+
{provide: Options.USER_AGENT, useValue: userAgent},
82+
{provide: WebDriverAdapter, useValue: adapter}
83+
]
84+
});
8385

8486
// TODO: With TypeScript 2.5 injector.get does not infer correctly the
8587
// return type. Remove 'any' and investigate the issue.

‎packages/benchpress/test/metric/multi_metric_spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ import {Injector, Metric, MultiMetric} from '../../index';
1111
(function() {
1212
function createMetric(ids: any[]) {
1313
const m = Injector
14-
.create([
15-
ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
16-
MultiMetric.provideWith(ids)
17-
])
14+
.create({
15+
providers: [
16+
ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
17+
MultiMetric.provideWith(ids)
18+
]
19+
})
1820
.get<MultiMetric>(MultiMetric);
1921
return Promise.resolve(m);
2022
}

‎packages/benchpress/test/metric/perflog_metric_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function createMetric(
6262
if (ignoreNavigation != null) {
6363
providers.push({provide: PerflogMetric.IGNORE_NAVIGATION, useValue: ignoreNavigation});
6464
}
65-
return Injector.create(providers).get(PerflogMetric);
65+
return Injector.create({providers}).get(PerflogMetric);
6666
}
6767

6868
describe('perflog metric', () => {

‎packages/benchpress/test/metric/user_metric_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function createMetric(
2929
{provide: Options.USER_METRICS, useValue: userMetrics},
3030
{provide: WebDriverAdapter, useValue: wdAdapter}
3131
];
32-
return Injector.create(providers).get(UserMetric);
32+
return Injector.create({providers}).get(UserMetric);
3333
}
3434

3535
describe('user metric', () => {

‎packages/benchpress/test/reporter/json_file_reporter_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {Injector, JsonFileReporter, MeasureValues, Options, SampleDescription} f
3232
}
3333
}
3434
];
35-
return Injector.create(providers).get<JsonFileReporter>(JsonFileReporter);
35+
return Injector.create({providers}).get<JsonFileReporter>(JsonFileReporter);
3636
}
3737

3838
it('should write all data into a file', done => {

‎packages/benchpress/test/reporter/multi_reporter_spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ import {Injector, MeasureValues, MultiReporter, Reporter} from '../../index';
1111
(function() {
1212
function createReporters(ids: any[]) {
1313
const r = Injector
14-
.create([
15-
ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
16-
MultiReporter.provideWith(ids)
17-
])
14+
.create({
15+
providers: [
16+
ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
17+
MultiReporter.provideWith(ids)
18+
]
19+
})
1820
.get<MultiReporter>(MultiReporter);
1921
return Promise.resolve(r);
2022
}

‎packages/benchpress/test/sampler_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
4242
providers.push({provide: Options.PREPARE, useValue: prepare});
4343
}
4444

45-
sampler = Injector.create(providers).get(Sampler);
45+
sampler = Injector.create({providers}).get(Sampler);
4646
}
4747

4848
it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor', done => {

‎packages/benchpress/test/validator/regression_slope_validator_spec.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ import {Injector, MeasureValues, RegressionSlopeValidator} from '../../index';
1414

1515
function createValidator({size, metric}: {size: number, metric: string}) {
1616
validator = Injector
17-
.create([
18-
RegressionSlopeValidator.PROVIDERS,
19-
{provide: RegressionSlopeValidator.METRIC, useValue: metric},
20-
{provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
21-
])
17+
.create({
18+
providers: [
19+
RegressionSlopeValidator.PROVIDERS,
20+
{provide: RegressionSlopeValidator.METRIC, useValue: metric},
21+
{provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
22+
]
23+
})
2224
.get(RegressionSlopeValidator);
2325
}
2426

‎packages/benchpress/test/validator/size_validator_spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ import {Injector, MeasureValues, SizeValidator} from '../../index';
1515
function createValidator(size: number) {
1616
validator =
1717
Injector
18-
.create(
19-
[SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}])
18+
.create({
19+
providers:
20+
[SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}]
21+
})
2022
.get(SizeValidator);
2123
}
2224

‎packages/benchpress/test/web_driver_extension_spec.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ function createExtension(ids: any[], caps: any) {
1313
return new Promise<any>((res, rej) => {
1414
try {
1515
res(Injector
16-
.create([
17-
ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
18-
{provide: Options.CAPABILITIES, useValue: caps},
19-
WebDriverExtension.provideFirstSupported(ids)
20-
])
16+
.create({
17+
providers: [
18+
ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
19+
{provide: Options.CAPABILITIES, useValue: caps},
20+
WebDriverExtension.provideFirstSupported(ids)
21+
]
22+
})
2123
.get(WebDriverExtension));
2224
} catch (e) {
2325
rej(e);

‎packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ import {TraceEventFactory} from '../trace_event_factory';
4040
}
4141
log = [];
4242
extension = Injector
43-
.create([
44-
ChromeDriverExtension.PROVIDERS, {
45-
provide: WebDriverAdapter,
46-
useValue: new MockDriverAdapter(log, perfRecords, messageMethod)
47-
},
48-
{provide: Options.USER_AGENT, useValue: userAgent},
49-
{provide: Options.RAW_PERFLOG_PATH, useValue: null}
50-
])
43+
.create({
44+
providers: [
45+
ChromeDriverExtension.PROVIDERS, {
46+
provide: WebDriverAdapter,
47+
useValue: new MockDriverAdapter(log, perfRecords, messageMethod)
48+
},
49+
{provide: Options.USER_AGENT, useValue: userAgent},
50+
{provide: Options.RAW_PERFLOG_PATH, useValue: null}
51+
]
52+
})
5153
.get(ChromeDriverExtension);
5254
return extension;
5355
}

‎packages/benchpress/test/webdriver/ios_driver_extension_spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ import {TraceEventFactory} from '../trace_event_factory';
2323
log = [];
2424
extension =
2525
Injector
26-
.create([
27-
IOsDriverExtension.PROVIDERS,
28-
{provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
29-
])
26+
.create({
27+
providers: [
28+
IOsDriverExtension.PROVIDERS,
29+
{provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
30+
]
31+
})
3032
.get(IOsDriverExtension);
3133
return extension;
3234
}

‎packages/core/test/acceptance/di_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2428,7 +2428,7 @@ describe('di', () => {
24282428
}
24292429

24302430
const testBedInjector: Injector = TestBed.get(Injector);
2431-
const childInjector = Injector.create([], testBedInjector);
2431+
const childInjector = Injector.create({providers: [], parent: testBedInjector});
24322432

24332433
const anyService = childInjector.get(AnyService);
24342434
expect(anyService.injector).toBe(childInjector);

‎packages/core/test/acceptance/providers_spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,14 +666,15 @@ describe('providers', () => {
666666
class OtherService {}
667667

668668
it('should support Optional flag in deps', () => {
669-
const injector =
670-
Injector.create([{provide: MyService, deps: [[new Optional(), OtherService]]}]);
669+
const injector = Injector.create(
670+
{providers: [{provide: MyService, deps: [[new Optional(), OtherService]]}]});
671671

672672
expect(injector.get(MyService).value).toBe(null);
673673
});
674674

675675
it('should support Optional flag in deps without instantiating it', () => {
676-
const injector = Injector.create([{provide: MyService, deps: [[Optional, OtherService]]}]);
676+
const injector =
677+
Injector.create({providers: [{provide: MyService, deps: [[Optional, OtherService]]}]});
677678

678679
expect(injector.get(MyService).value).toBe(null);
679680
});

‎packages/core/test/change_detection/differs/iterable_differs_spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ import {TestBed} from '@angular/core/testing';
5050
describe('.extend()', () => {
5151
it('should extend di-inherited differs', () => {
5252
const parent = new IterableDiffers([factory1]);
53-
const injector = Injector.create([{provide: IterableDiffers, useValue: parent}]);
54-
const childInjector = Injector.create([IterableDiffers.extend([factory2])], injector);
53+
const injector =
54+
Injector.create({providers: [{provide: IterableDiffers, useValue: parent}]});
55+
const childInjector =
56+
Injector.create({providers: [IterableDiffers.extend([factory2])], parent: injector});
5557

5658
expect(injector.get<IterableDiffers>(IterableDiffers).factories).toEqual([factory1]);
5759
expect(childInjector.get<IterableDiffers>(IterableDiffers).factories).toEqual([

0 commit comments

Comments
 (0)