Skip to content

Commit 275107e

Browse files
authored
Updated BaseService and service arguments in the mustache files to fix #20732 (#20736)
* Updated BaseService property * removed unused depencies * Add test files
1 parent fb7aa58 commit 275107e

File tree

66 files changed

+85
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+85
-85
lines changed

modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
1+
import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
22
import { CustomHttpParameterCodec } from './encoder';
33
import { {{configurationClassName}} } from './configuration';
44

@@ -8,7 +8,7 @@ export class BaseService {
88
public configuration: {{configurationClassName}};
99
public encoder: HttpParameterCodec;
1010

11-
constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: {{configurationClassName}}) {
11+
constructor(basePath?: string|string[], configuration?: {{configurationClassName}}) {
1212
this.configuration = configuration || new {{configurationClassName}}();
1313
if (typeof this.configuration.basePath !== 'string') {
1414
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;

modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class {{classname}} extends BaseService {
6363
{{/withInterfaces}}
6464

6565
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: {{configurationClassName}}) {
66-
super(httpClient, basePath, configuration);
66+
super(basePath, configuration);
6767
}
6868

6969
{{#operation}}

samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
1+
import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
22
import { CustomHttpParameterCodec } from './encoder';
33
import { Configuration } from './configuration';
44

@@ -8,7 +8,7 @@ export class BaseService {
88
public configuration: Configuration;
99
public encoder: HttpParameterCodec;
1010

11-
constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
11+
constructor(basePath?: string|string[], configuration?: Configuration) {
1212
this.configuration = configuration || new Configuration();
1313
if (typeof this.configuration.basePath !== 'string') {
1414
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;

samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api/pet.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
3232
export class PetService extends BaseService {
3333

3434
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
35-
super(httpClient, basePath, configuration);
35+
super(basePath, configuration);
3636
}
3737

3838
/**

samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
1+
import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
22
import { CustomHttpParameterCodec } from './encoder';
33
import { Configuration } from './configuration';
44

@@ -8,7 +8,7 @@ export class BaseService {
88
public configuration: Configuration;
99
public encoder: HttpParameterCodec;
1010

11-
constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
11+
constructor(basePath?: string|string[], configuration?: Configuration) {
1212
this.configuration = configuration || new Configuration();
1313
if (typeof this.configuration.basePath !== 'string') {
1414
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;

samples/client/others/typescript-angular/builds/composed-schemas/api/pet.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
3232
export class PetService extends BaseService {
3333

3434
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
35-
super(httpClient, basePath, configuration);
35+
super(basePath, configuration);
3636
}
3737

3838
/**

samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
1+
import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
22
import { CustomHttpParameterCodec } from './encoder';
33
import { Configuration } from './configuration';
44

@@ -8,7 +8,7 @@ export class BaseService {
88
public configuration: Configuration;
99
public encoder: HttpParameterCodec;
1010

11-
constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
11+
constructor(basePath?: string|string[], configuration?: Configuration) {
1212
this.configuration = configuration || new Configuration();
1313
if (typeof this.configuration.basePath !== 'string') {
1414
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;

samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api/default.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { BaseService } from '../api.base.service';
3232
export class DefaultService extends BaseService {
3333

3434
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
35-
super(httpClient, basePath, configuration);
35+
super(basePath, configuration);
3636
}
3737

3838
/**

samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
1+
import { HttpHeaders, HttpParams, HttpParameterCodec } from '@angular/common/http';
22
import { CustomHttpParameterCodec } from './encoder';
33
import { Configuration } from './configuration';
44

@@ -8,7 +8,7 @@ export class BaseService {
88
public configuration: Configuration;
99
public encoder: HttpParameterCodec;
1010

11-
constructor(protected httpClient: HttpClient, basePath?: string|string[], configuration?: Configuration) {
11+
constructor(basePath?: string|string[], configuration?: Configuration) {
1212
this.configuration = configuration || new Configuration();
1313
if (typeof this.configuration.basePath !== 'string') {
1414
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;

samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { BaseService } from '../api.base.service';
3434
export class PetService extends BaseService {
3535

3636
constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
37-
super(httpClient, basePath, configuration);
37+
super(basePath, configuration);
3838
}
3939

4040
/**

0 commit comments

Comments
 (0)