loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

updating versions of package.json + ignoring build files + adding basePath to ConfigurationObject and giving de ConfigurationObject an easy constructor

Browse Source
This commit is contained in:
Kristof Vrolijkx 2016-11-14 12:26:38 +01:00 committed by wing328
parent 68bda09cd8
commit 24c23d748c
19 changed files with 219 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/swagger-codegen/src/main/resources/typescript-angular2/api.service.mustache
View File

@ -35,6 +35,7 @@ export class {{classname}} {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

18
modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
View File

@ -1,6 +1,24 @@
export interface ConfigurationParameters {
apiKey?: string;
username?: string;
password?: string;
accessToken?: string;
basePath?: string;
}
export class Configuration {
apiKey: string;
username: string;
password: string;
accessToken: string;
basePath: string;
constructor(configurationParameters: ConfigurationParameters = {}) {
this.apiKey = configurationParameters.apiKey;
this.username = configurationParameters.username;
this.password = configurationParameters.password;
this.accessToken = configurationParameters.accessToken;
this.basePath = configurationParameters.basePath;
}
}

6
modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
View File

@ -20,7 +20,7 @@
"@angular/compiler": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17"
},
"devDependencies": {
@ -31,9 +31,9 @@
"@angular/platform-browser": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17",
"typescript": "^1.8.10",
"typescript": "^2.0.0",
"typings": "^1.3.2"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}

3
modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
View File

@ -17,7 +17,8 @@
"node_modules",
"typings/main.d.ts",
"typings/main",
"lib"
"lib",
"dist"
],
"filesGlob": [
"./model/*.ts",

10
modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
View File

@ -1,17 +1,17 @@
package io.swagger.codegen;
import org.testng.annotations.Test;
import org.testng.reporters.Files;
import static io.swagger.codegen.testutils.AssertFile.assertPathEqualsRecursively;
import java.io.IOException;
import java.util.Map;
import org.testng.annotations.Test;
import org.testng.reporters.Files;
import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
import io.swagger.models.Swagger;
import io.swagger.parser.SwaggerParser;
import static io.swagger.codegen.testutils.AssertFile.assertPathEqualsRecursively;
public abstract class AbstractIntegrationTest {
protected abstract IntegrationTestPathsConfig getIntegrationTestPathsConfig();
@ -21,7 +21,7 @@ public abstract class AbstractIntegrationTest {
protected abstract Map<String, String> configProperties();
// @wing328: ignore for the time being until we fix the error with the integration test
@Test(enabled = false)
@Test(enabled = true)
public void generatesCorrectDirectoryStructure() throws IOException {
DefaultGenerator codeGen = new DefaultGenerator();
IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig();

1
modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts
View File

@ -50,6 +50,7 @@ export class UserService {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

18
modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts
View File

@ -1,6 +1,24 @@
export interface ConfigurationParameters {
apiKey?: string;
username?: string;
password?: string;
accessToken?: string;
basePath?: string;
}
export class Configuration {
apiKey: string;
username: string;
password: string;
accessToken: string;
basePath: string;
constructor(configurationParameters: ConfigurationParameters = {}) {
this.apiKey = configurationParameters.apiKey;
this.username = configurationParameters.username;
this.password = configurationParameters.password;
this.accessToken = configurationParameters.accessToken;
this.basePath = configurationParameters.basePath;
}
}

6
modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
View File

@ -20,7 +20,7 @@
"@angular/compiler": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17"
},
"devDependencies": {
@ -31,9 +31,9 @@
"@angular/platform-browser": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17",
"typescript": "^1.8.10",
"typescript": "^2.0.0",
"typings": "^1.3.2"
}
}

3
modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json
View File

@ -17,7 +17,8 @@
"node_modules",
"typings/main.d.ts",
"typings/main",
"lib"
"lib",
"dist"
],
"filesGlob": [
"./model/*.ts",

1
modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts
View File

@ -51,6 +51,7 @@ export class ProjectService {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

18
modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts
View File

@ -1,6 +1,24 @@
export interface ConfigurationParameters {
apiKey?: string;
username?: string;
password?: string;
accessToken?: string;
basePath?: string;
}
export class Configuration {
apiKey: string;
username: string;
password: string;
accessToken: string;
basePath: string;
constructor(configurationParameters: ConfigurationParameters = {}) {
this.apiKey = configurationParameters.apiKey;
this.username = configurationParameters.username;
this.password = configurationParameters.password;
this.accessToken = configurationParameters.accessToken;
this.basePath = configurationParameters.basePath;
}
}

6
modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
View File

@ -20,7 +20,7 @@
"@angular/compiler": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17"
},
"devDependencies": {
@ -31,9 +31,9 @@
"@angular/platform-browser": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17",
"typescript": "^1.8.10",
"typescript": "^2.0.0",
"typings": "^1.3.2"
}
}

3
modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json
View File

@ -17,7 +17,8 @@
"node_modules",
"typings/main.d.ts",
"typings/main",
"lib"
"lib",
"dist"
],
"filesGlob": [
"./model/*.ts",

1
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts
View File

@ -51,6 +51,7 @@ export class PetService {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

1
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
View File

@ -50,6 +50,7 @@ export class StoreService {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

1
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts
View File

@ -50,6 +50,7 @@ export class UserService {
}
if (configuration) {
this.configuration = configuration;
this.basePath = basePath || configuration.basePath || this.basePath;
}
}

18
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts
View File

@ -1,6 +1,24 @@
export interface ConfigurationParameters {
apiKey?: string;
username?: string;
password?: string;
accessToken?: string;
basePath?: string;
}
export class Configuration {
apiKey: string;
username: string;
password: string;
accessToken: string;
basePath: string;
constructor(configurationParameters: ConfigurationParameters = {}) {
this.apiKey = configurationParameters.apiKey;
this.username = configurationParameters.username;
this.password = configurationParameters.password;
this.accessToken = configurationParameters.accessToken;
this.basePath = configurationParameters.basePath;
}
}

6
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/package.json
View File

@ -20,7 +20,7 @@
"@angular/compiler": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17"
},
"devDependencies": {
@ -31,9 +31,9 @@
"@angular/platform-browser": "^2.0.0",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17",
"typescript": "^1.8.10",
"typescript": "^2.0.0",
"typings": "^1.3.2"
}
}

3
modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json
View File

@ -17,7 +17,8 @@
"node_modules",
"typings/main.d.ts",
"typings/main",
"lib"
"lib",
"dist"
],
"filesGlob": [
"./model/*.ts",