From 8eddb8ca832601e889f06c0807517c82668d0925 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 20 Feb 2021 12:29:03 +0800
Subject: [PATCH 1/2] replace tab with spaces, minor code format change

---
 .../typescript-angular/README.mustache        |   2 +-
 .../typescript-fetch/runtime.mustache         |   4 +-
 .../typescript-nestjs/README.mustache         |   6 +-
 .../typescript-rxjs/servers.mustache          |  36 +-
 .../resources/typescript/api/api.mustache     |  84 ++-
 .../typescript/api/exception.mustache         |   6 +-
 .../typescript/api/middleware.mustache        |  30 +-
 .../resources/typescript/http/http.mustache   |  41 +-
 .../resources/typescript/http/jquery.mustache |  15 +-
 .../typescript/http/servers.mustache          |  48 +-
 .../resources/typescript/tsconfig.mustache    |   5 +-
 .../typescript/types/ObjectParamAPI.mustache  |  11 +-
 .../typescript/types/ObservableAPI.mustache   |  37 +-
 .../typescript/types/PromiseAPI.mustache      |   7 +-
 .../main/resources/typescript/util.mustache   |  38 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/single-request-parameter/README.md |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../with-prefixed-module-name/README.md       |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/default/README.md                  |   2 +-
 .../builds/with-npm/README.md                 |   2 +-
 .../builds/default-v3.0/runtime.ts            |   4 +-
 .../builds/default/runtime.ts                 |   4 +-
 .../typescript-fetch/builds/enum/runtime.ts   |   4 +-
 .../builds/es6-target/src/runtime.ts          |   4 +-
 .../builds/multiple-parameters/runtime.ts     |   4 +-
 .../src/runtime.ts                            |   4 +-
 .../typescript-three-plus/src/runtime.ts      |   4 +-
 .../builds/with-interfaces/runtime.ts         |   4 +-
 .../builds/with-npm-version/src/runtime.ts    |   4 +-
 .../without-runtime-checks/src/runtime.ts     |   4 +-
 .../builds/default/README.md                  |   6 +-
 .../typescript-rxjs/builds/default/servers.ts |  36 +-
 .../builds/es6-target/servers.ts              |  36 +-
 .../builds/with-npm-version/servers.ts        |  36 +-
 .../with-progress-subscriber/servers.ts       |  36 +-
 .../typescript/builds/default/apis/PetApi.ts  | 260 ++++---
 .../builds/default/apis/StoreApi.ts           | 114 ++-
 .../typescript/builds/default/apis/UserApi.ts | 234 +++---
 .../builds/default/apis/exception.ts          |   6 +-
 .../typescript/builds/default/http/http.ts    |  37 +-
 .../typescript/builds/default/middleware.ts   |  30 +-
 .../typescript/builds/default/servers.ts      |  48 +-
 .../typescript/builds/default/tsconfig.json   |   5 +-
 .../builds/default/types/ObjectParamAPI.ts    |  55 +-
 .../builds/default/types/ObservableAPI.ts     | 693 +++++++++---------
 .../builds/default/types/PromiseAPI.ts        |  83 +--
 .../typescript/builds/default/util.ts         |  38 +-
 .../typescript/builds/deno/apis/PetApi.ts     | 260 ++++---
 .../typescript/builds/deno/apis/StoreApi.ts   | 114 ++-
 .../typescript/builds/deno/apis/UserApi.ts    | 234 +++---
 .../typescript/builds/deno/apis/exception.ts  |   6 +-
 .../typescript/builds/deno/http/http.ts       |  41 +-
 .../typescript/builds/deno/middleware.ts      |  30 +-
 .../typescript/builds/deno/servers.ts         |  48 +-
 .../builds/deno/types/ObjectParamAPI.ts       |  55 +-
 .../builds/deno/types/ObservableAPI.ts        | 693 +++++++++---------
 .../builds/deno/types/PromiseAPI.ts           |  83 +--
 .../petstore/typescript/builds/deno/util.ts   |  38 +-
 .../builds/inversify/apis/PetApi.ts           | 260 ++++---
 .../builds/inversify/apis/StoreApi.ts         | 114 ++-
 .../builds/inversify/apis/UserApi.ts          | 234 +++---
 .../builds/inversify/apis/exception.ts        |   6 +-
 .../typescript/builds/inversify/http/http.ts  |  37 +-
 .../typescript/builds/inversify/middleware.ts |  30 +-
 .../typescript/builds/inversify/servers.ts    |  48 +-
 .../typescript/builds/inversify/tsconfig.json |   5 +-
 .../builds/inversify/types/ObjectParamAPI.ts  |  55 +-
 .../builds/inversify/types/ObservableAPI.ts   | 693 +++++++++---------
 .../builds/inversify/types/PromiseAPI.ts      |  83 +--
 .../typescript/builds/inversify/util.ts       |  38 +-
 .../typescript/builds/jquery/apis/PetApi.ts   | 260 ++++---
 .../typescript/builds/jquery/apis/StoreApi.ts | 114 ++-
 .../typescript/builds/jquery/apis/UserApi.ts  | 234 +++---
 .../builds/jquery/apis/exception.ts           |   6 +-
 .../typescript/builds/jquery/http/http.ts     |  37 +-
 .../typescript/builds/jquery/http/jquery.ts   |  15 +-
 .../typescript/builds/jquery/middleware.ts    |  30 +-
 .../typescript/builds/jquery/servers.ts       |  48 +-
 .../typescript/builds/jquery/tsconfig.json    |   5 +-
 .../builds/jquery/types/ObjectParamAPI.ts     |  55 +-
 .../builds/jquery/types/ObservableAPI.ts      | 693 +++++++++---------
 .../builds/jquery/types/PromiseAPI.ts         |  83 +--
 .../petstore/typescript/builds/jquery/util.ts |  38 +-
 .../builds/object_params/apis/PetApi.ts       | 260 ++++---
 .../builds/object_params/apis/StoreApi.ts     | 114 ++-
 .../builds/object_params/apis/UserApi.ts      | 234 +++---
 .../builds/object_params/apis/exception.ts    |   6 +-
 .../builds/object_params/http/http.ts         |  37 +-
 .../builds/object_params/middleware.ts        |  30 +-
 .../builds/object_params/servers.ts           |  48 +-
 .../builds/object_params/tsconfig.json        |   5 +-
 .../object_params/types/ObjectParamAPI.ts     |  55 +-
 .../object_params/types/ObservableAPI.ts      | 693 +++++++++---------
 .../builds/object_params/types/PromiseAPI.ts  |  83 +--
 .../typescript/builds/object_params/util.ts   |  38 +-
 108 files changed, 4211 insertions(+), 4414 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
index 0fb0dde152c..15e2844041b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '{{npmName}}';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index 3fd6265e636..d0c29b93a75 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -51,8 +51,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache
index c5ae5f3530c..70a608f226b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache
@@ -1,4 +1,4 @@
-## {{npmName}}@{{npmVersion}}
+modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache {{npmName}}@{{npmVersion}}
 
 ### Building
 
@@ -52,7 +52,7 @@ export class AppModule {}
 import { DefaultApi } from '{{npmName}}';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
@@ -134,4 +134,4 @@ import { environment } from '../environments/environment';
   ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/servers.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/servers.mustache
