7631 Commits

Author SHA1 Message Date
wing328
07c6fe9d0d Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-26 15:42:59 +08:00
wing328
e8063b0b5e add msf4j author 2016-10-26 14:41:44 +08:00
wing328
1c2a298ca0 Merge branch 'sanjeewa-malalgoda-msf4j' 2016-10-26 12:02:38 +08:00
wing328
983aec6250 add sample for java-msf4 2016-10-26 11:31:43 +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
d8d5b57262 Merge branch 'mauricedb-throw-error-not-string' 2016-10-25 16:52:50 +08:00
wing328
aa46aca7cf update JS petstore samples 2016-10-25 16:52:32 +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
Simon Morris
5855b479aa nancyfx basePath => modulePath toggle (#4053)
* fix NancyFX string parser

parser needs to access the Value parameter to enable the direct cast at line 102 when handling string parameters

* Updated nancyfx sample

* Added switch to config to toggle use of yaml base path as module paths
2016-10-24 23:07:16 +08:00
walthema
1e975637c9 Fixed enum marshalling & fromValue()
Added toString() to enums
2016-10-24 15:07:46 +02:00
sanjeewa-malalgoda
80bb564092 Introducing swagger MSF4J support for swagger code generator 2016-10-24 12:00:36 +05:30
Maurice de Beijer
75d04d8be7 Throw an Error object instead of a string 2016-10-23 17:15:15 +02:00
wing328
af16601654 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-22 23:08:36 +08:00
wing328
92c474b2c2 Merge pull request #4050 from mbohlool/issue2657
Fix sanitizeTag to retain numbers and underscore in tag names
2016-10-22 22:59:09 +08:00
Mathieu MARACHE
8bee0de4e9 [Qt5/C++] Arrays of primitive types fix (#4046)
* Corrects issue #3410 when trying to create Arrays of primitive types

* Use c++11 nullptr keyword and various indentation issues resolved

* ran petstore on new mustaches
2016-10-22 22:58:39 +08:00
Simon Morris
27be0ed197 fix NancyFX string parser (#4048)
* fix NancyFX string parser

parser needs to access the Value parameter to enable the direct cast at line 102 when handling string parameters

* Updated nancyfx sample
2016-10-22 22:53:56 +08:00
mbohlool
aeadd7678b Fix sanitizeTag to retain numbers and underscore in tag names 2016-10-21 14:00:57 -07:00
wing328
4f9ee0f93d Merge pull request #4035 from wing328/update_undertow_readme
[Java] Update undertow readme
2016-10-20 22:22:53 +08:00
wing328
a839a6803f Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-20 18:40:19 +08:00
wing328
9036dfdb3a [Typscript][Fetch] add configuration to support authentication (#4008)
* add configuration to typescript fetch

* fix issues reported by the CI

* fix header parameters in ts fetch client

* add new configuration file for ts fetch

* skip if check for configuration in ts fetch

* Fix `this.configuration` issue in paramsCreator

* update ts fetch samples

* Fix typescript fetch tests to work with Configuration

* Add dictionary to store apikeys (#8)

* Add dictionary to store apikeys

* Type apikey with expected params rather than Dictionary - typescript-fetch

* Update test samples to new typescript-fetch api

* Fix tests for typesript-fetch api

* update typescript sample using petstore.yaml
2016-10-20 18:38:32 +08:00
wing328
d6197faca3 Merge pull request #4041 from wing328/jersey2_java6
[Java][Jersey2] add CI tests for Java client (jersey2, java6)
2016-10-20 11:28:42 +08:00
wing328
d1eca76974 add test for java6 jersey2 client 2016-10-20 11:12:31 +08:00
scannerscan
aeb33e4b6e hashCode and equals support for jdk6 for jersey2 (#4039) 2016-10-20 10:20:12 +08:00
raj k
23fee386f2 Vendor Mime-type support in retrofit2 2016-10-19 16:19:41 -07:00
Ragnis Armus
c73e499c5d [Qt5 C++] Actually use the model name prefix in the Qt5 generator (#3981)
* Actually use the model name prefix

* Update the petstore sample
2016-10-19 23:08:14 +08:00
wing328
f70569987a Merge branch 'Ragnis-fix-model-package' 2016-10-19 16:43:53 +08:00
wing328
bbb0cdc8c3 update gitignore to include PetStore.pro.user 2016-10-19 16:43:11 +08:00
wing328
b688a7f443 Merge branch 'fix-model-package' of https://github.com/Ragnis/swagger-codegen into Ragnis-fix-model-package 2016-10-19 16:38:13 +08:00
wing328
e458b5c13a Merge branch 'Ragnis-fix-api-paths' 2016-10-19 16:35:22 +08:00
wing328
7f36dd7852 increase timeout value for qt5 petstore test 2016-10-19 16:34:26 +08:00
wing328
5c129b2869 Merge branch 'fix-api-paths' of https://github.com/Ragnis/swagger-codegen into Ragnis-fix-api-paths 2016-10-19 16:26:17 +08:00
wing328
91923311e0 update undertow readme 2016-10-19 16:23:18 +08:00
wing328
c7efb7000c Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-19 15:45:15 +08:00
k1w1m8
60a52ee729 Java6 support for jersey2 (#4033) 2016-10-19 10:45:14 +08:00
wing328
c3a12cb3f9 Merge pull request #4027 from diega/patch-1
[java] Allow setting test folder
2016-10-18 23:22:09 +08:00
Diego López León
c26833fd64 [java] Allow setting test folder
To keep consistency between `sourceFolder` and `testFolder` access
2016-10-18 09:28:30 -03:00
wing328
f3456007c6 Merge pull request #4024 from wing328/fix_3846
[Ruby][Sinatra] Fix reserved word handling in model file name
2016-10-18 19:47:23 +08:00
wing328
b50b33e891 fix reserved word handling in model name (sinatra) 2016-10-18 18:51:08 +08:00
wing328
5e7fa144bf Merge pull request #4023 from wing328/fix_3846
[Sinatra][Dart] better handling of reserved words for sinatra, dart generators
2016-10-18 18:22:36 +08:00
wing328
702344ed75 better handling of reserved words for sintatra, dart 2016-10-18 17:58:19 +08:00
wing328
52ffc7869e improvements based on #3568 (#4021) 2016-10-18 16:32:35 +08:00
Jim Schubert
6a7b9240a2 [csharp] add missing anchor tags in readme (#4019) 2016-10-18 10:15:03 +08:00
Martin
727038a186 Issue 3651 (#4014)
* added method summary under the method name

* added batch file for html2 generation on windows

* regenerated html2 example

* changed the html2 windows batch to use yaml instead of json and regenerated sample

* fixed encoding issues
2016-10-17 22:48:12 +08:00
mn288
66215f7a28 Added company (#4015)
Added carpolo as a project using Swagger
2016-10-17 19:58:10 +08:00
Jim Schubert
689da8f915 [csharp] Fix apiPackage,modelPackage,excludeTests (#4010)
* [csharp] Fix apiPackage,modelPackage,excludeTests

The apiPackage, modelPackage, and excludeTests values were not being
populated correctly from external configs (passing -c filename to
generator).

This commit allows those properties to work correctly with the Csharp
client generator. Previously the Api and Model namespaces were hard
coded after additionalProperties for these were evaluated.

The files which generate test files for models and api classes
didn't honor the excludeTests option.

* [csharp] Regenerate sample

* [csharp] Fix modelPackage in README template
2016-10-17 16:26:28 +08:00