Use valid JS RegEx (#6584)

swagger-api · Sep 28, 2017 · bd5b586 · bd5b586
1 parent 4b9ee1f
commit bd5b586
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 115 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
@@ -79,7 +79,7 @@ export class {{classname}} {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 

diff --git a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
@@ -46,7 +46,7 @@ export class PetService {
     }
 
     /**
-     * 
+     *
      * Extends object by coping non-existing properties.
      * @param objA object to be extended
      * @param objB source object
@@ -75,7 +75,7 @@ export class PetService {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 
@@ -248,7 +248,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -307,7 +307,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Delete,
             headers: headers,
@@ -361,7 +361,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -415,7 +415,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -462,7 +462,7 @@ export class PetService {
             headers.set('api_key', this.configuration.apiKeys["api_key"]);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -512,7 +512,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -582,7 +582,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         if (name !== undefined) {
             formParams.set('name', <any>name);
         }
@@ -658,7 +658,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         if (additionalMetadata !== undefined) {
             formParams.set('additionalMetadata', <any>additionalMetadata);
         }

diff --git a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
@@ -45,7 +45,7 @@ export class StoreService {
     }
 
     /**
-     * 
+     *
      * Extends object by coping non-existing properties.
      * @param objA object to be extended
      * @param objB source object
@@ -74,7 +74,7 @@ export class StoreService {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 
@@ -169,7 +169,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Delete,
             headers: headers,
@@ -209,7 +209,7 @@ export class StoreService {
             headers.set('api_key', this.configuration.apiKeys["api_key"]);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -251,7 +251,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -292,7 +292,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({

diff --git a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
@@ -45,7 +45,7 @@ export class UserService {
     }
 
     /**
-     * 
+     *
      * Extends object by coping non-existing properties.
      * @param objA object to be extended
      * @param objB source object
@@ -74,7 +74,7 @@ export class UserService {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 
@@ -234,7 +234,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -278,7 +278,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -322,7 +322,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -367,7 +367,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Delete,
             headers: headers,
@@ -409,7 +409,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -463,7 +463,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -499,7 +499,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -546,7 +546,7 @@ export class UserService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({

diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
@@ -46,7 +46,7 @@ export class PetService {
     }
 
     /**
-     * 
+     *
      * Extends object by coping non-existing properties.
      * @param objA object to be extended
      * @param objB source object
@@ -75,7 +75,7 @@ export class PetService {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 
@@ -248,7 +248,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -307,7 +307,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Delete,
             headers: headers,
@@ -361,7 +361,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -415,7 +415,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -462,7 +462,7 @@ export class PetService {
             headers.set('api_key', this.configuration.apiKeys["api_key"]);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -512,7 +512,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -582,7 +582,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         if (name !== undefined) {
             formParams.set('name', <any>name);
         }
@@ -658,7 +658,7 @@ export class PetService {
             headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
-            
+
         if (additionalMetadata !== undefined) {
             formParams.set('additionalMetadata', <any>additionalMetadata);
         }

diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
@@ -45,7 +45,7 @@ export class StoreService {
     }
 
     /**
-     * 
+     *
      * Extends object by coping non-existing properties.
      * @param objA object to be extended
      * @param objB source object
@@ -74,7 +74,7 @@ export class StoreService {
     }
 
     public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$');
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
 
@@ -169,7 +169,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Delete,
             headers: headers,
@@ -209,7 +209,7 @@ export class StoreService {
             headers.set('api_key', this.configuration.apiKeys["api_key"]);
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -251,7 +251,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         let requestOptions: RequestOptionsArgs = new RequestOptions({
             method: RequestMethod.Get,
             headers: headers,
@@ -292,7 +292,7 @@ export class StoreService {
             headers.set('Accept', produces.filter(item => this.isJsonMime(item)).join(';'));
         }
 
-            
+
         headers.set('Content-Type', 'application/json');
 
         let requestOptions: RequestOptionsArgs = new RequestOptions({