index 497695af693..27eab229a4f 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/servers.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/servers.mustache
@@ -16,26 +16,26 @@ export class ServerConfiguration<T extends { [key: string]: string }> {
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
 
-	public getDescription(): string {
-		return this.description
-	}
+    public getDescription(): string {
+        return this.description
+    }
 
-	/**
-	 * Constructions the URL this server using the url with variables
-	 * replaced with their respective values
-	 */	
-	public getUrl(): string {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
+    /**
+     * Constructions the URL this server using the url with variables
+     * replaced with their respective values
+     */
+    public getUrl(): string {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
 }
 
 {{#servers}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
index 25a080f8ae9..95cb62e631f 100644
--- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
@@ -26,8 +26,8 @@ import { {{classname}} } from '..{{filename}}{{extensionForDeno}}';
 @injectable()
 {{/useInversify}}
 export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
-	
-	{{#operation}}
+
+    {{#operation}}
     /**
      {{#notes}}
      * {{&notes}}
@@ -40,44 +40,44 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
      {{/allParams}}
      */
     public async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		{{#allParams}}
-		
-		{{#required}}
+        let config = options || this.configuration;
+        {{#allParams}}
+
+        {{#required}}
         // verify required parameter '{{paramName}}' is not null or undefined
         if ({{paramName}} === null || {{paramName}} === undefined) {
             throw new RequiredError('Required parameter {{paramName}} was null or undefined when calling {{nickname}}.');
         }
 
-		{{/required}}
-		{{/allParams}}
-		
-		// Path Params
-    	const localVarPath = '{{{path}}}'{{#pathParams}}
+        {{/required}}
+        {{/allParams}}
+
+        // Path Params
+        const localVarPath = '{{{path}}}'{{#pathParams}}
             .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}};
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}});
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}});
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-		{{#queryParams}}
+        {{#queryParams}}
         if ({{paramName}} !== undefined) {
-        	requestContext.setQueryParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
+            requestContext.setQueryParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
         }
-		{{/queryParams}}
-	
-		// Header Params
-		{{#headerParams}}
-		requestContext.setHeaderParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
-		{{/headerParams}}
-	
-		// Form Params
-	    {{#hasFormParams}}
-		let localVarFormParams = new FormData();
-		{{/hasFormParams}}	
-
-		{{#formParams}}
+        {{/queryParams}}
+
+        // Header Params
+        {{#headerParams}}
+        requestContext.setHeaderParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
+        {{/headerParams}}
+
+        // Form Params
+        {{#hasFormParams}}
+        let localVarFormParams = new FormData();
+        {{/hasFormParams}}
+
+        {{#formParams}}
         {{#isArray}}
         if ({{paramName}}) {
         {{#isCollectionFormatMulti}}
@@ -86,14 +86,14 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
             })
         {{/isCollectionFormatMulti}}
         {{^isCollectionFormatMulti}}
-        // TODO: replace .append with .set
-                localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
+            // TODO: replace .append with .set
+            localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
         {{/isCollectionFormatMulti}}
         }
         {{/isArray}}
         {{^isArray}}
         if ({{paramName}} !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              {{^isFile}}
              localVarFormParams.append('{{baseName}}', {{paramName}} as any);
              {{/isFile}}
@@ -109,13 +109,13 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
              {{/isFile}}
         }
         {{/isArray}}
-		{{/formParams}}		
-	    {{#hasFormParams}}
-		requestContext.setBody(localVarFormParams);
-		{{/hasFormParams}}	
+        {{/formParams}}
+        {{#hasFormParams}}
+        requestContext.setBody(localVarFormParams);
+        {{/hasFormParams}}
 
-		// Body Params
-	    {{#bodyParam}}
+        // Body Params
+        {{#bodyParam}}
         const contentType = ObjectSerializer.getPreferredMediaType([{{#consumes}}
             "{{{mediaType}}}"{{^-last}},{{/-last}}
         {{/consumes}}]);
@@ -125,7 +125,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
             contentType
         );
         requestContext.setBody(serializedBody);
-	    {{/bodyParam}}
+        {{/bodyParam}}
 
         {{#hasAuthMethods}}
         let authMethod = null;
@@ -144,8 +144,6 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
     {{/operation}}
 }
 {{/operations}}
-
-
 {{#operations}}
 
 {{#useInversify}}
@@ -213,9 +211,9 @@ export class {{classname}}ResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
-	{{/operation}}
+
+    {{/operation}}
 }
 {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache b/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache
index b76dca5aa4b..fb8d314eb41 100644
--- a/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache b/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache
index ee3a45bddcd..578756d534d 100644
--- a/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache
@@ -8,13 +8,13 @@ import { Observable, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'./rx
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache
index efb155c7df7..725b8e9a64a 100644
--- a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache
@@ -63,9 +63,11 @@ export type HttpFile = {{{fileContentDataType}}} & { readonly name: string };
  */
 class URLParse {
     private url: URL;
+
     constructor(address: string, _parser: boolean) {
         this.url = new URL(address);
     }
+
     public set(_part: 'query', obj: {[key: string]: string | undefined}) {
         for (const key in obj) {
             const value = obj[key];
@@ -76,6 +78,7 @@ class URLParse {
             }
         }
     }
+
     public get query() {
         const obj: {[key: string]: string} = {};
         for (const [key, value] of this.url.searchParams.entries()) {
@@ -83,6 +86,7 @@ class URLParse {
         }
         return obj;
     }
+
     public toString() {
         return this.url.toString();
     }
@@ -109,24 +113,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -149,27 +153,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -187,7 +191,6 @@ export interface ResponseBody {
     binary(): Promise<{{{fileContentDataType}}}>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -299,4 +302,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache b/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache
index 3c67c5bd6f1..9d1427b977f 100644
--- a/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache
@@ -21,14 +21,13 @@ export class JQueryHttpLibrary implements HttpLibrary {
             data: body
         };
 
-		// If we want a blob, we have to set the xhrFields' responseType AND add a 
-		// custom converter to overwrite the default deserialization of JQuery...
+        // If we want a blob, we have to set the xhrFields' responseType AND add a
+        // custom converter to overwrite the default deserialization of JQuery...
         requestOptions["xhrFields"] = { responseType: 'blob' };
         requestOptions["converters"] = {} 
         requestOptions["converters"]["* blob"] = (result:any) => result;
         requestOptions["dataType"] = "blob";
 
-
         if (request.getHeaders()['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -41,7 +40,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
                 }
             }
         })(headerParams);
-        
+
         if (request.getHeaders()["Cookie"]) {
             throw new HttpException("Setting the \"Cookie\"-Header field is blocked by every major browser when using jquery.ajax requests. Please switch to another library like fetch to enable this option");
         }
@@ -49,9 +48,9 @@ export class JQueryHttpLibrary implements HttpLibrary {
         if (body && body.constructor.name == "FormData") {
             requestOptions.contentType = false;
         }
-        
+
         const sentRequest = $.ajax(requestOptions);
-        
+
         const resultPromise = new Promise<ResponseContext>((resolve, reject) => {
             sentRequest.done((data, _, jqXHR) => {
                 const result = new ResponseContext(
@@ -65,7 +64,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
                 const headers = this.getResponseHeaders(jqXHR)
                 const result = new ResponseContext(jqXHR.status, headers, jqXHR.responseText);
                 resolve(result);
-            })    
+            })
         })
         return from(resultPromise);
     }
@@ -79,7 +78,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
           var key = header.shift();
           if (key.length == 0) return
           // chrome60+ force lowercase, other browsers can be different
-          key = key.toLowerCase(); 
+          key = key.toLowerCase();
           responseHeaders[key] = header.join(": ");
         });
         return responseHeaders
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache
index 7d7d66936ff..d2a0a254255 100644
--- a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 {{#servers}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache
index 674e7a64d3a..886f26f68ac 100644
--- a/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache
@@ -30,11 +30,10 @@
     {{/useInversify}}
   },
   "exclude": [
-  	"dist",
+    "dist",
     "node_modules"
   ],
   "filesGlob": [
     "./**/*.ts",
   ]
-  
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache
index 9d8e23f8b2d..43886364d6c 100644
--- a/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache
@@ -30,13 +30,12 @@ export interface {{classname}}{{operationIdCamelCase}}Request {
 }
 
 {{/operation}}
-
 export class Object{{classname}} {
     private api: Observable{{classname}}
 
     public constructor(configuration: Configuration, requestFactory?: {{classname}}RequestFactory, responseProcessor?: {{classname}}ResponseProcessor) {
         this.api = new Observable{{classname}}(configuration, requestFactory, responseProcessor);
-	}
+    }
 
 {{#operation}}
     /**
@@ -51,13 +50,9 @@ export class Object{{classname}} {
     public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
         return this.api.{{nickname}}({{#allParams}}param.{{paramName}}, {{/allParams}} options){{^useRxJS}}.toPromise(){{/useRxJS}};
     }
-	
-{{/operation}}
 
+{{/operation}}
 }
-
 {{/operations}}
-
-
 {{/apis}}
-{{/apiInfo}}
\ No newline at end of file
+{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache
index d0cadf56fbd..b001eba36b4 100644
--- a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache
@@ -7,7 +7,6 @@ import {mergeMap, map} from  {{#useRxJS}}'rxjs/operators'{{/useRxJS}}{{^useRxJS}
 import { injectable, inject, optional } from "inversify";
 import { AbstractConfiguration } from "../services/configuration{{extensionForDeno}}";
 {{/useInversify}}
-
 {{#models}}
 {{#model}}
 import { {{{ classname }}} } from '../models/{{{ classFilename }}}{{extensionForDeno}}';
@@ -64,30 +63,26 @@ export class Observable{{classname}} {
      {{/allParams}}
      */
     public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
-    	const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
+        const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
 
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
 
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.{{nickname}}(rsp)));
-	    	}));
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.{{nickname}}(rsp)));
+            }));
     }
-	
+ 
 {{/operation}}
-
 }
-
 {{/operations}}
-
-
 {{/apis}}
-{{/apiInfo}}
\ No newline at end of file
+{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache
index 7e57347176b..4014dec1e06 100644
--- a/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache
@@ -15,7 +15,6 @@ import { {{{ classname }}} } from '../models/{{{ classFilename }}}{{extensionFor
 {{#apis}}
 import { Observable{{classname}} } from './ObservableAPI{{extensionForDeno}}';
 
-
 {{#operations}}
 import { {{classname}}RequestFactory, {{classname}}ResponseProcessor} from "../apis/{{classname}}{{extensionForDeno}}";
 {{#useInversify}}
@@ -54,10 +53,10 @@ export class Promise{{classname}} {
      {{/allParams}}
      */
     public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
-    	const result = this.api.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
+        const result = this.api.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
         return result.toPromise();
     }
-	
+
 {{/operation}}
 
 }
@@ -66,4 +65,4 @@ export class Promise{{classname}} {
 
 
 {{/apis}}
-{{/apiInfo}}
\ No newline at end of file
+{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/util.mustache b/modules/openapi-generator/src/main/resources/typescript/util.mustache
index d1888434535..07317f5828b 100644
--- a/modules/openapi-generator/src/main/resources/typescript/util.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/util.mustache
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
index f854b9ec116..aba929bd4ed 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/angular2-typescript-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
index 51764d1b115..c0d11ad67b1 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
index 94e4af489d6..bdfdd518ee9 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
index 151fb2f1a50..c7e2bfffb5d 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
@@ -120,7 +120,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-angular-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
index 89b721d0c5d..cb001046c5b 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
index e04306cadcb..ccb0370bdc4 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts
index c541d163bd4..da5d9059bad 100644
--- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
index 3673659f277..f7a51f623ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
@@ -62,8 +62,8 @@ export class BaseAPI {
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
-	    ? context.body
-	    : JSON.stringify(context.body);
+        ? context.body
+        : JSON.stringify(context.body);
 
         const headers = Object.assign({}, this.configuration.headers, context.headers);
         const init = {
diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/README.md
index 891ce865fd8..b87d85fb0d9 100644
--- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/README.md
@@ -1,4 +1,4 @@
-## @openapitools/typescript-nestjs-petstore@1.0.0
+modules/openapi-generator/src/main/resources/typescript-nestjs/README.mustache @openapitools/typescript-nestjs-petstore@1.0.0
 
 ### Building
 
@@ -52,7 +52,7 @@ export class AppModule {}
 import { DefaultApi } from '@openapitools/typescript-nestjs-petstore';
 
 export class AppComponent {
-	 constructor(private apiGateway: DefaultApi) { }
+    constructor(private apiGateway: DefaultApi) { }
 }
 ```
 
@@ -134,4 +134,4 @@ import { environment } from '../environments/environment';
   ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/servers.ts b/samples/client/petstore/typescript-rxjs/builds/default/servers.ts
index 6d9b253596e..cdf621ce87d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/servers.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/servers.ts
@@ -16,26 +16,26 @@ export class ServerConfiguration<T extends { [key: string]: string }> {
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
 
-	public getDescription(): string {
-		return this.description
-	}
+    public getDescription(): string {
+        return this.description
+    }
 
-	/**
-	 * Constructions the URL this server using the url with variables
-	 * replaced with their respective values
-	 */	
-	public getUrl(): string {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
+    /**
+     * Constructions the URL this server using the url with variables
+     * replaced with their respective values
+     */
+    public getUrl(): string {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
 }
 
 const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  }, "")
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/servers.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/servers.ts
index 6d9b253596e..cdf621ce87d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/servers.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/servers.ts
@@ -16,26 +16,26 @@ export class ServerConfiguration<T extends { [key: string]: string }> {
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
 
-	public getDescription(): string {
-		return this.description
-	}
+    public getDescription(): string {
+        return this.description
+    }
 
-	/**
-	 * Constructions the URL this server using the url with variables
-	 * replaced with their respective values
-	 */	
-	public getUrl(): string {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
+    /**
+     * Constructions the URL this server using the url with variables
+     * replaced with their respective values
+     */
+    public getUrl(): string {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
 }
 
 const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  }, "")
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/servers.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/servers.ts
index 6d9b253596e..cdf621ce87d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/servers.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/servers.ts
@@ -16,26 +16,26 @@ export class ServerConfiguration<T extends { [key: string]: string }> {
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
 
-	public getDescription(): string {
-		return this.description
-	}
+    public getDescription(): string {
+        return this.description
+    }
 
-	/**
-	 * Constructions the URL this server using the url with variables
-	 * replaced with their respective values
-	 */	
-	public getUrl(): string {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
+    /**
+     * Constructions the URL this server using the url with variables
+     * replaced with their respective values
+     */
+    public getUrl(): string {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
 }
 
 const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  }, "")
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/servers.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/servers.ts
index 6d9b253596e..cdf621ce87d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/servers.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/servers.ts
@@ -16,26 +16,26 @@ export class ServerConfiguration<T extends { [key: string]: string }> {
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
 
-	public getDescription(): string {
-		return this.description
-	}
+    public getDescription(): string {
+        return this.description
+    }
 
-	/**
-	 * Constructions the URL this server using the url with variables
-	 * replaced with their respective values
-	 */	
-	public getUrl(): string {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
+    /**
+     * Constructions the URL this server using the url with variables
+     * replaced with their respective values
+     */
+    public getUrl(): string {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
 }
 
 const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  }, "")
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts
index 7041341a708..12d711bd5b7 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts
@@ -14,35 +14,35 @@ import { Pet } from '../models/Pet';
  * no description
  */
 export class PetApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * Add a new pet to the store
      * @param pet Pet object that needs to be added to the store
      */
     public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -71,32 +71,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param apiKey 
      */
     public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
-	
-		// Form Params
 
+        // Header Params
+        requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -114,32 +114,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Status values that need to be considered for filter
      */
     public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'status' is not null or undefined
         if (status === null || status === undefined) {
             throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByStatus';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByStatus';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (status !== undefined) {
-        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+            requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -157,32 +157,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param tags Tags to filter by
      */
     public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'tags' is not null or undefined
         if (tags === null || tags === undefined) {
             throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByTags';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByTags';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (tags !== undefined) {
-        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+            requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -200,30 +200,30 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param petId ID of pet to return
      */
     public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -240,29 +240,29 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param pet Pet object that needs to be added to the store
      */
     public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -292,42 +292,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Updated status of the pet
      */
     public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (name !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('name', name as any);
         }
         if (status !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('status', status as any);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -346,42 +346,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param file file to upload
      */
     public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}/uploadImage'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (additionalMetadata !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('additionalMetadata', additionalMetadata as any);
         }
         if (file !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('file', file.data, file.name);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -395,8 +395,6 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class PetApiResponseProcessor {
 
     /**
@@ -429,9 +427,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -451,9 +449,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -484,9 +482,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -517,9 +515,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -553,9 +551,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -592,9 +590,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -614,9 +612,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -644,7 +642,7 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
index 09400e99c08..12be0132697 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
@@ -13,37 +13,37 @@ import { Order } from '../models/Order';
  * no description
  */
 export class StoreApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         // Apply auth methods
 
@@ -55,23 +55,23 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * Returns pet inventories by status
      */
     public async getInventory(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/store/inventory';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/store/inventory';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -89,30 +89,30 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param orderId ID of pet that needs to be fetched
      */
     public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -124,29 +124,29 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param order order placed for purchasing the pet
      */
     public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'order' is not null or undefined
         if (order === null || order === undefined) {
             throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/store/order';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -164,8 +164,6 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class StoreApiResponseProcessor {
 
     /**
@@ -190,9 +188,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -220,9 +218,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -256,9 +254,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -289,7 +287,7 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts
index 1d43ec7a72b..0717cb75304 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts
@@ -13,36 +13,36 @@ import { User } from '../models/User';
  * no description
  */
 export class UserApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * This can only be done by the logged in user.
      * Create user
      * @param user Created user object
      */
     public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -68,29 +68,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithArray';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithArray';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -116,29 +116,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithList';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithList';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -165,30 +165,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be deleted
      */
     public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -205,30 +205,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -241,41 +241,41 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param password The password for login in clear text
      */
     public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
         }
 
-		
+
         // verify required parameter 'password' is not null or undefined
         if (password === null || password === undefined) {
             throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/login';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/user/login';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (username !== undefined) {
-        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+            requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
         }
         if (password !== undefined) {
-        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+            requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -286,23 +286,23 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * Logs out current logged in user session
      */
     public async logoutUser(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/user/logout';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/user/logout';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -321,36 +321,36 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user Updated user object
      */
     public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
         }
 
-		
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -373,8 +373,6 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class UserApiResponseProcessor {
 
     /**
@@ -396,9 +394,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -418,9 +416,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -440,9 +438,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -465,9 +463,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -501,9 +499,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -534,9 +532,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -556,9 +554,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -581,7 +579,7 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts
index b76dca5aa4b..fb8d314eb41 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts
index ec8437b19ca..034ff003a56 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts
@@ -50,24 +50,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -90,27 +90,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -128,7 +128,6 @@ export interface ResponseBody {
     binary(): Promise<Buffer>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -203,4 +202,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts
index 46da5d25ef0..e9007138189 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts
@@ -8,13 +8,13 @@ import { Observable, from } from './rxjsStub';
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts
index aa5332db7ae..ce34c8714c0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json
index a542d795677..091137b0e37 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json
+++ b/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json
@@ -20,11 +20,10 @@
     "lib": [ "es6" ],
   },
   "exclude": [
-  	"dist",
+    "dist",
     "node_modules"
   ],
   "filesGlob": [
     "./**/*.ts",
   ]
-  
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
index bcc9c5afa0a..829c9d0363a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
@@ -114,13 +114,12 @@ export interface PetApiUploadFileRequest {
     file?: HttpFile
 }
 
-
 export class ObjectPetApi {
     private api: ObservablePetApi
 
     public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
         this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * Add a new pet to the store
@@ -129,7 +128,7 @@ export class ObjectPetApi {
     public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
         return this.api.addPet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param param the request object
@@ -137,7 +136,7 @@ export class ObjectPetApi {
     public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
         return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
@@ -146,7 +145,7 @@ export class ObjectPetApi {
     public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByStatus(param.status,  options).toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
@@ -155,7 +154,7 @@ export class ObjectPetApi {
     public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByTags(param.tags,  options).toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
@@ -164,7 +163,7 @@ export class ObjectPetApi {
     public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
         return this.api.getPetById(param.petId,  options).toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param param the request object
@@ -172,7 +171,7 @@ export class ObjectPetApi {
     public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
         return this.api.updatePet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param param the request object
@@ -180,7 +179,7 @@ export class ObjectPetApi {
     public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
         return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param param the request object
@@ -188,13 +187,9 @@ export class ObjectPetApi {
     public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
         return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableStoreApi } from "./ObservableAPI";
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 
@@ -228,13 +223,12 @@ export interface StoreApiPlaceOrderRequest {
     order: Order
 }
 
-
 export class ObjectStoreApi {
     private api: ObservableStoreApi
 
     public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
         this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -244,7 +238,7 @@ export class ObjectStoreApi {
     public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
         return this.api.deleteOrder(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
@@ -253,7 +247,7 @@ export class ObjectStoreApi {
     public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
         return this.api.getInventory( options).toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
@@ -262,7 +256,7 @@ export class ObjectStoreApi {
     public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
         return this.api.getOrderById(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param param the request object
@@ -270,13 +264,9 @@ export class ObjectStoreApi {
     public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
         return this.api.placeOrder(param.order,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableUserApi } from "./ObservableAPI";
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 
@@ -358,13 +348,12 @@ export interface UserApiUpdateUserRequest {
     user: User
 }
 
-
 export class ObjectUserApi {
     private api: ObservableUserApi
 
     public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
         this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * This can only be done by the logged in user.
@@ -374,7 +363,7 @@ export class ObjectUserApi {
     public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
         return this.api.createUser(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -382,7 +371,7 @@ export class ObjectUserApi {
     public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -390,7 +379,7 @@ export class ObjectUserApi {
     public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithListInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
@@ -399,7 +388,7 @@ export class ObjectUserApi {
     public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
         return this.api.deleteUser(param.username,  options).toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param param the request object
@@ -407,7 +396,7 @@ export class ObjectUserApi {
     public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
         return this.api.getUserByName(param.username,  options).toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param param the request object
@@ -415,7 +404,7 @@ export class ObjectUserApi {
     public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
         return this.api.loginUser(param.username, param.password,  options).toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      * @param param the request object
@@ -423,7 +412,7 @@ export class ObjectUserApi {
     public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
         return this.api.logoutUser( options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -432,9 +421,5 @@ export class ObjectUserApi {
     public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
         return this.api.updateUser(param.username, param.user,  options).toPromise();
     }
-	
 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
index 6154d267ed3..459fbc8e226 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
@@ -3,7 +3,6 @@ import * as models from '../models/all';
 import { Configuration} from '../configuration'
 import { Observable, of, from } from '../rxjsStub';
 import {mergeMap, map} from  '../rxjsStub';
-
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
 import { Order } from '../models/Order';
@@ -32,143 +31,143 @@ export class ObservablePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.addPet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -176,24 +175,24 @@ export class ObservablePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+            }));
     }
-	
+ 
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -201,30 +200,26 @@ export class ObservablePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
-    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class ObservableStoreApi {
     private requestFactory: StoreApiRequestFactory;
@@ -247,100 +242,96 @@ export class ObservableStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
-    	const requestContextPromise = this.requestFactory.getInventory(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getInventory(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+            }));
     }
-	
+ 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class ObservableUserApi {
     private requestFactory: UserApiRequestFactory;
@@ -363,163 +354,163 @@ export class ObservableUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUser(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUser(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Observable<User> {
-    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
-    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.logoutUser(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.logoutUser(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -527,26 +518,22 @@ export class ObservableUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+            }));
     }
-	
-
+ 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
index 533095a405d..2129b103e7e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
@@ -10,7 +10,6 @@ import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 import { ObservablePetApi } from './ObservableAPI';
 
-
 import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
 export class PromisePetApi {
     private api: ObservablePetApi
@@ -28,59 +27,59 @@ export class PromisePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.addPet(pet, options);
+        const result = this.api.addPet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deletePet(petId, apiKey, options);
+        const result = this.api.deletePet(petId, apiKey, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByStatus(status, options);
+        const result = this.api.findPetsByStatus(status, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByTags(tags, options);
+        const result = this.api.findPetsByTags(tags, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Promise<Pet> {
-    	const result = this.api.getPetById(petId, options);
+        const result = this.api.getPetById(petId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.updatePet(pet, options);
+        const result = this.api.updatePet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -88,10 +87,10 @@ export class PromisePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        const result = this.api.updatePetWithForm(petId, name, status, options);
         return result.toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -99,10 +98,10 @@ export class PromisePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
-    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        const result = this.api.uploadFile(petId, additionalMetadata, file, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -110,7 +109,6 @@ export class PromisePetApi {
 
 import { ObservableStoreApi } from './ObservableAPI';
 
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class PromiseStoreApi {
     private api: ObservableStoreApi
@@ -129,38 +127,38 @@ export class PromiseStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteOrder(orderId, options);
+        const result = this.api.deleteOrder(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
-    	const result = this.api.getInventory(options);
+        const result = this.api.getInventory(options);
         return result.toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
-    	const result = this.api.getOrderById(orderId, options);
+        const result = this.api.getOrderById(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Promise<Order> {
-    	const result = this.api.placeOrder(order, options);
+        const result = this.api.placeOrder(order, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -168,7 +166,6 @@ export class PromiseStoreApi {
 
 import { ObservableUserApi } from './ObservableAPI';
 
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class PromiseUserApi {
     private api: ObservableUserApi
@@ -187,65 +184,65 @@ export class PromiseUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.createUser(user, options);
+        const result = this.api.createUser(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithArrayInput(user, options);
+        const result = this.api.createUsersWithArrayInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithListInput(user, options);
+        const result = this.api.createUsersWithListInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteUser(username, options);
+        const result = this.api.deleteUser(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Promise<User> {
-    	const result = this.api.getUserByName(username, options);
+        const result = this.api.getUserByName(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
-    	const result = this.api.loginUser(username, password, options);
+        const result = this.api.loginUser(username, password, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Promise<void> {
-    	const result = this.api.logoutUser(options);
+        const result = this.api.logoutUser(options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -253,10 +250,10 @@ export class PromiseUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.updateUser(username, user, options);
+        const result = this.api.updateUser(username, user, options);
         return result.toPromise();
     }
-	
+
 
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/util.ts b/samples/openapi3/client/petstore/typescript/builds/default/util.ts
index d1888434535..07317f5828b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/util.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/util.ts
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts
index c12dd49f6c0..552716b7cb3 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts
@@ -13,35 +13,35 @@ import { Pet } from '../models/Pet.ts';
  * no description
  */
 export class PetApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * Add a new pet to the store
      * @param pet Pet object that needs to be added to the store
      */
     public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -70,32 +70,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param apiKey 
      */
     public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
-	
-		// Form Params
 
+        // Header Params
+        requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -113,32 +113,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Status values that need to be considered for filter
      */
     public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'status' is not null or undefined
         if (status === null || status === undefined) {
             throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByStatus';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByStatus';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (status !== undefined) {
-        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+            requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -156,32 +156,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param tags Tags to filter by
      */
     public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'tags' is not null or undefined
         if (tags === null || tags === undefined) {
             throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByTags';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByTags';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (tags !== undefined) {
-        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+            requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -199,30 +199,30 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param petId ID of pet to return
      */
     public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -239,29 +239,29 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param pet Pet object that needs to be added to the store
      */
     public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -291,42 +291,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Updated status of the pet
      */
     public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (name !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('name', name as any);
         }
         if (status !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('status', status as any);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -345,42 +345,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param file file to upload
      */
     public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}/uploadImage'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (additionalMetadata !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('additionalMetadata', additionalMetadata as any);
         }
         if (file !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('file', file, file.name);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -394,8 +394,6 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class PetApiResponseProcessor {
 
     /**
@@ -428,9 +426,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -450,9 +448,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -483,9 +481,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -516,9 +514,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -552,9 +550,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -591,9 +589,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -613,9 +611,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -643,7 +641,7 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
index 7580325378f..f677c988a10 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
@@ -12,37 +12,37 @@ import { Order } from '../models/Order.ts';
  * no description
  */
 export class StoreApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         // Apply auth methods
 
@@ -54,23 +54,23 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * Returns pet inventories by status
      */
     public async getInventory(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/store/inventory';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/store/inventory';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -88,30 +88,30 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param orderId ID of pet that needs to be fetched
      */
     public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -123,29 +123,29 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param order order placed for purchasing the pet
      */
     public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'order' is not null or undefined
         if (order === null || order === undefined) {
             throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/store/order';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -163,8 +163,6 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class StoreApiResponseProcessor {
 
     /**
@@ -189,9 +187,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -219,9 +217,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -255,9 +253,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -288,7 +286,7 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts
index 5744990ab8a..3757165b71a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts
@@ -12,36 +12,36 @@ import { User } from '../models/User.ts';
  * no description
  */
 export class UserApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * This can only be done by the logged in user.
      * Create user
      * @param user Created user object
      */
     public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -67,29 +67,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithArray';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithArray';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -115,29 +115,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithList';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithList';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -164,30 +164,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be deleted
      */
     public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -204,30 +204,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -240,41 +240,41 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param password The password for login in clear text
      */
     public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
         }
 
-		
+
         // verify required parameter 'password' is not null or undefined
         if (password === null || password === undefined) {
             throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/login';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/user/login';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (username !== undefined) {
-        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+            requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
         }
         if (password !== undefined) {
-        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+            requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -285,23 +285,23 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * Logs out current logged in user session
      */
     public async logoutUser(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/user/logout';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/user/logout';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -320,36 +320,36 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user Updated user object
      */
     public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
         }
 
-		
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -372,8 +372,6 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class UserApiResponseProcessor {
 
     /**
@@ -395,9 +393,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -417,9 +415,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -439,9 +437,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -464,9 +462,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -500,9 +498,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -533,9 +531,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -555,9 +553,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -580,7 +578,7 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts
index b76dca5aa4b..fb8d314eb41 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts
index 8afe112b13b..f92a6086240 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts
@@ -26,9 +26,11 @@ export type HttpFile = Blob & { readonly name: string };
  */
 class URLParse {
     private url: URL;
+
     constructor(address: string, _parser: boolean) {
         this.url = new URL(address);
     }
+
     public set(_part: 'query', obj: {[key: string]: string | undefined}) {
         for (const key in obj) {
             const value = obj[key];
@@ -39,6 +41,7 @@ class URLParse {
             }
         }
     }
+
     public get query() {
         const obj: {[key: string]: string} = {};
         for (const [key, value] of this.url.searchParams.entries()) {
@@ -46,6 +49,7 @@ class URLParse {
         }
         return obj;
     }
+
     public toString() {
         return this.url.toString();
     }
@@ -70,24 +74,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -110,27 +114,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -148,7 +152,6 @@ export interface ResponseBody {
     binary(): Promise<Blob>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -232,4 +235,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts
index 8b55bf362b4..8faae449f17 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts
@@ -8,13 +8,13 @@ import { Observable, from } from './rxjsStub.ts';
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts
index a5beeda1dec..6e5f2cc8cfd 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
index 6c05a844b2c..ebcd714f27c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
@@ -114,13 +114,12 @@ export interface PetApiUploadFileRequest {
     file?: HttpFile
 }
 
-
 export class ObjectPetApi {
     private api: ObservablePetApi
 
     public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
         this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * Add a new pet to the store
@@ -129,7 +128,7 @@ export class ObjectPetApi {
     public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
         return this.api.addPet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param param the request object
@@ -137,7 +136,7 @@ export class ObjectPetApi {
     public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
         return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
@@ -146,7 +145,7 @@ export class ObjectPetApi {
     public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByStatus(param.status,  options).toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
@@ -155,7 +154,7 @@ export class ObjectPetApi {
     public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByTags(param.tags,  options).toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
@@ -164,7 +163,7 @@ export class ObjectPetApi {
     public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
         return this.api.getPetById(param.petId,  options).toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param param the request object
@@ -172,7 +171,7 @@ export class ObjectPetApi {
     public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
         return this.api.updatePet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param param the request object
@@ -180,7 +179,7 @@ export class ObjectPetApi {
     public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
         return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param param the request object
@@ -188,13 +187,9 @@ export class ObjectPetApi {
     public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
         return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableStoreApi } from "./ObservableAPI.ts";
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
 
@@ -228,13 +223,12 @@ export interface StoreApiPlaceOrderRequest {
     order: Order
 }
 
-
 export class ObjectStoreApi {
     private api: ObservableStoreApi
 
     public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
         this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -244,7 +238,7 @@ export class ObjectStoreApi {
     public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
         return this.api.deleteOrder(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
@@ -253,7 +247,7 @@ export class ObjectStoreApi {
     public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
         return this.api.getInventory( options).toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
@@ -262,7 +256,7 @@ export class ObjectStoreApi {
     public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
         return this.api.getOrderById(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param param the request object
@@ -270,13 +264,9 @@ export class ObjectStoreApi {
     public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
         return this.api.placeOrder(param.order,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableUserApi } from "./ObservableAPI.ts";
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
 
@@ -358,13 +348,12 @@ export interface UserApiUpdateUserRequest {
     user: User
 }
 
-
 export class ObjectUserApi {
     private api: ObservableUserApi
 
     public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
         this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * This can only be done by the logged in user.
@@ -374,7 +363,7 @@ export class ObjectUserApi {
     public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
         return this.api.createUser(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -382,7 +371,7 @@ export class ObjectUserApi {
     public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -390,7 +379,7 @@ export class ObjectUserApi {
     public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithListInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
@@ -399,7 +388,7 @@ export class ObjectUserApi {
     public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
         return this.api.deleteUser(param.username,  options).toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param param the request object
@@ -407,7 +396,7 @@ export class ObjectUserApi {
     public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
         return this.api.getUserByName(param.username,  options).toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param param the request object
@@ -415,7 +404,7 @@ export class ObjectUserApi {
     public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
         return this.api.loginUser(param.username, param.password,  options).toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      * @param param the request object
@@ -423,7 +412,7 @@ export class ObjectUserApi {
     public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
         return this.api.logoutUser( options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -432,9 +421,5 @@ export class ObjectUserApi {
     public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
         return this.api.updateUser(param.username, param.user,  options).toPromise();
     }
-	
 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
index 0b4531f7584..318c8a3e1bf 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
@@ -3,7 +3,6 @@ import * as models from '../models/all.ts';
 import { Configuration} from '../configuration.ts'
 import { Observable, of, from } from '../rxjsStub.ts';
 import {mergeMap, map} from  '../rxjsStub.ts';
-
 import { ApiResponse } from '../models/ApiResponse.ts';
 import { Category } from '../models/Category.ts';
 import { Order } from '../models/Order.ts';
@@ -32,143 +31,143 @@ export class ObservablePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.addPet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -176,24 +175,24 @@ export class ObservablePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+            }));
     }
-	
+ 
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -201,30 +200,26 @@ export class ObservablePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
-    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
 export class ObservableStoreApi {
     private requestFactory: StoreApiRequestFactory;
@@ -247,100 +242,96 @@ export class ObservableStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
-    	const requestContextPromise = this.requestFactory.getInventory(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getInventory(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+            }));
     }
-	
+ 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
 export class ObservableUserApi {
     private requestFactory: UserApiRequestFactory;
@@ -363,163 +354,163 @@ export class ObservableUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUser(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUser(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Observable<User> {
-    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
-    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.logoutUser(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.logoutUser(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -527,26 +518,22 @@ export class ObservableUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+            }));
     }
-	
-
+ 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
index 4c44a104094..5e2f7df9735 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
@@ -10,7 +10,6 @@ import { Tag } from '../models/Tag.ts';
 import { User } from '../models/User.ts';
 import { ObservablePetApi } from './ObservableAPI.ts';
 
-
 import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi.ts";
 export class PromisePetApi {
     private api: ObservablePetApi
@@ -28,59 +27,59 @@ export class PromisePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.addPet(pet, options);
+        const result = this.api.addPet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deletePet(petId, apiKey, options);
+        const result = this.api.deletePet(petId, apiKey, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByStatus(status, options);
+        const result = this.api.findPetsByStatus(status, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByTags(tags, options);
+        const result = this.api.findPetsByTags(tags, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Promise<Pet> {
-    	const result = this.api.getPetById(petId, options);
+        const result = this.api.getPetById(petId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.updatePet(pet, options);
+        const result = this.api.updatePet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -88,10 +87,10 @@ export class PromisePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        const result = this.api.updatePetWithForm(petId, name, status, options);
         return result.toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -99,10 +98,10 @@ export class PromisePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
-    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        const result = this.api.uploadFile(petId, additionalMetadata, file, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -110,7 +109,6 @@ export class PromisePetApi {
 
 import { ObservableStoreApi } from './ObservableAPI.ts';
 
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
 export class PromiseStoreApi {
     private api: ObservableStoreApi
@@ -129,38 +127,38 @@ export class PromiseStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteOrder(orderId, options);
+        const result = this.api.deleteOrder(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
-    	const result = this.api.getInventory(options);
+        const result = this.api.getInventory(options);
         return result.toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
-    	const result = this.api.getOrderById(orderId, options);
+        const result = this.api.getOrderById(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Promise<Order> {
-    	const result = this.api.placeOrder(order, options);
+        const result = this.api.placeOrder(order, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -168,7 +166,6 @@ export class PromiseStoreApi {
 
 import { ObservableUserApi } from './ObservableAPI.ts';
 
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
 export class PromiseUserApi {
     private api: ObservableUserApi
@@ -187,65 +184,65 @@ export class PromiseUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.createUser(user, options);
+        const result = this.api.createUser(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithArrayInput(user, options);
+        const result = this.api.createUsersWithArrayInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithListInput(user, options);
+        const result = this.api.createUsersWithListInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteUser(username, options);
+        const result = this.api.deleteUser(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Promise<User> {
-    	const result = this.api.getUserByName(username, options);
+        const result = this.api.getUserByName(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
-    	const result = this.api.loginUser(username, password, options);
+        const result = this.api.loginUser(username, password, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Promise<void> {
-    	const result = this.api.logoutUser(options);
+        const result = this.api.logoutUser(options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -253,10 +250,10 @@ export class PromiseUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.updateUser(username, user, options);
+        const result = this.api.updateUser(username, user, options);
         return result.toPromise();
     }
-	
+
 
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/util.ts b/samples/openapi3/client/petstore/typescript/builds/deno/util.ts
index d1888434535..07317f5828b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/util.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/util.ts
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts
index c97b44cf089..2225d19dbb9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts
@@ -16,35 +16,35 @@ import { Pet } from '../models/Pet';
  */
 @injectable()
 export class PetApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * Add a new pet to the store
      * @param pet Pet object that needs to be added to the store
      */
     public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -73,32 +73,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param apiKey 
      */
     public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
-	
-		// Form Params
 
+        // Header Params
+        requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -116,32 +116,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Status values that need to be considered for filter
      */
     public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'status' is not null or undefined
         if (status === null || status === undefined) {
             throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByStatus';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByStatus';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (status !== undefined) {
-        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+            requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -159,32 +159,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param tags Tags to filter by
      */
     public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'tags' is not null or undefined
         if (tags === null || tags === undefined) {
             throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByTags';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByTags';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (tags !== undefined) {
-        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+            requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -202,30 +202,30 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param petId ID of pet to return
      */
     public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -242,29 +242,29 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param pet Pet object that needs to be added to the store
      */
     public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -294,42 +294,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Updated status of the pet
      */
     public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (name !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('name', name as any);
         }
         if (status !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('status', status as any);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -348,42 +348,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param file file to upload
      */
     public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}/uploadImage'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (additionalMetadata !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('additionalMetadata', additionalMetadata as any);
         }
         if (file !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('file', file.data, file.name);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -397,8 +397,6 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 @injectable()
 export class PetApiResponseProcessor {
 
@@ -432,9 +430,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -454,9 +452,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -487,9 +485,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -520,9 +518,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -556,9 +554,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -595,9 +593,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -617,9 +615,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -647,7 +645,7 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
index ceef209c37d..836e9ba0261 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
@@ -15,37 +15,37 @@ import { Order } from '../models/Order';
  */
 @injectable()
 export class StoreApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         // Apply auth methods
 
@@ -57,23 +57,23 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * Returns pet inventories by status
      */
     public async getInventory(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/store/inventory';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/store/inventory';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -91,30 +91,30 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param orderId ID of pet that needs to be fetched
      */
     public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -126,29 +126,29 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param order order placed for purchasing the pet
      */
     public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'order' is not null or undefined
         if (order === null || order === undefined) {
             throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/store/order';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -166,8 +166,6 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 @injectable()
 export class StoreApiResponseProcessor {
 
@@ -193,9 +191,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -223,9 +221,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -259,9 +257,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -292,7 +290,7 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts
index 353bae433c5..5c68288c381 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts
@@ -15,36 +15,36 @@ import { User } from '../models/User';
  */
 @injectable()
 export class UserApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * This can only be done by the logged in user.
      * Create user
      * @param user Created user object
      */
     public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -70,29 +70,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithArray';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithArray';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -118,29 +118,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithList';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithList';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -167,30 +167,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be deleted
      */
     public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -207,30 +207,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -243,41 +243,41 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param password The password for login in clear text
      */
     public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
         }
 
-		
+
         // verify required parameter 'password' is not null or undefined
         if (password === null || password === undefined) {
             throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/login';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/user/login';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (username !== undefined) {
-        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+            requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
         }
         if (password !== undefined) {
-        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+            requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -288,23 +288,23 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * Logs out current logged in user session
      */
     public async logoutUser(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/user/logout';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/user/logout';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -323,36 +323,36 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user Updated user object
      */
     public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
         }
 
-		
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -375,8 +375,6 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 @injectable()
 export class UserApiResponseProcessor {
 
@@ -399,9 +397,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -421,9 +419,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -443,9 +441,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -468,9 +466,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -504,9 +502,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -537,9 +535,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -559,9 +557,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -584,7 +582,7 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts
index b76dca5aa4b..fb8d314eb41 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts
index ec8437b19ca..034ff003a56 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts
@@ -50,24 +50,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -90,27 +90,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -128,7 +128,6 @@ export interface ResponseBody {
     binary(): Promise<Buffer>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -203,4 +202,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts
index 46da5d25ef0..e9007138189 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts
@@ -8,13 +8,13 @@ import { Observable, from } from './rxjsStub';
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts
index aa5332db7ae..ce34c8714c0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json
index b53dce7b41b..7a131bcd53d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json
@@ -21,11 +21,10 @@
     "experimentalDecorators": true,
   },
   "exclude": [
-  	"dist",
+    "dist",
     "node_modules"
   ],
   "filesGlob": [
     "./**/*.ts",
   ]
-  
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
index bcc9c5afa0a..829c9d0363a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
@@ -114,13 +114,12 @@ export interface PetApiUploadFileRequest {
     file?: HttpFile
 }
 
-
 export class ObjectPetApi {
     private api: ObservablePetApi
 
     public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
         this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * Add a new pet to the store
@@ -129,7 +128,7 @@ export class ObjectPetApi {
     public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
         return this.api.addPet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param param the request object
@@ -137,7 +136,7 @@ export class ObjectPetApi {
     public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
         return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
@@ -146,7 +145,7 @@ export class ObjectPetApi {
     public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByStatus(param.status,  options).toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
@@ -155,7 +154,7 @@ export class ObjectPetApi {
     public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByTags(param.tags,  options).toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
@@ -164,7 +163,7 @@ export class ObjectPetApi {
     public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
         return this.api.getPetById(param.petId,  options).toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param param the request object
@@ -172,7 +171,7 @@ export class ObjectPetApi {
     public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
         return this.api.updatePet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param param the request object
@@ -180,7 +179,7 @@ export class ObjectPetApi {
     public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
         return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param param the request object
@@ -188,13 +187,9 @@ export class ObjectPetApi {
     public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
         return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableStoreApi } from "./ObservableAPI";
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 
@@ -228,13 +223,12 @@ export interface StoreApiPlaceOrderRequest {
     order: Order
 }
 
-
 export class ObjectStoreApi {
     private api: ObservableStoreApi
 
     public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
         this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -244,7 +238,7 @@ export class ObjectStoreApi {
     public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
         return this.api.deleteOrder(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
@@ -253,7 +247,7 @@ export class ObjectStoreApi {
     public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
         return this.api.getInventory( options).toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
@@ -262,7 +256,7 @@ export class ObjectStoreApi {
     public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
         return this.api.getOrderById(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param param the request object
@@ -270,13 +264,9 @@ export class ObjectStoreApi {
     public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
         return this.api.placeOrder(param.order,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableUserApi } from "./ObservableAPI";
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 
@@ -358,13 +348,12 @@ export interface UserApiUpdateUserRequest {
     user: User
 }
 
-
 export class ObjectUserApi {
     private api: ObservableUserApi
 
     public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
         this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * This can only be done by the logged in user.
@@ -374,7 +363,7 @@ export class ObjectUserApi {
     public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
         return this.api.createUser(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -382,7 +371,7 @@ export class ObjectUserApi {
     public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -390,7 +379,7 @@ export class ObjectUserApi {
     public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithListInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
@@ -399,7 +388,7 @@ export class ObjectUserApi {
     public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
         return this.api.deleteUser(param.username,  options).toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param param the request object
@@ -407,7 +396,7 @@ export class ObjectUserApi {
     public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
         return this.api.getUserByName(param.username,  options).toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param param the request object
@@ -415,7 +404,7 @@ export class ObjectUserApi {
     public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
         return this.api.loginUser(param.username, param.password,  options).toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      * @param param the request object
@@ -423,7 +412,7 @@ export class ObjectUserApi {
     public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
         return this.api.logoutUser( options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -432,9 +421,5 @@ export class ObjectUserApi {
     public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
         return this.api.updateUser(param.username, param.user,  options).toPromise();
     }
-	
 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
index 31ced8bbdca..555e2ce7273 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
@@ -5,7 +5,6 @@ import { Observable, of, from } from '../rxjsStub';
 import {mergeMap, map} from  '../rxjsStub';
 import { injectable, inject, optional } from "inversify";
 import { AbstractConfiguration } from "../services/configuration";
-
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
 import { Order } from '../models/Order';
@@ -37,143 +36,143 @@ export class ObservablePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.addPet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -181,24 +180,24 @@ export class ObservablePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+            }));
     }
-	
+ 
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -206,30 +205,26 @@ export class ObservablePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
-    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 import { AbstractStoreApiRequestFactory, AbstractStoreApiResponseProcessor } from "../apis/StoreApi.service";
 
@@ -255,100 +250,96 @@ export class ObservableStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
-    	const requestContextPromise = this.requestFactory.getInventory(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getInventory(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+            }));
     }
-	
+ 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 import { AbstractUserApiRequestFactory, AbstractUserApiResponseProcessor } from "../apis/UserApi.service";
 
@@ -374,163 +365,163 @@ export class ObservableUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUser(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUser(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Observable<User> {
-    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
-    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.logoutUser(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.logoutUser(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -538,26 +529,22 @@ export class ObservableUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+            }));
     }
-	
-
+ 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
index 6077fdac2d5..f58fad865e1 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
@@ -12,7 +12,6 @@ import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 import { ObservablePetApi } from './ObservableAPI';
 
-
 import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
 import { AbstractPetApiRequestFactory, AbstractPetApiResponseProcessor } from "../apis/PetApi.service";
 
@@ -33,59 +32,59 @@ export class PromisePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.addPet(pet, options);
+        const result = this.api.addPet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deletePet(petId, apiKey, options);
+        const result = this.api.deletePet(petId, apiKey, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByStatus(status, options);
+        const result = this.api.findPetsByStatus(status, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByTags(tags, options);
+        const result = this.api.findPetsByTags(tags, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Promise<Pet> {
-    	const result = this.api.getPetById(petId, options);
+        const result = this.api.getPetById(petId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.updatePet(pet, options);
+        const result = this.api.updatePet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -93,10 +92,10 @@ export class PromisePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        const result = this.api.updatePetWithForm(petId, name, status, options);
         return result.toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -104,10 +103,10 @@ export class PromisePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
-    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        const result = this.api.uploadFile(petId, additionalMetadata, file, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -115,7 +114,6 @@ export class PromisePetApi {
 
 import { ObservableStoreApi } from './ObservableAPI';
 
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 import { AbstractStoreApiRequestFactory, AbstractStoreApiResponseProcessor } from "../apis/StoreApi.service";
 
@@ -137,38 +135,38 @@ export class PromiseStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteOrder(orderId, options);
+        const result = this.api.deleteOrder(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
-    	const result = this.api.getInventory(options);
+        const result = this.api.getInventory(options);
         return result.toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
-    	const result = this.api.getOrderById(orderId, options);
+        const result = this.api.getOrderById(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Promise<Order> {
-    	const result = this.api.placeOrder(order, options);
+        const result = this.api.placeOrder(order, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -176,7 +174,6 @@ export class PromiseStoreApi {
 
 import { ObservableUserApi } from './ObservableAPI';
 
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 import { AbstractUserApiRequestFactory, AbstractUserApiResponseProcessor } from "../apis/UserApi.service";
 
@@ -198,65 +195,65 @@ export class PromiseUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.createUser(user, options);
+        const result = this.api.createUser(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithArrayInput(user, options);
+        const result = this.api.createUsersWithArrayInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithListInput(user, options);
+        const result = this.api.createUsersWithListInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteUser(username, options);
+        const result = this.api.deleteUser(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Promise<User> {
-    	const result = this.api.getUserByName(username, options);
+        const result = this.api.getUserByName(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
-    	const result = this.api.loginUser(username, password, options);
+        const result = this.api.loginUser(username, password, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Promise<void> {
-    	const result = this.api.logoutUser(options);
+        const result = this.api.logoutUser(options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -264,10 +261,10 @@ export class PromiseUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.updateUser(username, user, options);
+        const result = this.api.updateUser(username, user, options);
         return result.toPromise();
     }
-	
+
 
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts
index d1888434535..07317f5828b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts
index 3eeb7bd4038..0e0db9ad8ee 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts
@@ -13,35 +13,35 @@ import { Pet } from '../models/Pet';
  * no description
  */
 export class PetApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * Add a new pet to the store
      * @param pet Pet object that needs to be added to the store
      */
     public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -70,32 +70,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param apiKey 
      */
     public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
-	
-		// Form Params
 
+        // Header Params
+        requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -113,32 +113,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Status values that need to be considered for filter
      */
     public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'status' is not null or undefined
         if (status === null || status === undefined) {
             throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByStatus';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByStatus';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (status !== undefined) {
-        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+            requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -156,32 +156,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param tags Tags to filter by
      */
     public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'tags' is not null or undefined
         if (tags === null || tags === undefined) {
             throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByTags';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByTags';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (tags !== undefined) {
-        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+            requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -199,30 +199,30 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param petId ID of pet to return
      */
     public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -239,29 +239,29 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param pet Pet object that needs to be added to the store
      */
     public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -291,42 +291,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Updated status of the pet
      */
     public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (name !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('name', name as any);
         }
         if (status !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('status', status as any);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -345,42 +345,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param file file to upload
      */
     public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}/uploadImage'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (additionalMetadata !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('additionalMetadata', additionalMetadata as any);
         }
         if (file !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('file', file, file.name);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -394,8 +394,6 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class PetApiResponseProcessor {
 
     /**
@@ -428,9 +426,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -450,9 +448,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -483,9 +481,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -516,9 +514,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -552,9 +550,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -591,9 +589,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -613,9 +611,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -643,7 +641,7 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
index 866a211ca32..9ada7b0fee1 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
@@ -12,37 +12,37 @@ import { Order } from '../models/Order';
  * no description
  */
 export class StoreApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         // Apply auth methods
 
@@ -54,23 +54,23 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * Returns pet inventories by status
      */
     public async getInventory(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/store/inventory';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/store/inventory';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -88,30 +88,30 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param orderId ID of pet that needs to be fetched
      */
     public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -123,29 +123,29 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param order order placed for purchasing the pet
      */
     public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'order' is not null or undefined
         if (order === null || order === undefined) {
             throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/store/order';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -163,8 +163,6 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class StoreApiResponseProcessor {
 
     /**
@@ -189,9 +187,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -219,9 +217,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -255,9 +253,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -288,7 +286,7 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts
index 83aae43a582..f705cc52a12 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts
@@ -12,36 +12,36 @@ import { User } from '../models/User';
  * no description
  */
 export class UserApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * This can only be done by the logged in user.
      * Create user
      * @param user Created user object
      */
     public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -67,29 +67,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithArray';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithArray';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -115,29 +115,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithList';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithList';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -164,30 +164,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be deleted
      */
     public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -204,30 +204,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -240,41 +240,41 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param password The password for login in clear text
      */
     public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
         }
 
-		
+
         // verify required parameter 'password' is not null or undefined
         if (password === null || password === undefined) {
             throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/login';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/user/login';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (username !== undefined) {
-        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+            requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
         }
         if (password !== undefined) {
-        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+            requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -285,23 +285,23 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * Logs out current logged in user session
      */
     public async logoutUser(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/user/logout';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/user/logout';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -320,36 +320,36 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user Updated user object
      */
     public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
         }
 
-		
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -372,8 +372,6 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class UserApiResponseProcessor {
 
     /**
@@ -395,9 +393,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -417,9 +415,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -439,9 +437,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -464,9 +462,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -500,9 +498,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -533,9 +531,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -555,9 +553,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -580,7 +578,7 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts
index b76dca5aa4b..fb8d314eb41 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts
index 4ae3fd11b9f..bf8d116d351 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts
@@ -45,24 +45,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -85,27 +85,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -123,7 +123,6 @@ export interface ResponseBody {
     binary(): Promise<Blob>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -218,4 +217,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts
index a0cd53a1996..038b08a6d7e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts
@@ -21,14 +21,13 @@ export class JQueryHttpLibrary implements HttpLibrary {
             data: body
         };
 
-		// If we want a blob, we have to set the xhrFields' responseType AND add a 
-		// custom converter to overwrite the default deserialization of JQuery...
+        // If we want a blob, we have to set the xhrFields' responseType AND add a
+        // custom converter to overwrite the default deserialization of JQuery...
         requestOptions["xhrFields"] = { responseType: 'blob' };
         requestOptions["converters"] = {} 
         requestOptions["converters"]["* blob"] = (result:any) => result;
         requestOptions["dataType"] = "blob";
 
-
         if (request.getHeaders()['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -41,7 +40,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
                 }
             }
         })(headerParams);
-        
+
         if (request.getHeaders()["Cookie"]) {
             throw new HttpException("Setting the \"Cookie\"-Header field is blocked by every major browser when using jquery.ajax requests. Please switch to another library like fetch to enable this option");
         }
@@ -49,9 +48,9 @@ export class JQueryHttpLibrary implements HttpLibrary {
         if (body && body.constructor.name == "FormData") {
             requestOptions.contentType = false;
         }
-        
+
         const sentRequest = $.ajax(requestOptions);
-        
+
         const resultPromise = new Promise<ResponseContext>((resolve, reject) => {
             sentRequest.done((data, _, jqXHR) => {
                 const result = new ResponseContext(
@@ -65,7 +64,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
                 const headers = this.getResponseHeaders(jqXHR)
                 const result = new ResponseContext(jqXHR.status, headers, jqXHR.responseText);
                 resolve(result);
-            })    
+            })
         })
         return from(resultPromise);
     }
@@ -79,7 +78,7 @@ export class JQueryHttpLibrary implements HttpLibrary {
           var key = header.shift();
           if (key.length == 0) return
           // chrome60+ force lowercase, other browsers can be different
-          key = key.toLowerCase(); 
+          key = key.toLowerCase();
           responseHeaders[key] = header.join(": ");
         });
         return responseHeaders
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts
index 46da5d25ef0..e9007138189 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts
@@ -8,13 +8,13 @@ import { Observable, from } from './rxjsStub';
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts
index aa5332db7ae..ce34c8714c0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json
index ccdcadd5594..ce51978eb86 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json
@@ -20,11 +20,10 @@
     "lib": [ "es6", "dom" ],
   },
   "exclude": [
-  	"dist",
+    "dist",
     "node_modules"
   ],
   "filesGlob": [
     "./**/*.ts",
   ]
-  
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
index bcc9c5afa0a..829c9d0363a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
@@ -114,13 +114,12 @@ export interface PetApiUploadFileRequest {
     file?: HttpFile
 }
 
-
 export class ObjectPetApi {
     private api: ObservablePetApi
 
     public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
         this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * Add a new pet to the store
@@ -129,7 +128,7 @@ export class ObjectPetApi {
     public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
         return this.api.addPet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param param the request object
@@ -137,7 +136,7 @@ export class ObjectPetApi {
     public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
         return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
@@ -146,7 +145,7 @@ export class ObjectPetApi {
     public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByStatus(param.status,  options).toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
@@ -155,7 +154,7 @@ export class ObjectPetApi {
     public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByTags(param.tags,  options).toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
@@ -164,7 +163,7 @@ export class ObjectPetApi {
     public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
         return this.api.getPetById(param.petId,  options).toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param param the request object
@@ -172,7 +171,7 @@ export class ObjectPetApi {
     public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
         return this.api.updatePet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param param the request object
@@ -180,7 +179,7 @@ export class ObjectPetApi {
     public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
         return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param param the request object
@@ -188,13 +187,9 @@ export class ObjectPetApi {
     public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
         return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableStoreApi } from "./ObservableAPI";
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 
@@ -228,13 +223,12 @@ export interface StoreApiPlaceOrderRequest {
     order: Order
 }
 
-
 export class ObjectStoreApi {
     private api: ObservableStoreApi
 
     public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
         this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -244,7 +238,7 @@ export class ObjectStoreApi {
     public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
         return this.api.deleteOrder(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
@@ -253,7 +247,7 @@ export class ObjectStoreApi {
     public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
         return this.api.getInventory( options).toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
@@ -262,7 +256,7 @@ export class ObjectStoreApi {
     public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
         return this.api.getOrderById(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param param the request object
@@ -270,13 +264,9 @@ export class ObjectStoreApi {
     public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
         return this.api.placeOrder(param.order,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableUserApi } from "./ObservableAPI";
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 
@@ -358,13 +348,12 @@ export interface UserApiUpdateUserRequest {
     user: User
 }
 
-
 export class ObjectUserApi {
     private api: ObservableUserApi
 
     public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
         this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * This can only be done by the logged in user.
@@ -374,7 +363,7 @@ export class ObjectUserApi {
     public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
         return this.api.createUser(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -382,7 +371,7 @@ export class ObjectUserApi {
     public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -390,7 +379,7 @@ export class ObjectUserApi {
     public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithListInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
@@ -399,7 +388,7 @@ export class ObjectUserApi {
     public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
         return this.api.deleteUser(param.username,  options).toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param param the request object
@@ -407,7 +396,7 @@ export class ObjectUserApi {
     public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
         return this.api.getUserByName(param.username,  options).toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param param the request object
@@ -415,7 +404,7 @@ export class ObjectUserApi {
     public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
         return this.api.loginUser(param.username, param.password,  options).toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      * @param param the request object
@@ -423,7 +412,7 @@ export class ObjectUserApi {
     public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
         return this.api.logoutUser( options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -432,9 +421,5 @@ export class ObjectUserApi {
     public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
         return this.api.updateUser(param.username, param.user,  options).toPromise();
     }
-	
 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
index 6154d267ed3..459fbc8e226 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
@@ -3,7 +3,6 @@ import * as models from '../models/all';
 import { Configuration} from '../configuration'
 import { Observable, of, from } from '../rxjsStub';
 import {mergeMap, map} from  '../rxjsStub';
-
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
 import { Order } from '../models/Order';
@@ -32,143 +31,143 @@ export class ObservablePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.addPet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -176,24 +175,24 @@ export class ObservablePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+            }));
     }
-	
+ 
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -201,30 +200,26 @@ export class ObservablePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
-    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class ObservableStoreApi {
     private requestFactory: StoreApiRequestFactory;
@@ -247,100 +242,96 @@ export class ObservableStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
-    	const requestContextPromise = this.requestFactory.getInventory(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getInventory(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+            }));
     }
-	
+ 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class ObservableUserApi {
     private requestFactory: UserApiRequestFactory;
@@ -363,163 +354,163 @@ export class ObservableUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUser(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUser(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Observable<User> {
-    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
-    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.logoutUser(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.logoutUser(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -527,26 +518,22 @@ export class ObservableUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+            }));
     }
-	
-
+ 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
index 533095a405d..2129b103e7e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
@@ -10,7 +10,6 @@ import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 import { ObservablePetApi } from './ObservableAPI';
 
-
 import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
 export class PromisePetApi {
     private api: ObservablePetApi
@@ -28,59 +27,59 @@ export class PromisePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.addPet(pet, options);
+        const result = this.api.addPet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deletePet(petId, apiKey, options);
+        const result = this.api.deletePet(petId, apiKey, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByStatus(status, options);
+        const result = this.api.findPetsByStatus(status, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByTags(tags, options);
+        const result = this.api.findPetsByTags(tags, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Promise<Pet> {
-    	const result = this.api.getPetById(petId, options);
+        const result = this.api.getPetById(petId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.updatePet(pet, options);
+        const result = this.api.updatePet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -88,10 +87,10 @@ export class PromisePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        const result = this.api.updatePetWithForm(petId, name, status, options);
         return result.toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -99,10 +98,10 @@ export class PromisePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
-    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        const result = this.api.uploadFile(petId, additionalMetadata, file, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -110,7 +109,6 @@ export class PromisePetApi {
 
 import { ObservableStoreApi } from './ObservableAPI';
 
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class PromiseStoreApi {
     private api: ObservableStoreApi
@@ -129,38 +127,38 @@ export class PromiseStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteOrder(orderId, options);
+        const result = this.api.deleteOrder(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
-    	const result = this.api.getInventory(options);
+        const result = this.api.getInventory(options);
         return result.toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
-    	const result = this.api.getOrderById(orderId, options);
+        const result = this.api.getOrderById(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Promise<Order> {
-    	const result = this.api.placeOrder(order, options);
+        const result = this.api.placeOrder(order, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -168,7 +166,6 @@ export class PromiseStoreApi {
 
 import { ObservableUserApi } from './ObservableAPI';
 
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class PromiseUserApi {
     private api: ObservableUserApi
@@ -187,65 +184,65 @@ export class PromiseUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.createUser(user, options);
+        const result = this.api.createUser(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithArrayInput(user, options);
+        const result = this.api.createUsersWithArrayInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithListInput(user, options);
+        const result = this.api.createUsersWithListInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteUser(username, options);
+        const result = this.api.deleteUser(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Promise<User> {
-    	const result = this.api.getUserByName(username, options);
+        const result = this.api.getUserByName(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
-    	const result = this.api.loginUser(username, password, options);
+        const result = this.api.loginUser(username, password, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Promise<void> {
-    	const result = this.api.logoutUser(options);
+        const result = this.api.logoutUser(options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -253,10 +250,10 @@ export class PromiseUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.updateUser(username, user, options);
+        const result = this.api.updateUser(username, user, options);
         return result.toPromise();
     }
-	
+
 
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts
index d1888434535..07317f5828b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts
index 7041341a708..12d711bd5b7 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts
@@ -14,35 +14,35 @@ import { Pet } from '../models/Pet';
  * no description
  */
 export class PetApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * Add a new pet to the store
      * @param pet Pet object that needs to be added to the store
      */
     public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -71,32 +71,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param apiKey 
      */
     public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
         }
 
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
-	
-		// Form Params
 
+        // Header Params
+        requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -114,32 +114,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Status values that need to be considered for filter
      */
     public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'status' is not null or undefined
         if (status === null || status === undefined) {
             throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByStatus';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByStatus';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (status !== undefined) {
-        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+            requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -157,32 +157,32 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param tags Tags to filter by
      */
     public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'tags' is not null or undefined
         if (tags === null || tags === undefined) {
             throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/findByTags';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/pet/findByTags';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (tags !== undefined) {
-        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+            requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -200,30 +200,30 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param petId ID of pet to return
      */
     public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -240,29 +240,29 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param pet Pet object that needs to be added to the store
      */
     public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'pet' is not null or undefined
         if (pet === null || pet === undefined) {
             throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/pet';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Path Params
+        const localVarPath = '/pet';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json",
         
@@ -292,42 +292,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param status Updated status of the pet
      */
     public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (name !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('name', name as any);
         }
         if (status !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('status', status as any);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -346,42 +346,42 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
      * @param file file to upload
      */
     public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'petId' is not null or undefined
         if (petId === null || petId === undefined) {
             throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
-		
-		
-		
-		// Path Params
-    	const localVarPath = '/pet/{petId}/uploadImage'
+
+
+
+        // Path Params
+        const localVarPath = '/pet/{petId}/uploadImage'
             .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
-		let localVarFormParams = new FormData();
+
+        // Header Params
+
+        // Form Params
+        let localVarFormParams = new FormData();
 
         if (additionalMetadata !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('additionalMetadata', additionalMetadata as any);
         }
         if (file !== undefined) {
-        // TODO: replace .append with .set
+             // TODO: replace .append with .set
              localVarFormParams.append('file', file.data, file.name);
         }
-		requestContext.setBody(localVarFormParams);
+        requestContext.setBody(localVarFormParams);
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -395,8 +395,6 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class PetApiResponseProcessor {
 
     /**
@@ -429,9 +427,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -451,9 +449,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -484,9 +482,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -517,9 +515,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -553,9 +551,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -592,9 +590,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -614,9 +612,9 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -644,7 +642,7 @@ export class PetApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
index 09400e99c08..12be0132697 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
@@ -13,37 +13,37 @@ import { Order } from '../models/Order';
  * no description
  */
 export class StoreApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         // Apply auth methods
 
@@ -55,23 +55,23 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * Returns pet inventories by status
      */
     public async getInventory(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/store/inventory';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/store/inventory';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -89,30 +89,30 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param orderId ID of pet that needs to be fetched
      */
     public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'orderId' is not null or undefined
         if (orderId === null || orderId === undefined) {
             throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order/{orderId}'
+
+        // Path Params
+        const localVarPath = '/store/order/{orderId}'
             .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -124,29 +124,29 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
      * @param order order placed for purchasing the pet
      */
     public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'order' is not null or undefined
         if (order === null || order === undefined) {
             throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/store/order';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/store/order';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -164,8 +164,6 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class StoreApiResponseProcessor {
 
     /**
@@ -190,9 +188,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -220,9 +218,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -256,9 +254,9 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -289,7 +287,7 @@ export class StoreApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts
index 1d43ec7a72b..0717cb75304 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts
@@ -13,36 +13,36 @@ import { User } from '../models/User';
  * no description
  */
 export class UserApiRequestFactory extends BaseAPIRequestFactory {
-	
+
     /**
      * This can only be done by the logged in user.
      * Create user
      * @param user Created user object
      */
     public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -68,29 +68,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithArray';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithArray';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -116,29 +116,29 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user List of user object
      */
     public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/createWithList';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        // Path Params
+        const localVarPath = '/user/createWithList';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
 
-		// Body Params
+        // Form Params
+
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -165,30 +165,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be deleted
      */
     public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
+
+        // Header Params
+
+        // Form Params
 
 
-		// Body Params
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -205,30 +205,30 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -241,41 +241,41 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param password The password for login in clear text
      */
     public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
         }
 
-		
+
         // verify required parameter 'password' is not null or undefined
         if (password === null || password === undefined) {
             throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/login';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Path Params
+        const localVarPath = '/user/login';
+
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
         if (username !== undefined) {
-        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+            requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
         }
         if (password !== undefined) {
-        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+            requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
         }
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         // Apply auth methods
 
@@ -286,23 +286,23 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * Logs out current logged in user session
      */
     public async logoutUser(options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
-		// Path Params
-    	const localVarPath = '/user/logout';
+        let config = options || this.configuration;
+
+        // Path Params
+        const localVarPath = '/user/logout';
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
 
         let authMethod = null;
         // Apply auth methods
@@ -321,36 +321,36 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
      * @param user Updated user object
      */
     public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
-		let config = options || this.configuration;
-		
+        let config = options || this.configuration;
+
         // verify required parameter 'username' is not null or undefined
         if (username === null || username === undefined) {
             throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
         }
 
-		
+
         // verify required parameter 'user' is not null or undefined
         if (user === null || user === undefined) {
             throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
         }
 
-		
-		// Path Params
-    	const localVarPath = '/user/{username}'
+
+        // Path Params
+        const localVarPath = '/user/{username}'
             .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
 
-		// Make Request Context
-    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        // Make Request Context
+        const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
         requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
 
         // Query Params
-	
-		// Header Params
-	
-		// Form Params
 
+        // Header Params
+
+        // Form Params
 
-		// Body Params
+
+        // Body Params
         const contentType = ObjectSerializer.getPreferredMediaType([
             "application/json"
         ]);
@@ -373,8 +373,6 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory {
 
 }
 
-
-
 export class UserApiResponseProcessor {
 
     /**
@@ -396,9 +394,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -418,9 +416,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -440,9 +438,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -465,9 +463,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -501,9 +499,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -534,9 +532,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -556,9 +554,9 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
     /**
      * Unwraps the actual response sent by the server from the response context and deserializes the response content
      * to the expected objects
@@ -581,7 +579,7 @@ export class UserApiResponseProcessor {
         }
 
         let body = response.body || "";
-    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+        throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
     }
-			
+
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts
index b76dca5aa4b..fb8d314eb41 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts
@@ -8,7 +8,7 @@
  *
  */
 export class ApiException<T> extends Error {
-	public constructor(public code: number, public body: T) {
+    public constructor(public code: number, public body: T) {
         super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
-	}
-}
\ No newline at end of file
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts
index ec8437b19ca..034ff003a56 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts
@@ -50,24 +50,24 @@ export class RequestContext {
     private body: RequestBody = undefined;
     private url: URLParse;
 
-	/**
-	 * Creates the request context using a http method and request resource url
-	 *
-	 * @param url url of the requested resource
-	 * @param httpMethod http method
-	 */
+    /**
+     * Creates the request context using a http method and request resource url
+     *
+     * @param url url of the requested resource
+     * @param httpMethod http method
+     */
     public constructor(url: string, private httpMethod: HttpMethod) {
         this.url = new URLParse(url, true);
     }
-    
+
     /*
      * Returns the url set in the constructor including the query string
      *
      */
     public getUrl(): string {
-    	return this.url.toString();
+        return this.url.toString();
     }
-    
+
     /**
      * Replaces the url set in the constructor with this url.
      *
@@ -90,27 +90,27 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-    	return this.httpMethod;
+        return this.httpMethod;
     }
-    
+
     public getHeaders(): { [key: string]: string } {
-    	return this.headers;
+        return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-	public setQueryParam(name: string, value: string) {
+    public setQueryParam(name: string, value: string) {
         let queryObj = this.url.query;
         queryObj[name] = value;
         this.url.set("query", queryObj);
     }
 
-	/**
-	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-	 *
-	 */
+    /**
+     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+     *
+     */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -128,7 +128,6 @@ export interface ResponseBody {
     binary(): Promise<Buffer>;
 }
 
-
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -203,4 +202,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts
index 46da5d25ef0..e9007138189 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts
@@ -8,13 +8,13 @@ import { Observable, from } from './rxjsStub';
  *
  */
 export interface Middleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Observable<RequestContext>;
     /**
      * Modifies the returned response before it is deserialized.
@@ -48,13 +48,13 @@ export class PromiseMiddlewareWrapper implements Middleware {
  *
  */
 export interface PromiseMiddleware {
-	/**
-	 * Modifies the request before the request is sent. 
-	 *
-	 * @param context RequestContext of a request which is about to be sent to the server
-	 * @returns an observable of the updated request context
-	 *
-	 */
+    /**
+     * Modifies the request before the request is sent.
+     *
+     * @param context RequestContext of a request which is about to be sent to the server
+     * @returns an observable of the updated request context
+     *
+     */
     pre(context: RequestContext): Promise<RequestContext>;
         /**
      * Modifies the returned response before it is deserialized.
@@ -63,4 +63,4 @@ export interface PromiseMiddleware {
      * @returns an observable of the modified response context
      */
     post(context: ResponseContext): Promise<ResponseContext>;
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts
index aa5332db7ae..ce34c8714c0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts
@@ -22,30 +22,30 @@ export class ServerConfiguration<T extends { [key: string]: string }> implements
         Object.assign(this.variableConfiguration, variableConfiguration);
     }
 
-	public getConfiguration(): T {
-		return this.variableConfiguration
-	}
-
-	private getUrl() {
-		let replacedUrl = this.url;
-		for (const key in this.variableConfiguration) {
-			var re = new RegExp("{" + key + "}","g");
-			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
-		}
-		return replacedUrl
-	}
-
-	/**
-	 * Creates a new request context for this server using the url with variables
-	 * replaced with their respective values and the endpoint of the request appended.
-	 *
-	 * @param endpoint the endpoint to be queried on the server
-	 * @param httpMethod httpMethod to be used
-	 *
-	 */	
-	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
-		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
-	}
+    public getConfiguration(): T {
+        return this.variableConfiguration
+    }
+
+    private getUrl() {
+        let replacedUrl = this.url;
+        for (const key in this.variableConfiguration) {
+            var re = new RegExp("{" + key + "}","g");
+            replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+        }
+        return replacedUrl
+    }
+
+    /**
+     * Creates a new request context for this server using the url with variables
+     * replaced with their respective values and the endpoint of the request appended.
+     *
+     * @param endpoint the endpoint to be queried on the server
+     * @param httpMethod httpMethod to be used
+     *
+     */
+    public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+        return new RequestContext(this.getUrl() + endpoint, httpMethod);
+    }
 }
 
 export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json
index a542d795677..091137b0e37 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json
@@ -20,11 +20,10 @@
     "lib": [ "es6" ],
   },
   "exclude": [
-  	"dist",
+    "dist",
     "node_modules"
   ],
   "filesGlob": [
     "./**/*.ts",
   ]
-  
-}
\ No newline at end of file
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
index bcc9c5afa0a..829c9d0363a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
@@ -114,13 +114,12 @@ export interface PetApiUploadFileRequest {
     file?: HttpFile
 }
 
-
 export class ObjectPetApi {
     private api: ObservablePetApi
 
     public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
         this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * Add a new pet to the store
@@ -129,7 +128,7 @@ export class ObjectPetApi {
     public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
         return this.api.addPet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param param the request object
@@ -137,7 +136,7 @@ export class ObjectPetApi {
     public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
         return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
@@ -146,7 +145,7 @@ export class ObjectPetApi {
     public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByStatus(param.status,  options).toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
@@ -155,7 +154,7 @@ export class ObjectPetApi {
     public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
         return this.api.findPetsByTags(param.tags,  options).toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
@@ -164,7 +163,7 @@ export class ObjectPetApi {
     public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
         return this.api.getPetById(param.petId,  options).toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param param the request object
@@ -172,7 +171,7 @@ export class ObjectPetApi {
     public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
         return this.api.updatePet(param.pet,  options).toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param param the request object
@@ -180,7 +179,7 @@ export class ObjectPetApi {
     public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
         return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param param the request object
@@ -188,13 +187,9 @@ export class ObjectPetApi {
     public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
         return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableStoreApi } from "./ObservableAPI";
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 
@@ -228,13 +223,12 @@ export interface StoreApiPlaceOrderRequest {
     order: Order
 }
 
-
 export class ObjectStoreApi {
     private api: ObservableStoreApi
 
     public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
         this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -244,7 +238,7 @@ export class ObjectStoreApi {
     public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
         return this.api.deleteOrder(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
@@ -253,7 +247,7 @@ export class ObjectStoreApi {
     public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
         return this.api.getInventory( options).toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
@@ -262,7 +256,7 @@ export class ObjectStoreApi {
     public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
         return this.api.getOrderById(param.orderId,  options).toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param param the request object
@@ -270,13 +264,9 @@ export class ObjectStoreApi {
     public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
         return this.api.placeOrder(param.order,  options).toPromise();
     }
-	
 
 }
 
-
-
-
 import { ObservableUserApi } from "./ObservableAPI";
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 
@@ -358,13 +348,12 @@ export interface UserApiUpdateUserRequest {
     user: User
 }
 
-
 export class ObjectUserApi {
     private api: ObservableUserApi
 
     public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
         this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
-	}
+    }
 
     /**
      * This can only be done by the logged in user.
@@ -374,7 +363,7 @@ export class ObjectUserApi {
     public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
         return this.api.createUser(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -382,7 +371,7 @@ export class ObjectUserApi {
     public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param param the request object
@@ -390,7 +379,7 @@ export class ObjectUserApi {
     public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
         return this.api.createUsersWithListInput(param.user,  options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
@@ -399,7 +388,7 @@ export class ObjectUserApi {
     public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
         return this.api.deleteUser(param.username,  options).toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param param the request object
@@ -407,7 +396,7 @@ export class ObjectUserApi {
     public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
         return this.api.getUserByName(param.username,  options).toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param param the request object
@@ -415,7 +404,7 @@ export class ObjectUserApi {
     public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
         return this.api.loginUser(param.username, param.password,  options).toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      * @param param the request object
@@ -423,7 +412,7 @@ export class ObjectUserApi {
     public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
         return this.api.logoutUser( options).toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -432,9 +421,5 @@ export class ObjectUserApi {
     public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
         return this.api.updateUser(param.username, param.user,  options).toPromise();
     }
-	
 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
index 6154d267ed3..459fbc8e226 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
@@ -3,7 +3,6 @@ import * as models from '../models/all';
 import { Configuration} from '../configuration'
 import { Observable, of, from } from '../rxjsStub';
 import {mergeMap, map} from  '../rxjsStub';
-
 import { ApiResponse } from '../models/ApiResponse';
 import { Category } from '../models/Category';
 import { Order } from '../models/Order';
@@ -32,143 +31,143 @@ export class ObservablePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.addPet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+            }));
     }
-	
+ 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
-    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
-    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+            }));
     }
-	
+ 
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -176,24 +175,24 @@ export class ObservablePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+            }));
     }
-	
+ 
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -201,30 +200,26 @@ export class ObservablePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
-    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class ObservableStoreApi {
     private requestFactory: StoreApiRequestFactory;
@@ -247,100 +242,96 @@ export class ObservableStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+            }));
     }
-	
+ 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
-    	const requestContextPromise = this.requestFactory.getInventory(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getInventory(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+            }));
     }
-	
+ 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+            }));
     }
-	
+ 
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Observable<Order> {
-    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+            }));
     }
-	
-
+ 
 }
 
-
-
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class ObservableUserApi {
     private requestFactory: UserApiRequestFactory;
@@ -363,163 +354,163 @@ export class ObservableUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUser(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUser(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Observable<User> {
-    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
-    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.logoutUser(options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.logoutUser(options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+            }));
     }
-	
+ 
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -527,26 +518,22 @@ export class ObservableUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
-    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
-
-		// build promise chain
-    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-    	for (let middleware of this.configuration.middleware) {
-    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
-    	}
-
-    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
-	    	pipe(mergeMap((response: ResponseContext) => {
-	    		let middlewarePostObservable = of(response);
-	    		for (let middleware of this.configuration.middleware) {
-	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
-	    		}
-	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
-	    	}));
+        const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+        // build promise chain
+        let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+        for (let middleware of this.configuration.middleware) {
+            middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+        }
+
+        return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+            pipe(mergeMap((response: ResponseContext) => {
+                let middlewarePostObservable = of(response);
+                for (let middleware of this.configuration.middleware) {
+                    middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+                }
+                return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+            }));
     }
-	
-
+ 
 }
-
-
-
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
index 533095a405d..2129b103e7e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
@@ -10,7 +10,6 @@ import { Tag } from '../models/Tag';
 import { User } from '../models/User';
 import { ObservablePetApi } from './ObservableAPI';
 
-
 import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
 export class PromisePetApi {
     private api: ObservablePetApi
@@ -28,59 +27,59 @@ export class PromisePetApi {
      * @param pet Pet object that needs to be added to the store
      */
     public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.addPet(pet, options);
+        const result = this.api.addPet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
     public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deletePet(petId, apiKey, options);
+        const result = this.api.deletePet(petId, apiKey, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByStatus(status, options);
+        const result = this.api.findPetsByStatus(status, options);
         return result.toPromise();
     }
-	
+
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
-    	const result = this.api.findPetsByTags(tags, options);
+        const result = this.api.findPetsByTags(tags, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a single pet
      * Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, options?: Configuration): Promise<Pet> {
-    	const result = this.api.getPetById(petId, options);
+        const result = this.api.getPetById(petId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Update an existing pet
      * @param pet Pet object that needs to be added to the store
      */
     public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
-    	const result = this.api.updatePet(pet, options);
+        const result = this.api.updatePet(pet, options);
         return result.toPromise();
     }
-	
+
     /**
      * Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
@@ -88,10 +87,10 @@ export class PromisePetApi {
      * @param status Updated status of the pet
      */
     public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
-    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        const result = this.api.updatePetWithForm(petId, name, status, options);
         return result.toPromise();
     }
-	
+
     /**
      * uploads an image
      * @param petId ID of pet to update
@@ -99,10 +98,10 @@ export class PromisePetApi {
      * @param file file to upload
      */
     public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
-    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        const result = this.api.uploadFile(petId, additionalMetadata, file, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -110,7 +109,6 @@ export class PromisePetApi {
 
 import { ObservableStoreApi } from './ObservableAPI';
 
-
 import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
 export class PromiseStoreApi {
     private api: ObservableStoreApi
@@ -129,38 +127,38 @@ export class PromiseStoreApi {
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteOrder(orderId, options);
+        const result = this.api.deleteOrder(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
     public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
-    	const result = this.api.getInventory(options);
+        const result = this.api.getInventory(options);
         return result.toPromise();
     }
-	
+
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
-    	const result = this.api.getOrderById(orderId, options);
+        const result = this.api.getOrderById(orderId, options);
         return result.toPromise();
     }
-	
+
     /**
      * Place an order for a pet
      * @param order order placed for purchasing the pet
      */
     public placeOrder(order: Order, options?: Configuration): Promise<Order> {
-    	const result = this.api.placeOrder(order, options);
+        const result = this.api.placeOrder(order, options);
         return result.toPromise();
     }
-	
+
 
 }
 
@@ -168,7 +166,6 @@ export class PromiseStoreApi {
 
 import { ObservableUserApi } from './ObservableAPI';
 
-
 import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
 export class PromiseUserApi {
     private api: ObservableUserApi
@@ -187,65 +184,65 @@ export class PromiseUserApi {
      * @param user Created user object
      */
     public createUser(user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.createUser(user, options);
+        const result = this.api.createUser(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithArrayInput(user, options);
+        const result = this.api.createUsersWithArrayInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * Creates list of users with given input array
      * @param user List of user object
      */
     public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
-    	const result = this.api.createUsersWithListInput(user, options);
+        const result = this.api.createUsersWithListInput(user, options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, options?: Configuration): Promise<void> {
-    	const result = this.api.deleteUser(username, options);
+        const result = this.api.deleteUser(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing.
      */
     public getUserByName(username: string, options?: Configuration): Promise<User> {
-    	const result = this.api.getUserByName(username, options);
+        const result = this.api.getUserByName(username, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
     public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
-    	const result = this.api.loginUser(username, password, options);
+        const result = this.api.loginUser(username, password, options);
         return result.toPromise();
     }
-	
+
     /**
      * Logs out current logged in user session
      */
     public logoutUser(options?: Configuration): Promise<void> {
-    	const result = this.api.logoutUser(options);
+        const result = this.api.logoutUser(options);
         return result.toPromise();
     }
-	
+
     /**
      * This can only be done by the logged in user.
      * Updated user
@@ -253,10 +250,10 @@ export class PromiseUserApi {
      * @param user Updated user object
      */
     public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
-    	const result = this.api.updateUser(username, user, options);
+        const result = this.api.updateUser(username, user, options);
         return result.toPromise();
     }
-	
+
 
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts
index d1888434535..07317f5828b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts
@@ -7,22 +7,22 @@
  * @param code the http status code to be checked against the code range
  */
 export function isCodeInRange(codeRange: string, code: number): boolean {
-	// This is how the default value is encoded in OAG
-	if (codeRange === "0") {
-		return true;
-	}
-	if (codeRange == code.toString()) {
-		return true;
-	} else {
-		const codeString = code.toString();
-		if (codeString.length != codeRange.length) {
-			return false;
-		}
-		for (let i = 0; i < codeString.length; i++) {
-			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
+    // This is how the default value is encoded in OAG
+    if (codeRange === "0") {
+        return true;
+    }
+    if (codeRange == code.toString()) {
+        return true;
+    } else {
+        const codeString = code.toString();
+        if (codeString.length != codeRange.length) {
+            return false;
+        }
+        for (let i = 0; i < codeString.length; i++) {
+            if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
-- 
GitLab


From 7cc8f1af7685816f9b74baaf3bc926fb634bc1c6 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 20 Feb 2021 12:53:54 +0800
Subject: [PATCH 2/2] replace tab with spaces, minor code format change

---
 .../kotlin-server/data_class.mustache         |  8 +-
 .../spring-boot/buildGradleKts.mustache       | 16 ++--
 .../libraries/spring-boot/pom.mustache        | 84 +++++++++----------
 .../spring-boot/settingsGradle.mustache       | 26 +++---
 .../resources/kotlin-spring/service.mustache  |  3 +-
 .../openapitools/server/models/ApiResponse.kt |  6 +-
 .../openapitools/server/models/Category.kt    |  6 +-
 .../org/openapitools/server/models/Order.kt   |  6 +-
 .../org/openapitools/server/models/Pet.kt     |  6 +-
 .../org/openapitools/server/models/Tag.kt     |  6 +-
 .../org/openapitools/server/models/User.kt    |  6 +-
 .../build.gradle.kts                          |  8 +-
 .../kotlin-springboot-delegate/pom.xml        | 62 +++++++-------
 .../settings.gradle                           | 26 +++---
 .../build.gradle.kts                          | 16 ++--
 .../kotlin-springboot-reactive/pom.xml        | 84 +++++++++----------
 .../settings.gradle                           | 26 +++---
 .../org/openapitools/api/PetApiService.kt     | 17 ++--
 .../org/openapitools/api/StoreApiService.kt   |  9 +-
 .../org/openapitools/api/UserApiService.kt    | 17 ++--
 .../kotlin-springboot/build.gradle.kts        |  8 +-
 .../server/petstore/kotlin-springboot/pom.xml | 62 +++++++-------
 .../kotlin-springboot/settings.gradle         | 26 +++---
 .../org/openapitools/api/PetApiService.kt     | 17 ++--
 .../org/openapitools/api/StoreApiService.kt   |  9 +-
 .../org/openapitools/api/UserApiService.kt    | 17 ++--
 26 files changed, 292 insertions(+), 285 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
index d9e9d591b7b..e22559b5cc9 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
@@ -26,12 +26,12 @@ data class {{classname}} (
 {
 {{/vendorExtensions.x-has-data-class-body}}
 {{#serializableModel}}
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 {{/serializableModel}}
 {{#hasEnums}}
-	{{#vars}}
+    {{#vars}}
     {{#isEnum}}
     /**
     * {{{description}}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache
index d4662668a3f..69c162d7b6f 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache
@@ -32,16 +32,16 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
 {{^reactive}}
     compile("org.springframework.boot:spring-boot-starter-web")
 {{/reactive}}
 {{#reactive}}
-	compile("org.springframework.boot:spring-boot-starter-webflux")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
+    compile("org.springframework.boot:spring-boot-starter-webflux")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
 {{/reactive}}
 {{#swaggerAnnotations}}
     compile("io.swagger:swagger-annotations:1.5.21")
@@ -55,12 +55,12 @@ dependencies {
         exclude(module = "junit")
     }
 {{#reactive}}
-	testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
+    testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
 {{/reactive}}
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
index 900532923cd..cfc42f1da0d 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
@@ -7,7 +7,7 @@
     <version>{{artifactVersion}}</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -83,20 +83,20 @@
             <artifactId>spring-boot-starter-web</artifactId>
 {{/reactive}}
 {{#reactive}}
-	        <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
 {{/reactive}}
         </dependency>
 {{#reactive}}
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-core</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-reactor</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-reactor</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
 {{/reactive}}
 
         {{#swaggerAnnotations}}
@@ -148,34 +148,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache
index 290868e2793..fd23a36b903 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache
@@ -1,15 +1,15 @@
 pluginManagement {
-	repositories {
-		maven { url = uri("https://repo.spring.io/snapshot") }
-		maven { url = uri("https://repo.spring.io/milestone") }
-		gradlePluginPortal()
-	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
+    repositories {
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.springframework.boot") {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
 }
-rootProject.name = "{{artifactId}}"
\ No newline at end of file
+rootProject.name = "{{artifactId}}"
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache
index b9da0db826b..becec2257ef 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache
@@ -5,11 +5,12 @@ package {{package}}
 {{#reactive}}
 import kotlinx.coroutines.flow.Flow;
 {{/reactive}}
+
 {{#operations}}
 interface {{classname}}Service {
 {{#operation}}
 
-	{{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}
+    {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}
 {{/operation}}
 }
 {{/operations}}
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt
index f5835ca6519..45760790990 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt
@@ -25,8 +25,8 @@ data class ApiResponse (
     val message: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt
index 4ca711e4ac1..ee26d4c76e5 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt
@@ -23,8 +23,8 @@ data class Category (
     val name: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt
index dd392773e96..7889abe12ee 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt
@@ -32,9 +32,9 @@ data class Order (
     val complete: kotlin.Boolean? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
     /**
     * Order Status
     * Values: placed,approved,delivered
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt
index b2286383f87..8dc13b7ea6e 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt
@@ -34,9 +34,9 @@ data class Pet (
     val status: Pet.Status? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
     /**
     * pet status in the store
     * Values: available,pending,sold
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt
index dab1c21898d..49c2887a503 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt
@@ -23,8 +23,8 @@ data class Tag (
     val name: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt
index 77f8f02f38a..dee8de740bd 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt
@@ -36,8 +36,8 @@ data class User (
     val userStatus: kotlin.Int? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts
index 49fe9400f70..d0e767d84cd 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts
+++ b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts
@@ -32,7 +32,7 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
     compile("org.springframework.boot:spring-boot-starter-web")
@@ -48,7 +48,7 @@ dependencies {
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/server/petstore/kotlin-springboot-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-delegate/pom.xml
index 8af5e943b3a..32a5347bada 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/pom.xml
+++ b/samples/server/petstore/kotlin-springboot-delegate/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0.0</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -127,34 +127,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/samples/server/petstore/kotlin-springboot-delegate/settings.gradle b/samples/server/petstore/kotlin-springboot-delegate/settings.gradle
index e9bd5d32d7c..14844905cd4 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/settings.gradle
+++ b/samples/server/petstore/kotlin-springboot-delegate/settings.gradle
@@ -1,15 +1,15 @@
 pluginManagement {
-	repositories {
-		maven { url = uri("https://repo.spring.io/snapshot") }
-		maven { url = uri("https://repo.spring.io/milestone") }
-		gradlePluginPortal()
-	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
+    repositories {
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.springframework.boot") {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
 }
-rootProject.name = "openapi-spring"
\ No newline at end of file
+rootProject.name = "openapi-spring"
diff --git a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts
index 682bfec8aa1..24ed63f61f8 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts
+++ b/samples/server/petstore/kotlin-springboot-reactive/build.gradle.kts
@@ -32,12 +32,12 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
-	compile("org.springframework.boot:spring-boot-starter-webflux")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
+    compile("org.springframework.boot:spring-boot-starter-webflux")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
     compile("io.swagger:swagger-annotations:1.5.21")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
@@ -47,11 +47,11 @@ dependencies {
     testCompile("org.springframework.boot:spring-boot-starter-test") {
         exclude(module = "junit")
     }
-	testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
+    testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
index cfbc66f6dc9..17b60380752 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml
+++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0.0</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -79,18 +79,18 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-reactor</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
         </dependency>
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-core</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-reactor</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
 
         <dependency>
             <groupId>io.swagger</groupId>
@@ -137,34 +137,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/samples/server/petstore/kotlin-springboot-reactive/settings.gradle b/samples/server/petstore/kotlin-springboot-reactive/settings.gradle
index e9bd5d32d7c..14844905cd4 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/settings.gradle
+++ b/samples/server/petstore/kotlin-springboot-reactive/settings.gradle
@@ -1,15 +1,15 @@
 pluginManagement {
-	repositories {
-		maven { url = uri("https://repo.spring.io/snapshot") }
-		maven { url = uri("https://repo.spring.io/milestone") }
-		gradlePluginPortal()
-	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
+    repositories {
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.springframework.boot") {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
 }
-rootProject.name = "openapi-spring"
\ No newline at end of file
+rootProject.name = "openapi-spring"
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
index 572dfddca6a..082f75c0fe3 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
@@ -3,21 +3,22 @@ package org.openapitools.api
 import org.openapitools.model.ModelApiResponse
 import org.openapitools.model.Pet
 import kotlinx.coroutines.flow.Flow;
+
 interface PetApiService {
 
-	suspend fun addPet(body: Pet): Unit
+    suspend fun addPet(body: Pet): Unit
 
-	suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
+    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
 
-	fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): Flow<Pet>
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): Flow<Pet>
 
-	fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): Flow<Pet>
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): Flow<Pet>
 
-	suspend fun getPetById(petId: kotlin.Long): Pet
+    suspend fun getPetById(petId: kotlin.Long): Pet
 
-	suspend fun updatePet(body: Pet): Unit
+    suspend fun updatePet(body: Pet): Unit
 
-	suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
+    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
 
-	suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.core.io.Resource?): ModelApiResponse
+    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.core.io.Resource?): ModelApiResponse
 }
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index fbc5b1729e4..5dbae34663c 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -2,13 +2,14 @@ package org.openapitools.api
 
 import org.openapitools.model.Order
 import kotlinx.coroutines.flow.Flow;
+
 interface StoreApiService {
 
-	suspend fun deleteOrder(orderId: kotlin.String): Unit
+    suspend fun deleteOrder(orderId: kotlin.String): Unit
 
-	suspend fun getInventory(): Map<String, kotlin.Int>
+    suspend fun getInventory(): Map<String, kotlin.Int>
 
-	suspend fun getOrderById(orderId: kotlin.Long): Order
+    suspend fun getOrderById(orderId: kotlin.Long): Order
 
-	suspend fun placeOrder(body: Order): Order
+    suspend fun placeOrder(body: Order): Order
 }
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiService.kt
index ceb24849483..475862547b5 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiService.kt
@@ -2,21 +2,22 @@ package org.openapitools.api
 
 import org.openapitools.model.User
 import kotlinx.coroutines.flow.Flow;
+
 interface UserApiService {
 
-	suspend fun createUser(body: User): Unit
+    suspend fun createUser(body: User): Unit
 
-	suspend fun createUsersWithArrayInput(body: Flow<User>): Unit
+    suspend fun createUsersWithArrayInput(body: Flow<User>): Unit
 
-	suspend fun createUsersWithListInput(body: Flow<User>): Unit
+    suspend fun createUsersWithListInput(body: Flow<User>): Unit
 
-	suspend fun deleteUser(username: kotlin.String): Unit
+    suspend fun deleteUser(username: kotlin.String): Unit
 
-	suspend fun getUserByName(username: kotlin.String): User
+    suspend fun getUserByName(username: kotlin.String): User
 
-	suspend fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String
+    suspend fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String
 
-	suspend fun logoutUser(): Unit
+    suspend fun logoutUser(): Unit
 
-	suspend fun updateUser(username: kotlin.String, body: User): Unit
+    suspend fun updateUser(username: kotlin.String, body: User): Unit
 }
diff --git a/samples/server/petstore/kotlin-springboot/build.gradle.kts b/samples/server/petstore/kotlin-springboot/build.gradle.kts
index 49fe9400f70..d0e767d84cd 100644
--- a/samples/server/petstore/kotlin-springboot/build.gradle.kts
+++ b/samples/server/petstore/kotlin-springboot/build.gradle.kts
@@ -32,7 +32,7 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
     compile("org.springframework.boot:spring-boot-starter-web")
@@ -48,7 +48,7 @@ dependencies {
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml
index 8af5e943b3a..32a5347bada 100644
--- a/samples/server/petstore/kotlin-springboot/pom.xml
+++ b/samples/server/petstore/kotlin-springboot/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0.0</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -127,34 +127,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/samples/server/petstore/kotlin-springboot/settings.gradle b/samples/server/petstore/kotlin-springboot/settings.gradle
index e9bd5d32d7c..14844905cd4 100644
--- a/samples/server/petstore/kotlin-springboot/settings.gradle
+++ b/samples/server/petstore/kotlin-springboot/settings.gradle
@@ -1,15 +1,15 @@
 pluginManagement {
-	repositories {
-		maven { url = uri("https://repo.spring.io/snapshot") }
-		maven { url = uri("https://repo.spring.io/milestone") }
-		gradlePluginPortal()
-	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
+    repositories {
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.springframework.boot") {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
 }
-rootProject.name = "openapi-spring"
\ No newline at end of file
+rootProject.name = "openapi-spring"
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
index f3f2fd68b6c..b96e86aff1b 100644
--- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
+++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
@@ -2,21 +2,22 @@ package org.openapitools.api
 
 import org.openapitools.model.ModelApiResponse
 import org.openapitools.model.Pet
+
 interface PetApiService {
 
-	fun addPet(body: Pet): Unit
+    fun addPet(body: Pet): Unit
 
-	fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
 
-	fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): List<Pet>
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): List<Pet>
 
-	fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): List<Pet>
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): List<Pet>
 
-	fun getPetById(petId: kotlin.Long): Pet
+    fun getPetById(petId: kotlin.Long): Pet
 
-	fun updatePet(body: Pet): Unit
+    fun updatePet(body: Pet): Unit
 
-	fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
 
-	fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.core.io.Resource?): ModelApiResponse
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.core.io.Resource?): ModelApiResponse
 }
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index d4a4ef9507f..e67a66c4f7e 100644
--- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -1,13 +1,14 @@
 package org.openapitools.api
 
 import org.openapitools.model.Order
+
 interface StoreApiService {
 
-	fun deleteOrder(orderId: kotlin.String): Unit
+    fun deleteOrder(orderId: kotlin.String): Unit
 
-	fun getInventory(): Map<String, kotlin.Int>
+    fun getInventory(): Map<String, kotlin.Int>
 
-	fun getOrderById(orderId: kotlin.Long): Order
+    fun getOrderById(orderId: kotlin.Long): Order
 
-	fun placeOrder(body: Order): Order
+    fun placeOrder(body: Order): Order
 }
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiService.kt
index 491705c3b50..40148efeb72 100644
--- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiService.kt
+++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiService.kt
@@ -1,21 +1,22 @@
 package org.openapitools.api
 
 import org.openapitools.model.User
+
 interface UserApiService {
 
-	fun createUser(body: User): Unit
+    fun createUser(body: User): Unit
 
-	fun createUsersWithArrayInput(body: kotlin.collections.List<User>): Unit
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>): Unit
 
-	fun createUsersWithListInput(body: kotlin.collections.List<User>): Unit
+    fun createUsersWithListInput(body: kotlin.collections.List<User>): Unit
 
-	fun deleteUser(username: kotlin.String): Unit
+    fun deleteUser(username: kotlin.String): Unit
 
-	fun getUserByName(username: kotlin.String): User
+    fun getUserByName(username: kotlin.String): User
 
-	fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String
+    fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String
 
-	fun logoutUser(): Unit
+    fun logoutUser(): Unit
 
-	fun updateUser(username: kotlin.String, body: User): Unit
+    fun updateUser(username: kotlin.String, body: User): Unit
 }
-- 
GitLab