Commit Graph

4264 Commits

Author SHA1 Message Date
wing328 255bc02b83 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-11-09 16:37:11 +08:00
wing328 cce410c463 add vendor extension to handle void response in jaxrs-cxf 2016-11-08 21:06:38 +08:00
wing328 d5ced7df38 Merge pull request #4155 from wing328/produce_consume_exception
Better handling of */*
2016-11-08 16:43:20 +08:00
wing328 935bdfe628 better handling of */* 2016-11-08 16:17:51 +08:00
wing328 77d3c0cb20 Merge pull request #4125 from ircecho/multiword
DART: multi-word class names work properly now, fixes #4117
2016-11-08 15:48:29 +08:00
mbohlool 37460ee833 Select application/json content-type in python generated client, if */* is in the list of content-types 2016-11-07 11:54:01 -08:00
wing328 7f31763273 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-11-07 23:55:13 +08:00
wing328 7dd774ffa3 Merge branch 'msf4j' of https://github.com/sanjeewa-malalgoda/swagger-codegen 2016-11-07 23:51:45 +08:00
Roman Truba a1cd01916e [ObjC] Fix deprecated JSONModel API usage (#4133)
* Fixed deprecated usage -[JSONKeyMapper initWithDictionary:]

* Petstore regenerated

* Change minimal required version of JSONModel
2016-11-07 23:47:09 +08:00
wing328 e78ce6fb1e Merge pull request #4059 from markus-wa/issue-4045
[JAXRS-CXF] Issue 4045 - Fixed enum marshalling & fromValue()
2016-11-07 23:42:29 +08:00
wing328 7ba60afa71 Merge pull request #4131 from wienczny/patch-1
Update pojo.mustache to repair broken merge
2016-11-07 16:14:08 +08:00
Jim Schubert ad1765475d [aspnet5] Fix broken template directory for deprecated lang (#4142) 2016-11-07 16:12:59 +08:00
keysolutions ab9ea5b2c3 Add constructFromObject to Javascript enum generation. (#4120)
* Add constructFromObject to Javascript enum generation.

Generated code calls constructFromObject on enum types, but enum did not define the necessary function. Returns the value of the enum.

* Update Petstore JS API client
2016-11-05 23:14:48 +08:00
Roman Truba 1a2b345c57 [Obj-c] Generated code documentation fixes (#4130)
* Fixed missing parameters names for obj-c generated code

* Obj-c sample regenerated
2016-11-05 23:13:51 +08:00
Stephan Wienczny f25f6c265a Update pojo.mustache
Repair vendorExtensions due to broken merge.
2016-11-04 14:59:04 +01:00
Christophe Bornet 901a981f26 [feign] Use feign-form (#4124)
* [feign] Use feign-form

Fix #4108

* [feign] Convert java.util.Date params to rfc3339 with an Expander
2016-11-04 21:13:18 +08:00
wing328 5b0b52df38 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-11-04 19:18:37 +08:00
wing328 636623d0e9 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-11-04 19:17:35 +08:00
ircecho 51b941cf88 DART: Removed the 'justIgnoreThisFlag' flag (#4116)
* feat[dart]: remove unused argument 'justIgnoreThisFlag'

* chore[dart]: petstore rebuild
2016-11-04 19:17:23 +08:00
Anton WIMMER 096cbd57f5 fix[dart]: multi-word class names work properly now 2016-11-04 11:48:53 +01:00
Christophe Bornet 70d93883cf [Java] Threetenbp dates support (#4029)
* [feign] add threetenbp support for feign clients

* [okhttp] add threetenbp support for okhttp clients

* [jersey] add threetenbp support for jersey clients

* [retrofit2] add threetenbp support for retrofit2 clients

* [spring] add threetenbp support for spring generators

* add a workaround in tests for a bug in the petstore

The petstore doesn't manage fractional digits of dates correctly when there are less than 3
2016-11-04 17:55:16 +08:00
Hamed R. Nik af4b32178f [ruby] Validate array correctly
It never throws error with any values in array. Every element should be validated against the enum.
2016-11-03 17:03:48 +00:00
sanjeewa-malalgoda 60c7d90d22 remove glassfish dependencies and use MSF4J internal implementation for the simplicity and reduce dependencies 2016-11-03 10:39:52 +05:30
wwn 8eefe863bf Added isEmtyString check to avoid IndexOutOfBoundException 2016-11-02 18:45:25 +01:00
Simon Morris 8fb33980dc Nancy fx work (#4107)
* Added switch to config to toggle use of yaml base path as module paths

* NancyFX template updated to return collections as array to allow framework to find views by type name for text/html mime type

* Added some more parser fixes for NancyFX

* Refactored collection parsers in Parameters.cs and changed some to return nullable collections to match the parameter mappings in AbstractCSharpCodegen

* re-ran petstore build
2016-11-02 21:35:01 +08:00
wing328 c1e6f00242 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-11-02 15:43:00 +08:00
wing328 4eb75f8088 add back setter to spring model (readonly attr) 2016-11-02 15:40:00 +08:00
wing328 5c0ce022e9 update dart intl version 2016-11-02 11:17:04 +08:00
sutdisi 819a8648d5 Jersey2 Patch Support (#4110)
* Fix for issue 2848 Adding support for PATH in jersey2

* Updating petstore sample for PATCH update
2016-11-02 09:43:29 +08:00
wing328 0eaab90ba5 Merge branch 'retrofit2-vendor-mime-type' of https://github.com/Rajmohan/swagger-codegen into Rajmohan-retrofit2-vendor-mime-type 2016-11-01 21:40:22 +08:00
Cliffano Subagio 5c53513a30 [python] Add packageUrl option, replacing infoUrl in setup.py (#4101)
* [python] Add packageUrl option, replacing infoUrl in setup.py .

* [python] Regenerate Python petstore sample.

* [python] Regenerate Python petstore security test sample.
2016-11-01 18:21:53 +08:00
Maciej c2780abd70 fixing issue#4037 - ts ng2 response type is always json (#4060)
* fixing issue#4037 - default response is always json

* updated documentation for new method

* updated comment for new method
2016-11-01 17:02:40 +08:00
wing328 b3f3edda33 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-11-01 16:59:23 +08:00
wing328 66ebdf3e3d Merge branch 'issue-4051' of https://github.com/schnabel/swagger-codegen into schnabel-issue-4051 2016-11-01 16:58:26 +08:00
wing328 e230ef9f50 Merge pull request #4072 from cbornet/spring_response_wrappers
[spring] add an option to choose the response wrapper type
2016-11-01 16:41:07 +08:00
scannerscan a5eff7e571 Jdk6 jersey2 support (#4074)
* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* add msf4j author

* [Java] Fix outputFolder in java-related server stub generators (#4076)

* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen

* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache
2016-11-01 16:36:56 +08:00
wing328 a23aacc21e Merge pull request #4062 from AndrewRademacher/fix-haskell-servant-cas
Fixed toUpper and toLower usage in haskell-servant gen.
2016-11-01 16:30:59 +08:00
Robert Biehl 6963bf8748 [Swift] Swift3 inheritance support (#4052)
* Swift3 inheritance support

* Mode inheritance support
* Handle 204 No Content without crashing
* Added some new reserved words for Swift (Error, URL)

* Update swift3 pet store example

* PR feedback fixes

* removed unnecessary newline from Models.swift
* removed unnecessary code comments
* ~~public~~ open

* Typo

* Fix review feedback

* fixed comment
2016-11-01 16:25:43 +08:00
Denis Bazhenov 7e7ca01aa4 Newline escaping disabled for HTML and HTML2 generators (#4099)
* Newline escaping disabled

Newline escaping disabled for HTML and HTML2 generators. Escaping
failing Markdown processors to work correctly on descriptions

* HTML examples updated
2016-11-01 16:21:30 +08:00
Tony Tam 2651e83c0b added trim 2016-10-27 12:59:57 -07:00
wing328 4a1ef9dec9 [Java] Fix outputFolder in java-related server stub generators (#4076)
* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen
2016-10-26 16:31:47 +08:00
Albert Pastrana 7fc17a26c7 [TypeScript Fetch] Fixes typo in FetchParamCreactor (#4075)
There was a typo, just changing `FetchParamCreactor` to `FetchParamCreator`
2016-10-26 15:52:24 +08:00
wing328 07c6fe9d0d Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-26 15:42:59 +08:00
wing328 6c439168a4 Merge branch 'msf4j' of https://github.com/sanjeewa-malalgoda/swagger-codegen into sanjeewa-malalgoda-msf4j 2016-10-26 10:33:00 +08:00
schnabel 32edf04b8e fixed unwanted remove 2016-10-25 20:37:55 +02:00
schnabel f57e7c0933 bugfix: issue-4051 2016-10-25 20:09:24 +02:00
cbornet 21ec2bc866 [spring] add an option to choose the response wrapper type
Also generate the spring-cloud sample with a HystrixCommand wrapper
2016-10-25 15:40:51 +02:00
wing328 14bca6cd89 [Java] BeanValidation + JAXRS CXF server generator (#4068)
* add pom-file to cxf including cxf-client #2017

* adapt pom sourceFolder in pom.mustache to gen/java #2017

* add test templates for CXF #2017

* optimize mustache template structure, remove tabs #3280 #2549

* refined dependency to swagger-jaxrs #2017

* refined annotations and line breaks #2549

* fix tabs instead of spaces...

* move annotations from getter to field for server model

* cleanup tabs

* add example for gzipping #2017

* add complete WAR to cxf-server #2017

* add readme + rework pom #2017

* add cli switch for beanvalidation #2549

* move beanvalidation into separate subtemplate and reuse for cxf

* add beanValidation java template

* corrected path to mustache file

* fix AbstractOptionsTest, add default false for USE_BEANVALIDATION

* add pom-file to cxf including cxf-client #2017

* adapt pom sourceFolder in pom.mustache to gen/java #2017

* add test templates for CXF #2017

* optimize mustache template structure, remove tabs #3280 #2549

* refined dependency to swagger-jaxrs #2017

* refined annotations and line breaks #2549

* fix tabs instead of spaces...

* move annotations from getter to field for server model

* cleanup tabs

* add example for gzipping #2017

* add complete WAR to cxf-server #2017

* add readme + rework pom #2017

* add cli switch for beanvalidation #2549

* move beanvalidation into separate subtemplate and reuse for cxf

* add beanValidation java template

* corrected path to mustache file

* fix AbstractOptionsTest, add default false for USE_BEANVALIDATION

* add beanvalidation to okhttp-gson library #2549

* cleanup api.mustache for cxf #3281

* temporary fix for invalid BeanValidation-pattern with / #2549

* temporary fix for invalid BeanValidation-pattern with / #2549

* remove jaxrs-annotations from implementation classes #3281

* add configuration to generate spring web application #4003

* clean up unnecessary @Path annotation (part of method level!)

* add support for minItems/maxItems #2549

* add support for BeanValidation for query params #2549

* add imports for bean validation #2549

* add switches for various cxf server features #2017

* fix tests #2549 #2017

* re-create bin folder

* cleanup

* cleanup

* Revert "temporary solution for pattern - move to AbstractJavaCodegen #2549"

This reverts commit 82df5e657f31303bcb7d38f1dc013183d3509da2, reversing
changes made to 65e87f23a6804a0d5c0926c916a9cd6866e7fee0.

Conflicts:
	bin/akka-scala-petstore.sh
	bin/android-petstore-all.sh
	bin/android-petstore-httpclient.sh
	bin/android-petstore-volley.sh
	bin/android-petstore.sh
	bin/aspnet5-petstore-server.sh
	bin/clojure-petstore.sh
	bin/cpprest-petstore.sh
	bin/csharp-dotnet2-petstore.sh
	bin/csharp-petstore-all.sh
	bin/csharp-petstore.sh
	bin/csharp-property-changed-petstore.sh
	bin/cwiki-petstore.sh
	bin/dart-petstore.sh
	bin/dynamic-html.sh
	bin/erlang-petstore-server.sh
	bin/flash-petstore.sh
	bin/flaskConnexion-python2.sh
	bin/flaskConnexion.sh
	bin/go-petstore-server.sh
	bin/go-petstore.sh
	bin/groovy-petstore.sh
	bin/haskell-servant-petstore.sh
	bin/html-petstore.sh
	bin/html2-petstore.sh
	bin/java-inflector-petstore-server.sh
	bin/java-petstore-all.sh
	bin/java-petstore-feign.sh
	bin/java-petstore-jersey1.sh
	bin/java-petstore-jersey2.sh
	bin/java-petstore-okhttp-gson-parcelable.sh
	bin/java-petstore-okhttp-gson.sh
	bin/java-petstore-retrofit.sh
	bin/java-petstore-retrofit2.sh
	bin/java-petstore-retrofit2rx.sh
	bin/java-undertow-petstore-server.sh
	bin/java8-petstore-jersey2.sh
	bin/javascript-closure-angular.sh
	bin/javascript-petstore-all.sh
	bin/javascript-petstore.sh
	bin/javascript-promise-petstore.sh
	bin/jaxrs-cxf-cdi-petstore-server.sh
	bin/jaxrs-cxf-petstore-server.sh
	bin/jaxrs-jersey1-petstore-server.sh
	bin/jaxrs-petstore-server.sh
	bin/jaxrs-resteasy-joda-petstore-server.json
	bin/jaxrs-resteasy-joda-petstore-server.sh
	bin/jaxrs-resteasy-petstore-server.sh
	bin/jaxrs-spec-petstore-server.sh
	bin/jmeter-petstore.sh
	bin/lumen-petstore-server.sh
	bin/nancyfx-petstore-server.sh
	bin/nodejs-petstore-server.sh
	bin/objc-petstore-all.sh
	bin/objc-petstore-coredata.sh
	bin/objc-petstore.sh
	bin/perl-petstore.sh
	bin/php-petstore.sh
	bin/python-petstore.sh
	bin/qt5-petstore.sh
	bin/rails5-petstore-server.sh
	bin/ruby-petstore.sh
	bin/run-all-petstore
	bin/scala-async-petstore.sh
	bin/scala-petstore.sh
	bin/scalatra-petstore-server.sh
	bin/security/csharp-petstore.sh
	bin/security/go-petstore.sh
	bin/security/java-petstore-okhttp-gson.sh
	bin/security/javascript-closure-angular.sh
	bin/security/javascript-petstore.sh
	bin/security/lumen-petstore-server.sh
	bin/security/objc-petstore.sh
	bin/security/perl-petstore.sh
	bin/security/php-petstore.sh
	bin/security/python-petstore.sh
	bin/security/qt5cpp-petstore.sh
	bin/security/ruby-petstore.sh
	bin/security/run-all-petstore-security-test
	bin/security/scala-petstore.sh
	bin/security/silex-petstore-server.sh
	bin/security/slim-petstore-server.sh
	bin/security/swift-petstore.sh
	bin/security/typescript-angular.sh
	bin/security/typescript-angular2.sh
	bin/security/typescript-fetch.sh
	bin/security/typescript-node.sh
	bin/silex-petstore-server.sh
	bin/sinatra-petstore-server.sh
	bin/slim-petstore-server.sh
	bin/spring-all-pestore.sh
	bin/spring-cloud-feign-petstore.sh
	bin/spring-mvc-petstore-j8-async-server.sh
	bin/spring-mvc-petstore-server.sh
	bin/spring-stubs.sh
	bin/springboot-petstore-server.sh
	bin/swift-petstore-all.sh
	bin/swift-petstore-promisekit.sh
	bin/swift-petstore-rxswift.sh
	bin/swift-petstore.sh
	bin/tizen-petstore.sh
	bin/typescript-angular-petstore.sh
	bin/typescript-angular2-petstore-all.sh
	bin/typescript-angular2-petstore-with-npm.sh
	bin/typescript-angular2-petstore.sh
	bin/typescript-fetch-petstore-all.sh
	bin/typescript-fetch-petstore-target-es6.sh
	bin/typescript-fetch-petstore-with-npm-version.sh
	bin/typescript-fetch-petstore.sh
	bin/typescript-node-petstore-all.sh
	bin/typescript-node-petstore-with-npm.sh
	bin/typescript-node-petstore.sh
	bin/typescript-petstore-npm.json
	bin/windows/akka-scala-petstore.bat
	bin/windows/android-petstore.bat
	bin/windows/aspnet5-petstore-server.bat
	bin/windows/async-scala-petstore.bat
	bin/windows/clojure-petstore.bat
	bin/windows/cpprest-petstore.bat
	bin/windows/csharp-petstore.bat
	bin/windows/dart-petstore.bat
	bin/windows/dynamic-html-petstore.bat
	bin/windows/flash-petstore.bat
	bin/windows/go-petstore.bat
	bin/windows/html-petstore.bat
	bin/windows/java-petstore-okhttp-gson.bat
	bin/windows/java-petstore.bat
	bin/windows/javascript-petstore.bat
	bin/windows/objc-petstore.bat
	bin/windows/perl-petstore.bat
	bin/windows/php-petstore.bat
	bin/windows/python-petstore.bat
	bin/windows/qt5cpp-petstore.bat
	bin/windows/rails5-petstore-server.bat
	bin/windows/ruby-petstore.bat
	bin/windows/scala-petstore.bat
	bin/windows/spring-mvc-petstore-j8-async-server.bat
	bin/windows/spring-mvc-petstore-server.bat
	bin/windows/springboot-petstore-server.bat
	bin/windows/swift-petstore.bat
	bin/windows/tizen-petstore.bat
	bin/windows/typescript-angular.bat
	bin/windows/typescript-angular2.bat
	bin/windows/typescript-fetch.bat
	bin/windows/typescript-node-with-npm.bat
	bin/windows/typescript-node.bat

* Revert "cleanup"

This reverts commit c752ba85d8a795ebcaf902a0eb06ab0c5755d128.

* Revert "re-create bin folder"

This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.

Conflicts:
	bin/windows/spring-mvc-petstore-j8-async-server.bat
	bin/windows/spring-mvc-petstore-server.bat
	bin/windows/springboot-petstore-server.bat

* Revert "re-create bin folder"

This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.

Conflicts:
	bin/windows/spring-mvc-petstore-j8-async-server.bat
	bin/windows/spring-mvc-petstore-server.bat
	bin/windows/springboot-petstore-server.bat

* re-create bin from master

* Revert "re-create bin from master"

This reverts commit d4b5c9aac54d62dfb3790c1bf2829472be2ec8fd.

* Revert "Revert "re-create bin folder""

This reverts commit 4369b35dbe9d21f8a93e7632fd92a9a760256db5.

* Revert "re-create bin folder"

This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.

* Revert "temporary solution for pattern - move to AbstractJavaCodegen #2549"

This reverts commit 82df5e657f31303bcb7d38f1dc013183d3509da2, reversing
changes made to 65e87f23a6804a0d5c0926c916a9cd6866e7fee0.

* correct @Path to re-activate Swagger support #

* change sourceFolder to default

* re-activate unittest generator + support gzip switch #2017

* add switch to support Spring Boot + integration tests

* add cxf client generator, rename cxf server generator #2017

* add interfaces for language feature support #4003

* add comments #2017

* correct reference to context.xml.mustache #4003

* use dynamic sourceFolder path #2017

* replace tabs with spaces #4003

* use hard-coded sourceFolder #4003

* rename language for backwards compatibility

* cleanup todo comment #4003

* move convertPropertyToBooleanAndWriteBack to DefaultCodegen #4003

* change reference to beanValidation.mustache to local copy for cxf

* cleanup client-side beanvalidation (currently not working in CXF)

* add support for tags #4003

* fix instantiiation of method parameters

* move commonValidationFeature from bus to endpoint #4003
2016-10-25 18:15:15 +08:00
wing328 37bb66c436 Merge branch 'throw-error-not-string' of https://github.com/mauricedb/swagger-codegen into mauricedb-throw-error-not-string 2016-10-25 16:47:13 +08:00
AndrewRademacher 40ec83a091 Fixed toUpper and toLower usage in haskell-servant gen. 2016-10-24 16:12:10 -05:00