Skip to content

Commit bd5b586

Browse files
yissacharwing328
yissachar
authored and
wing328
committed
Use valid JS RegEx (#6584)
1 parent 4b9ee1f commit bd5b586

File tree

14 files changed

+115
-115
lines changed

14 files changed

+115
-115
lines changed

‎modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class {{classname}} {
7979
}
8080

8181
public isJsonMime(mime: string): boolean {
82-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
82+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
8383
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
8484
}
8585

‎samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class PetService {
4646
}
4747

4848
/**
49-
*
49+
*
5050
* Extends object by coping non-existing properties.
5151
* @param objA object to be extended
5252
* @param objB source object
@@ -75,7 +75,7 @@ export class PetService {
7575
}
7676

7777
public isJsonMime(mime: string): boolean {
78-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
78+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
7979
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
8080
}
8181

@@ -248,7 +248,7 @@ export class PetService {
248248
headers.set('Authorization', 'Bearer ' + accessToken);
249249
}
250250

251-
251+
252252
headers.set('Content-Type', 'application/json');
253253

254254
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -307,7 +307,7 @@ export class PetService {
307307
headers.set('Authorization', 'Bearer ' + accessToken);
308308
}
309309

310-
310+
311311
let requestOptions: RequestOptionsArgs = new RequestOptions({
312312
method: RequestMethod.Delete,
313313
headers: headers,
@@ -361,7 +361,7 @@ export class PetService {
361361
headers.set('Authorization', 'Bearer ' + accessToken);
362362
}
363363

364-
364+
365365
let requestOptions: RequestOptionsArgs = new RequestOptions({
366366
method: RequestMethod.Get,
367367
headers: headers,
@@ -415,7 +415,7 @@ export class PetService {
415415
headers.set('Authorization', 'Bearer ' + accessToken);
416416
}
417417

418-
418+
419419
let requestOptions: RequestOptionsArgs = new RequestOptions({
420420
method: RequestMethod.Get,
421421
headers: headers,
@@ -462,7 +462,7 @@ export class PetService {
462462
headers.set('api_key', this.configuration.apiKeys["api_key"]);
463463
}
464464

465-
465+
466466
let requestOptions: RequestOptionsArgs = new RequestOptions({
467467
method: RequestMethod.Get,
468468
headers: headers,
@@ -512,7 +512,7 @@ export class PetService {
512512
headers.set('Authorization', 'Bearer ' + accessToken);
513513
}
514514

515-
515+
516516
headers.set('Content-Type', 'application/json');
517517

518518
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -582,7 +582,7 @@ export class PetService {
582582
headers.set('Authorization', 'Bearer ' + accessToken);
583583
}
584584

585-
585+
586586
if (name !== undefined) {
587587
formParams.set('name', <any>name);
588588
}
@@ -658,7 +658,7 @@ export class PetService {
658658
headers.set('Authorization', 'Bearer ' + accessToken);
659659
}
660660

661-
661+
662662
if (additionalMetadata !== undefined) {
663663
formParams.set('additionalMetadata', <any>additionalMetadata);
664664
}

‎samples/client/petstore/typescript-angular-v2/default/api/store.service.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class StoreService {
4545
}
4646

4747
/**
48-
*
48+
*
4949
* Extends object by coping non-existing properties.
5050
* @param objA object to be extended
5151
* @param objB source object
@@ -74,7 +74,7 @@ export class StoreService {
7474
}
7575

7676
public isJsonMime(mime: string): boolean {
77-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
77+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
7878
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
7979
}
8080

@@ -169,7 +169,7 @@ export class StoreService {
169169
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
170170
}
171171

172-
172+
173173
let requestOptions: RequestOptionsArgs = new RequestOptions({
174174
method: RequestMethod.Delete,
175175
headers: headers,
@@ -209,7 +209,7 @@ export class StoreService {
209209
headers.set('api_key', this.configuration.apiKeys["api_key"]);
210210
}
211211

212-
212+
213213
let requestOptions: RequestOptionsArgs = new RequestOptions({
214214
method: RequestMethod.Get,
215215
headers: headers,
@@ -251,7 +251,7 @@ export class StoreService {
251251
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
252252
}
253253

254-
254+
255255
let requestOptions: RequestOptionsArgs = new RequestOptions({
256256
method: RequestMethod.Get,
257257
headers: headers,
@@ -292,7 +292,7 @@ export class StoreService {
292292
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
293293
}
294294

295-
295+
296296
headers.set('Content-Type', 'application/json');
297297

298298
let requestOptions: RequestOptionsArgs = new RequestOptions({

‎samples/client/petstore/typescript-angular-v2/default/api/user.service.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class UserService {
4545
}
4646

4747
/**
48-
*
48+
*
4949
* Extends object by coping non-existing properties.
5050
* @param objA object to be extended
5151
* @param objB source object
@@ -74,7 +74,7 @@ export class UserService {
7474
}
7575

7676
public isJsonMime(mime: string): boolean {
77-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
77+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
7878
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
7979
}
8080

@@ -234,7 +234,7 @@ export class UserService {
234234
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
235235
}
236236

237-
237+
238238
headers.set('Content-Type', 'application/json');
239239

240240
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -278,7 +278,7 @@ export class UserService {
278278
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
279279
}
280280

281-
281+
282282
headers.set('Content-Type', 'application/json');
283283

284284
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -322,7 +322,7 @@ export class UserService {
322322
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
323323
}
324324

325-
325+
326326
headers.set('Content-Type', 'application/json');
327327

328328
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -367,7 +367,7 @@ export class UserService {
367367
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
368368
}
369369

370-
370+
371371
let requestOptions: RequestOptionsArgs = new RequestOptions({
372372
method: RequestMethod.Delete,
373373
headers: headers,
@@ -409,7 +409,7 @@ export class UserService {
409409
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
410410
}
411411

412-
412+
413413
let requestOptions: RequestOptionsArgs = new RequestOptions({
414414
method: RequestMethod.Get,
415415
headers: headers,
@@ -463,7 +463,7 @@ export class UserService {
463463
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
464464
}
465465

466-
466+
467467
let requestOptions: RequestOptionsArgs = new RequestOptions({
468468
method: RequestMethod.Get,
469469
headers: headers,
@@ -499,7 +499,7 @@ export class UserService {
499499
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
500500
}
501501

502-
502+
503503
let requestOptions: RequestOptionsArgs = new RequestOptions({
504504
method: RequestMethod.Get,
505505
headers: headers,
@@ -546,7 +546,7 @@ export class UserService {
546546
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
547547
}
548548

549-
549+
550550
headers.set('Content-Type', 'application/json');
551551

552552
let requestOptions: RequestOptionsArgs = new RequestOptions({

‎samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class PetService {
4646
}
4747

4848
/**
49-
*
49+
*
5050
* Extends object by coping non-existing properties.
5151
* @param objA object to be extended
5252
* @param objB source object
@@ -75,7 +75,7 @@ export class PetService {
7575
}
7676

7777
public isJsonMime(mime: string): boolean {
78-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
78+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
7979
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
8080
}
8181

@@ -248,7 +248,7 @@ export class PetService {
248248
headers.set('Authorization', 'Bearer ' + accessToken);
249249
}
250250

251-
251+
252252
headers.set('Content-Type', 'application/json');
253253

254254
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -307,7 +307,7 @@ export class PetService {
307307
headers.set('Authorization', 'Bearer ' + accessToken);
308308
}
309309

310-
310+
311311
let requestOptions: RequestOptionsArgs = new RequestOptions({
312312
method: RequestMethod.Delete,
313313
headers: headers,
@@ -361,7 +361,7 @@ export class PetService {
361361
headers.set('Authorization', 'Bearer ' + accessToken);
362362
}
363363

364-
364+
365365
let requestOptions: RequestOptionsArgs = new RequestOptions({
366366
method: RequestMethod.Get,
367367
headers: headers,
@@ -415,7 +415,7 @@ export class PetService {
415415
headers.set('Authorization', 'Bearer ' + accessToken);
416416
}
417417

418-
418+
419419
let requestOptions: RequestOptionsArgs = new RequestOptions({
420420
method: RequestMethod.Get,
421421
headers: headers,
@@ -462,7 +462,7 @@ export class PetService {
462462
headers.set('api_key', this.configuration.apiKeys["api_key"]);
463463
}
464464

465-
465+
466466
let requestOptions: RequestOptionsArgs = new RequestOptions({
467467
method: RequestMethod.Get,
468468
headers: headers,
@@ -512,7 +512,7 @@ export class PetService {
512512
headers.set('Authorization', 'Bearer ' + accessToken);
513513
}
514514

515-
515+
516516
headers.set('Content-Type', 'application/json');
517517

518518
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -582,7 +582,7 @@ export class PetService {
582582
headers.set('Authorization', 'Bearer ' + accessToken);
583583
}
584584

585-
585+
586586
if (name !== undefined) {
587587
formParams.set('name', <any>name);
588588
}
@@ -658,7 +658,7 @@ export class PetService {
658658
headers.set('Authorization', 'Bearer ' + accessToken);
659659
}
660660

661-
661+
662662
if (additionalMetadata !== undefined) {
663663
formParams.set('additionalMetadata', <any>additionalMetadata);
664664
}

‎samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class StoreService {
4545
}
4646

4747
/**
48-
*
48+
*
4949
* Extends object by coping non-existing properties.
5050
* @param objA object to be extended
5151
* @param objB source object
@@ -74,7 +74,7 @@ export class StoreService {
7474
}
7575

7676
public isJsonMime(mime: string): boolean {
77-
const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
77+
const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
7878
return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
7979
}
8080

@@ -169,7 +169,7 @@ export class StoreService {
169169
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
170170
}
171171

172-
172+
173173
let requestOptions: RequestOptionsArgs = new RequestOptions({
174174
method: RequestMethod.Delete,
175175
headers: headers,
@@ -209,7 +209,7 @@ export class StoreService {
209209
headers.set('api_key', this.configuration.apiKeys["api_key"]);
210210
}
211211

212-
212+
213213
let requestOptions: RequestOptionsArgs = new RequestOptions({
214214
method: RequestMethod.Get,
215215
headers: headers,
@@ -251,7 +251,7 @@ export class StoreService {
251251
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
252252
}
253253

254-
254+
255255
let requestOptions: RequestOptionsArgs = new RequestOptions({
256256
method: RequestMethod.Get,
257257
headers: headers,
@@ -292,7 +292,7 @@ export class StoreService {
292292
headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
293293
}
294294

295-
295+
296296
headers.set('Content-Type', 'application/json');
297297

298298
let requestOptions: RequestOptionsArgs = new RequestOptions({

0 commit comments

Comments
 (0)