Skip to content

Commit

Permalink
[typescript-angular] allow empty string basePath (OpenAPITools#3489)
Browse files Browse the repository at this point in the history 
* [typescript-angular] Fixing OpenAPITools#2731 - empty string basePath

* typescript-angular: refactor base path configuration

* typescript-angular: refactor base path configuration
  • Loading branch information
@martinnovak @hokamoto
martinnovak authored and hokamoto committed Sep 12, 2019
1 parent 82f00f2 commit 0f10987
Show file tree
Hide file tree
Showing 44 changed files with 323 additions and 215 deletions.
11 changes: 6 additions & 5 deletions modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@ export class {{classname}} {
{{/useHttpClient}}

constructor(protected {{#useHttpClient}}httpClient: HttpClient{{/useHttpClient}}{{^useHttpClient}}http: Http{{/useHttpClient}}, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;
} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
{{#useHttpClient}}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ export class PetService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class StoreService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class UserService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ export class PetService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class StoreService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class UserService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ export class PetService implements PetServiceInterface {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ export class StoreService implements StoreServiceInterface {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ export class UserService implements UserServiceInterface {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ export class PetService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ export class StoreService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ export class UserService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ export class PetService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class StoreService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ export class UserService {
public encoder: QueryEncoder;

constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
}
Expand Down
11 changes: 6 additions & 5 deletions ...ent/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ export class PetService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions ...t/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ export class StoreService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions ...nt/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ export class UserService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
11 changes: 6 additions & 5 deletions ...nt/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ export class PetService {
public encoder: HttpParameterCodec;

constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {

if (configuration) {
this.configuration = configuration;
this.configuration.basePath = configuration.basePath || basePath || this.basePath;

} else {
this.configuration.basePath = basePath || this.basePath;
}
if (typeof this.configuration.basePath !== 'string') {
if (typeof basePath !== 'string') {
basePath = this.basePath;
}
this.configuration.basePath = basePath;
}
this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
}
Expand Down
Loading

0 comments on commit 0f10987

Please sign in to comment.