loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 22:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.3.0

Browse Source
This commit is contained in:
wing328 2017-04-17 23:05:46 +08:00
commit c7ccb1a9a9
51 changed files with 728 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -796,6 +796,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
- [Svenska Spel AB](https://www.svenskaspel.se/) - [Svenska Spel AB](https://www.svenskaspel.se/)
- [TaskData](http://www.taskdata.com/) - [TaskData](http://www.taskdata.com/)
- [ThoughtWorks](https://www.thoughtworks.com) - [ThoughtWorks](https://www.thoughtworks.com)
- [Trexle](https://trexle.com/)
- [Upwork](http://upwork.com/) - [Upwork](http://upwork.com/)
- [uShip](https://www.uship.com/) - [uShip](https://www.uship.com/)
- [VMware](https://vmware.com/) - [VMware](https://vmware.com/)

1
modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
View File

@ -91,6 +91,7 @@ public class CodegenParameter {
output.dataFormat = this.dataFormat; output.dataFormat = this.dataFormat;
output.collectionFormat = this.collectionFormat; output.collectionFormat = this.collectionFormat;
output.isCollectionFormatMulti = this.isCollectionFormatMulti; output.isCollectionFormatMulti = this.isCollectionFormatMulti;
output.isPrimitiveType = this.isPrimitiveType;
output.description = this.description; output.description = this.description;
output.unescapedDescription = this.unescapedDescription; output.unescapedDescription = this.unescapedDescription;
output.baseType = this.baseType; output.baseType = this.baseType;

6
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -1739,12 +1739,16 @@ public class DefaultCodegen {
CodegenProperty cp = fromProperty(property.name, ap.getItems()); CodegenProperty cp = fromProperty(property.name, ap.getItems());
updatePropertyForArray(property, cp); updatePropertyForArray(property, cp);
} else if (p instanceof MapProperty) { } else if (p instanceof MapProperty) {
MapProperty ap = (MapProperty) p;
property.isContainer = true; property.isContainer = true;
property.isMapContainer = true; property.isMapContainer = true;
property.containerType = "map"; property.containerType = "map";
property.baseType = getSwaggerType(p); property.baseType = getSwaggerType(p);
property.minItems = ap.getMinProperties();
property.maxItems = ap.getMaxProperties();
// handle inner property // handle inner property
MapProperty ap = (MapProperty) p;
CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties()); CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties());
updatePropertyForMap(property, cp); updatePropertyForMap(property, cp);
} else { } else {

6
modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache
View File

@ -1,9 +1,9 @@
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
export * from './{{ classname }}'; export * from './{{ classFilename }}';
import { {{ classname }} } from './{{ classname }}'; import { {{ classname }} } from './{{ classFilename }}';
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
export const APIS = [ {{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}]; export const APIS = [{{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}];
{{/apiInfo}} {{/apiInfo}}

2
modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache
View File

@ -1,5 +1,5 @@
{{#models}} {{#models}}
{{#model}} {{#model}}
export * from './{{{ classname }}}'; export * from './{{{ classFilename }}}';
{{/model}} {{/model}}
{{/models}} {{/models}}

13
pom.xml
View File

@ -710,6 +710,18 @@
<module>samples/server/petstore/spring-mvc</module> <module>samples/server/petstore/spring-mvc</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>springboot-beanvalidation</id>
<activation>
<property>
<name>env</name>
<value>java</value>
</property>
</activation>
<modules>
<module>samples/server/petstore/springboot-beanvalidation</module>
</modules>
</profile>
<profile> <profile>
<id>springboot</id> <id>springboot</id>
<activation> <activation>
@ -820,6 +832,7 @@
<module>samples/server/petstore/spring-mvc</module> <module>samples/server/petstore/spring-mvc</module>
<module>samples/client/petstore/spring-cloud</module> <module>samples/client/petstore/spring-cloud</module>
<module>samples/server/petstore/springboot</module> <module>samples/server/petstore/springboot</module>
<module>samples/server/petstore/springboot-beanvalidation</module>
<module>samples/server/petstore/jaxrs-cxf</module> <module>samples/server/petstore/jaxrs-cxf</module>
<module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module> <module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module>
<module>samples/server/petstore/jaxrs-cxf-cdi</module> <module>samples/server/petstore/jaxrs-cxf-cdi</module>

2
samples/client/petstore-security-test/typescript-angular/api/api.ts
View File

@ -1,3 +1,3 @@
export * from './FakeApi'; export * from './FakeApi';
import { FakeApi } from './FakeApi'; import { FakeApi } from './FakeApi';
export const APIS = [ FakeApi, ]; export const APIS = [FakeApi, ];

2
samples/client/petstore/typescript-angular/api/api.ts
View File

@ -4,4 +4,4 @@ export * from './StoreApi';
import { StoreApi } from './StoreApi'; import { StoreApi } from './StoreApi';
export * from './UserApi'; export * from './UserApi';
import { UserApi } from './UserApi'; import { UserApi } from './UserApi';
export const APIS = [ PetApi, StoreApi, UserApi, ]; export const APIS = [PetApi, StoreApi, UserApi, ];

14
samples/client/petstore/typescript-angular2/default/api/api.ts
View File

@ -1,7 +1,7 @@
export * from './PetApi'; export * from './pet.service';
import { PetApi } from './PetApi'; import { PetService } from './pet.service';
export * from './StoreApi'; export * from './store.service';
import { StoreApi } from './StoreApi'; import { StoreService } from './store.service';
export * from './UserApi'; export * from './user.service';
import { UserApi } from './UserApi'; import { UserService } from './user.service';
export const APIS = [PetApi, StoreApi, UserApi]; export const APIS = [PetService, StoreService, UserService];

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

@ -1,4 +1,4 @@
## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703271250 ## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704172305
### Building ### Building
@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's.
_published:_ _published:_
``` ```
npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703271250 --save npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704172305 --save
``` ```
_unPublished (not recommended):_ _unPublished (not recommended):_

14
samples/client/petstore/typescript-angular2/npm/api/api.ts
View File

@ -1,7 +1,7 @@
export * from './PetApi'; export * from './pet.service';
import { PetApi } from './PetApi'; import { PetService } from './pet.service';
export * from './StoreApi'; export * from './store.service';
import { StoreApi } from './StoreApi'; import { StoreService } from './store.service';
export * from './UserApi'; export * from './user.service';
import { UserApi } from './UserApi'; import { UserService } from './user.service';
export const APIS = [PetApi, StoreApi, UserApi]; export const APIS = [PetService, StoreService, UserService];

29
samples/client/petstore/typescript-angular2/npm/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@swagger/angular2-typescript-petstore", "name": "@swagger/angular2-typescript-petstore",
"version": "0.0.1-SNAPSHOT.201703271250", "version": "0.0.1-SNAPSHOT.201704172305",
"description": "swagger client for @swagger/angular2-typescript-petstore", "description": "swagger client for @swagger/angular2-typescript-petstore",
"author": "Swagger Codegen Contributors", "author": "Swagger Codegen Contributors",
"keywords": [ "keywords": [
@ -10,30 +10,29 @@
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",
"scripts": { "scripts": {
"build": "typings install && tsc --outDir dist/", "build": "typings install && tsc --outDir dist/"
"postinstall": "npm run build"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^2.0.0-rc.5", "@angular/core": "^2.0.0",
"@angular/http": "^2.0.0-rc.5", "@angular/http": "^2.0.0",
"@angular/common": "^2.0.0-rc.5", "@angular/common": "^2.0.0",
"@angular/compiler": "^2.0.0-rc.5", "@angular/compiler": "^2.0.0",
"core-js": "^2.4.0", "core-js": "^2.4.0",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17" "zone.js": "^0.6.17"
}, },
"devDependencies": { "devDependencies": {
"@angular/core": "^2.0.0-rc.5", "@angular/core": "^2.0.0",
"@angular/http": "^2.0.0-rc.5", "@angular/http": "^2.0.0",
"@angular/common": "^2.0.0-rc.5", "@angular/common": "^2.0.0",
"@angular/compiler": "^2.0.0-rc.5", "@angular/compiler": "^2.0.0",
"@angular/platform-browser": "^2.0.0-rc.5", "@angular/platform-browser": "^2.0.0",
"core-js": "^2.4.0", "core-js": "^2.4.0",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.17", "zone.js": "^0.6.17",
"typescript": "^1.8.10", "typescript": "^2.0.0",
"typings": "^1.3.2" "typings": "^1.3.2"
}, },
"publishConfig":{ "publishConfig":{

2
samples/server/petstore/springboot-beanvalidation/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-spring</artifactId> <artifactId>swagger-spring-beanvalidation</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-spring</name> <name>swagger-spring</name>
<version>1.0.0</version> <version>1.0.0</version>