Merge the latest master into 2.3.0 by wing328 · Pull Request #4497 · swagger-api/swagger-codegen

wing328 · 2017-01-05T16:38:03Z

PR checklist

Read the contribution guildelines.
Ran the shell/batch script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)
Filed the PR against the correct branch: master for non-breaking changes and 2.3.0 branch for breaking (non-backward compatible) changes.

Description of the PR

Merge the latest master into 2.3.0

…odelName

…, to enable fetch API specific options (eg including credentials, enabling CORS etc)

Instead of basepath based grouping that is used by Spring boot/MVC

* remove apache2 license from ruby api client * remove license from gem spec

* remove php apache license * remove apache license from C# * remove apache license in objc code * remove license from swift 3 code * remove apache license from perl code * remove license from scala code * remove license from ts, go, android, cpp, scala * remove license from java api client * restore clojure petstore files * remove license from travis file * clean up apache-related terms in php, ruby, python mustache tempaltes * remove license from JS API cilent

* remove php apache license * remove license from doc generator

* remove php apache license * remove license in sample code, update nodejs to use unlicnese * remove license from jaxrs generator * remove license from server generator * update pom.xml for jaxrs resteasy joda server

Supports multi-level inheritance to avoid having the variables from the parents of level > 2 This commit also fixes the comparison of the variables when skipping the variables in the children classes by only comparing their names (in some cases some parent variables were present in children classes) Signed-off-by: Vincent Giersch <vincent@giersch.fr>

[html2] Add missing enums to parameters

… routing Fix #4106

* Allow multiple requests in parallel in Python client If you tried to do two parallel calls to the same API object in the Python client you would get an error from urllib3 connection pool: Connection pool is full, discarding connection: *** Because the default maxsize=1: https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L162 By defaulting to a higher maxsize we mitigate for the common use case where a user is running a couple of requests in parallel. Ideally, in the future, this should be a configuration paramater together with the pool size. * Add sample code after changing maxsize

[Flask] Add models support to Flask Connexion codegen

* Add a basic JAX-RS Application and CDI fixes * jaxrs-cxf-cdi :: Fix samples generation template dir * jaxrs-cxf-cdi :: Regenerate samples * jaxrs-cxf-cdi :: Clean up some checkstyle warnings

Example: - case public = "public" + case _public = "public" Signed-off-by: Vincent Giersch <vincent@giersch.fr>

[Flask] Use x-swagger-router-controller in for operation routing

[Spring] Use tag operation grouping for spring-cloud

