loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a problem in the generation of typescript-jquery when we have enum in a query param (#7506)

Browse Source
This commit is contained in:
Jean-François Côté 2018-01-28 01:48:33 -05:00 committed by William Cheng
parent 1d661f3683
commit d1933b5fca
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java
View File

@ -72,6 +72,12 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg
@Override @Override
public String getSwaggerType(Property p) { public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p); String swaggerType = super.getSwaggerType(p);
if (p instanceof StringProperty) {
StringProperty sp = (StringProperty) p;
if (sp.getEnum() != null) {
return swaggerType;
}
}
if (isLanguagePrimitive(swaggerType) || isLanguageGenericType(swaggerType)) { if (isLanguagePrimitive(swaggerType) || isLanguageGenericType(swaggerType)) {
return swaggerType; return swaggerType;
} }
@ -108,7 +114,10 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg
@Override @Override
public void postProcessParameter(CodegenParameter parameter) { public void postProcessParameter(CodegenParameter parameter) {
super.postProcessParameter(parameter); super.postProcessParameter(parameter);
parameter.dataType = addModelPrefix(parameter.dataType);
if (!parameter.isEnum) {
parameter.dataType = addModelPrefix(parameter.dataType);
}
} }
private void addNpmPackageGeneration() { private void addNpmPackageGeneration() {

2
samples/client/petstore/typescript-jquery/default/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.1 2.4.0-SNAPSHOT

2
samples/client/petstore/typescript-jquery/npm/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.1 2.4.0-SNAPSHOT

4
samples/client/petstore/typescript-jquery/npm/README.md
View File

@ -1,4 +1,4 @@
## @swagger/angular2-typescript-petstore@0.0.1 ## @swagger/jquery-typescript-petstore@0.0.1
This generator creates TypeScript/JavaScript client that utilizes [jQuery](https://jquery.com/). The generated Node module can be used in the following environments: This generator creates TypeScript/JavaScript client that utilizes [jQuery](https://jquery.com/). The generated Node module can be used in the following environments:
@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co
_published:_ _published:_
``` ```
npm install @swagger/angular2-typescript-petstore@0.0.1 --save npm install @swagger/jquery-typescript-petstore@0.0.1 --save
``` ```
_unPublished (not recommended):_ _unPublished (not recommended):_

4
samples/client/petstore/typescript-jquery/npm/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@swagger/angular2-typescript-petstore", "name": "@swagger/jquery-typescript-petstore",
"version": "0.0.1", "version": "0.0.1",
"description": "JQuery client for @swagger/angular2-typescript-petstore", "description": "JQuery client for @swagger/jquery-typescript-petstore",
"main": "api.js", "main": "api.js",
"scripts": { "scripts": {
"build": "tsc" "build": "tsc"