Fix generated module imports in Aurelia APIs (#7465) (#7520)

OpenAPITools · Jan 29, 2018 · 7faaa09 · 7faaa09
1 parent 7c20316
commit 7faaa09
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAureliaClientCodegen.java b/...er-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAureliaClientCodegen.java
@@ -94,7 +94,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
 
             // Collect models to be imported
             for (CodegenParameter param : op.allParams) {
-                if (!param.isPrimitiveType) {
+                if (!param.isPrimitiveType && !param.isListContainer && !param.dataType.equals("any")) {
                     modelImports.add(param.dataType);
                 }
             }

diff --git a/modules/swagger-codegen/src/main/resources/typescript-aurelia/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-aurelia/api.mustache
@@ -30,6 +30,7 @@ export class {{classname}} extends Api {
    * Creates a new {{classname}} class.
    *
    * @param httpClient The Aurelia HTTP client to be injected.
+   * @param authStorage A storage for authentication data.
    */
   constructor(httpClient: HttpClient, authStorage: AuthStorage) {
     super(httpClient, authStorage);
@@ -57,7 +58,7 @@ export class {{classname}} extends Api {
 
     // Create URL to call
     const url = `${this.basePath}{{{path}}}`{{#pathParams}}
-      .replace(`{${'{{baseName}}'}}`, encodeURIComponent(String(${params['{{paramName}}']}))){{/pathParams}};
+      .replace(`{${'{{baseName}}'}}`, encodeURIComponent(`${params['{{paramName}}']}`)){{/pathParams}};
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method

diff --git a/samples/client/petstore/typescript-aurelia/default/PetApi.ts b/samples/client/petstore/typescript-aurelia/default/PetApi.ts
@@ -15,11 +15,8 @@ import { HttpClient } from 'aurelia-http-client';
 import { Api } from './Api';
 import { AuthStorage } from './AuthStorage';
 import {
-  Array&lt;string&gt;,
-  any,
   Pet,
   ApiResponse,
-  Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;,
 } from './models';
 
 /**
@@ -141,7 +138,7 @@ export class PetApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/pet/{petId}`
-      .replace(`{${'petId'}}`, encodeURIComponent(String(${params['petId']})));
+      .replace(`{${'petId'}}`, encodeURIComponent(`${params['petId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -234,7 +231,7 @@ export class PetApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/pet/{petId}`
-      .replace(`{${'petId'}}`, encodeURIComponent(String(${params['petId']})));
+      .replace(`{${'petId'}}`, encodeURIComponent(`${params['petId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -297,7 +294,7 @@ export class PetApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/pet/{petId}`
-      .replace(`{${'petId'}}`, encodeURIComponent(String(${params['petId']})));
+      .replace(`{${'petId'}}`, encodeURIComponent(`${params['petId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -334,7 +331,7 @@ export class PetApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/pet/{petId}/uploadImage`
-      .replace(`{${'petId'}}`, encodeURIComponent(String(${params['petId']})));
+      .replace(`{${'petId'}}`, encodeURIComponent(`${params['petId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method

diff --git a/samples/client/petstore/typescript-aurelia/default/StoreApi.ts b/samples/client/petstore/typescript-aurelia/default/StoreApi.ts
@@ -71,7 +71,7 @@ export class StoreApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/store/order/{orderId}`
-      .replace(`{${'orderId'}}`, encodeURIComponent(String(${params['orderId']})));
+      .replace(`{${'orderId'}}`, encodeURIComponent(`${params['orderId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -126,7 +126,7 @@ export class StoreApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/store/order/{orderId}`
-      .replace(`{${'orderId'}}`, encodeURIComponent(String(${params['orderId']})));
+      .replace(`{${'orderId'}}`, encodeURIComponent(`${params['orderId']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method

diff --git a/samples/client/petstore/typescript-aurelia/default/UserApi.ts b/samples/client/petstore/typescript-aurelia/default/UserApi.ts
@@ -16,7 +16,6 @@ import { Api } from './Api';
 import { AuthStorage } from './AuthStorage';
 import {
   User,
-  Array&lt;User&gt;,
 } from './models';
 
 /**
@@ -192,7 +191,7 @@ export class UserApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/user/{username}`
-      .replace(`{${'username'}}`, encodeURIComponent(String(${params['username']})));
+      .replace(`{${'username'}}`, encodeURIComponent(`${params['username']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -220,7 +219,7 @@ export class UserApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/user/{username}`
-      .replace(`{${'username'}}`, encodeURIComponent(String(${params['username']})));
+      .replace(`{${'username'}}`, encodeURIComponent(`${params['username']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method
@@ -309,7 +308,7 @@ export class UserApi extends Api {
 
     // Create URL to call
     const url = `${this.basePath}/user/{username}`
-      .replace(`{${'username'}}`, encodeURIComponent(String(${params['username']})));
+      .replace(`{${'username'}}`, encodeURIComponent(`${params['username']}`));
 
     const response = await this.httpClient.createRequest(url)
       // Set HTTP method