…rence (#4093) * #3908 make a copy of vendorExtensions map instead of copying the reference * using 4-space instead of tab. * make a copy of vendorExtensions map instead of copying the reference

Added Autodesk as a swagger codegen user

…t not specified (#4436) * check if property is a BaseIntegerProperty. This can occur when format is not specified in Swagger definition * Change coding style to be more consistent

* Add Rakefile, Gemfile, and update client generator * Update sample

* Another approach: extending NodeJS server to support GCF. This does not add a new language, but adding some client options to support Google Cloud Functions (GCF). * Add URLs for how to deploy the generated code. Adds the client options help message and the README.md file.

* updated to release versions * fixed defaultValue objects to strings * added top-level jackson version * added missing dependency, removed from swagger-core

#4476) * [codegen ignore] Fix windows paths for ignore processing * [codegen ignore] Add missing glob rule tests

Added reference to snapcx website, as we provide swagger 2.0 specs public APIs.

Conflicts: appveyor.yml modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache modules/swagger-codegen/src/main/resources/go/api.mustache modules/swagger-codegen/src/main/resources/objc/api-body.mustache modules/swagger-codegen/src/main/resources/objc/api-header.mustache modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java samples/client/petstore-security-test/typescript-angular2/configuration.ts samples/client/petstore/go/go-petstore/docs/FakeApi.md samples/client/petstore/go/go-petstore/fake_api.go samples/client/petstore/go/go-petstore/pet_api.go samples/client/petstore/java/feign/pom.xml samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h samples/client/petstore/qt5cpp/client/SWGPetApi.h samples/client/petstore/qt5cpp/client/SWGStoreApi.h samples/client/petstore/qt5cpp/client/SWGUserApi.h samples/client/petstore/typescript-angular2/default/configuration.ts samples/client/petstore/typescript-angular2/npm/README.md samples/client/petstore/typescript-angular2/npm/configuration.ts samples/client/petstore/typescript-angular2/npm/package.json samples/client/petstore/typescript-angular2/npm/tsconfig.json samples/client/petstore/typescript-fetch/builds/default/api.ts samples/client/petstore/typescript-fetch/builds/es6-target/api.ts samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java

christian and others added 30 commits July 4, 2016 21:45

#3285 ModelNamePre- and Suffixes should not be applied to Types.

ceffa84

#3285 Check for typeMapper types inside getSwaggerType instead of toM…

41df857

…odelName

Support passing custom RequestInit options in typescript-fetch client…

41a7aaf

…, to enable fetch API specific options (eg including credentials, enabling CORS etc)

add perform beanvalidation flag to ok-http-gson #2549

a9069e8

add tests for java client performBeanValidation #2549

1d305b1

update generated petstore for ok-http-gson #2549

9d8c419

update check for performBeanValidation #2549

a7252e7

[Spring] Use tag operation grouping for spring-cloud

4a196a9

Instead of basepath based grouping that is used by Spring boot/MVC

[Ruby] remove apache2 license from ruby api client (#4149)

39ffc0a

* remove apache2 license from ruby api client * remove license from gem spec

Remove Apache license from document generator (#4199)

63c3133

* remove php apache license * remove license from doc generator

Remove Apache license from server stub generators (#4200)

88227e0

* remove php apache license * remove license in sample code, update nodejs to use unlicnese * remove license from jaxrs generator * remove license from server generator * update pom.xml for jaxrs resteasy joda server

Add missing enums to properties

9772243

Merge pull request #4204 from bshamblen/master

d6e8fb0

[html2] Add missing enums to parameters

add taskdata

d548a80

add models support to flask

e5daa68

[Flask] Use x-swagger-router-controller in swagger.yaml for operation…

1e6cab8

… routing Fix #4106

update readme description (#4207)

61f6c94

Merge pull request #4178 from cbornet/flask

3d476de

[Flask] Add models support to Flask Connexion codegen

jaxrs-cxf-cdi :: Add a basic JAX-RS Application and CDI fixes (#4196)

b7e9603

* Add a basic JAX-RS Application and CDI fixes * jaxrs-cxf-cdi :: Fix samples generation template dir * jaxrs-cxf-cdi :: Regenerate samples * jaxrs-cxf-cdi :: Clean up some checkstyle warnings

Remove opening PHP tag from PHP code sample (#4212)

5baa715

fix(swift3): rename reserved enum values (#4201)

9e08b63

Example: - case public = "public" + case _public = "public" Signed-off-by: Vincent Giersch <vincent@giersch.fr>

Merge pull request #4188 from cbornet/flask_operations

359e52b

[Flask] Use x-swagger-router-controller in for operation routing

add http://www.intenthq.com

da13613

Merge pull request #4189 from cbornet/spring_cloud_operations

cde24f1

[Spring] Use tag operation grouping for spring-cloud

#3908 make a copy of vendorExtensions map instead of copying the refe…

a260636

…rence (#4093) * #3908 make a copy of vendorExtensions map instead of copying the reference * using 4-space instead of tab. * make a copy of vendorExtensions map instead of copying the reference

add Flat (https://flat.io)

9c6fbad

Add test for file response schema

0a5b0bb

gregra81 and others added 25 commits December 20, 2016 20:22

Added Autodesk as a swagger codegen user

79fa53a

Merge pull request #4438 from gregra81/patch-1

ba28575

Added Autodesk as a swagger codegen user

Fix Integer stub value defaulting to String in nodejs-server if forma…

d7afb22

…t not specified (#4436) * check if property is a BaseIntegerProperty. This can occur when format is not specified in Swagger definition * Change coding style to be more consistent

update swagger pasrer to 1.0.25-SNAPSHOT

d52f5a3

[Ruby] Add Rakefile and Gemfile (#4448)

e189388

* Add Rakefile, Gemfile, and update client generator * Update sample

Fix typo. Creactor -> Creator (#4443)

41701a1

better code format for nodejs server (#4411)

aed21bb

roll back to latest working version of swagger paresr for codegen

fb3d4e6

Update to latest swagger-core, parser versions (#4472)

0252d1a

* updated to release versions * fixed defaultValue objects to strings * added top-level jackson version * added missing dependency, removed from swagger-core

[codegen ignore] normalize path separator for Windows, add *.ext tests (

c94e18a

#4476) * [codegen ignore] Fix windows paths for ignore processing * [codegen ignore] Add missing glob rule tests

[csharp] Use default rather than null in ctor (#4145)

cb9a1b3

Only updated README.md file (#4485)

3f66e27

Added reference to snapcx website, as we provide swagger 2.0 specs public APIs.

add https://www.fastly.com/

42a0491

fix pom for feign and okhttp-gson java api client

db03c35

fix optional parameters and collection format in go api client

aae7e2c

fix feign pom

a7e4f54

update feign pom version

a8bc090

remove problem class files from java api clients

7335816

fix ts fetch method signature

52ee4ac

fix ts fetch missing , before options

b8f9985

fix code styling in ts

15cdbcc

resolve merge conflicts in ts fetch test cases

27b5347

comment out ts fetch default test

864d22b

wing328 added this to the v2.3.0 milestone Jan 5, 2017

wing328 merged commit a541ecc into 2.3.0 Jan 5, 2017

wing328 mentioned this pull request Jan 5, 2017

[Swift 3] Defend against reserved words as enum values #4217

Closed

4 tasks

wing328 deleted the 2.3.0_sync_master branch January 5, 2017 17:01

wing328 mentioned this pull request Jan 5, 2017

Issue running CI tests for Typescript-Fetch API client #4498

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge the latest master into 2.3.0#4497

Merge the latest master into 2.3.0#4497
wing328 merged 208 commits into2.3.0from
2.3.0_sync_master

wing328 commented Jan 5, 2017 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

wing328 commented Jan 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR checklist

Description of the PR

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

wing328 commented Jan 5, 2017 •

edited

Loading