From b73dbee8d1c99b0f7d35e1f2b6ef9338fa863082 Mon Sep 17 00:00:00 2001 From: zbarbuto Date: Wed, 18 Dec 2019 17:28:36 +1030 Subject: [PATCH] Disable providers array when for providedInRoot in Angular (#4798) --- .../main/resources/typescript-angular/api.module.mustache | 4 ++-- .../builds/default/api.module.ts | 5 +---- .../builds/with-npm/api.module.ts | 5 +---- .../builds/default/api.module.ts | 5 +---- .../builds/with-npm/api.module.ts | 5 +---- .../builds/single-request-parameter/api.module.ts | 5 +---- .../builds/with-npm/api.module.ts | 5 +---- .../builds/with-prefixed-module-name/api.module.ts | 5 +---- 8 files changed, 9 insertions(+), 30 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.module.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.module.mustache index e10080d0205..bbd7ae48c31 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/api.module.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.module.mustache @@ -13,9 +13,9 @@ import { {{classname}} } from './{{importPath}}'; imports: [], declarations: [], exports: [], - providers: [ + providers: [{{^providedInRoot}} {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, - {{/hasMore}}{{/apis}}{{/apiInfo}} ] + {{/hasMore}}{{/apis}}{{/apiInfo}} {{/providedInRoot}}] }) export class {{apiModuleClassName}} { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api.module.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api.module.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api.module.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api.module.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api.module.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api.module.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api.module.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api.module.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api.module.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api.module.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api.module.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api.module.ts index 8487243a83b..5e6ebe12ae0 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api.module.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class ApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api.module.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api.module.ts index 62e18a783d3..57092b10bb0 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api.module.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/api.module.ts @@ -11,10 +11,7 @@ import { UserService } from './api/user.service'; imports: [], declarations: [], exports: [], - providers: [ - PetService, - StoreService, - UserService ] + providers: [] }) export class PetStoreApiModule { public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders {