5177 Commits

Author SHA1 Message Date
ClayAtWork
504f8f1f21 2208 fix Objc Mapping Generation (#3894)
* Change test to test valid compileable code. This is not a Objective-C Generic, but a protocol. This is what the JSONModel mapping library expects

* Update implementation to properly render NSDictionaries that will work with JSONModel
2016-10-11 11:45:59 +08:00
wing328
d921a2b0c5 Merge branch 'resteasy_dates' of https://github.com/cbornet/swagger-codegen into cbornet-resteasy_dates 2016-10-11 00:51:34 +08:00
wing328
ba3f2eafd5 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-10-11 00:48:08 +08:00
wing328
671f73b97f Merge branch 'jersey_dates' of https://github.com/cbornet/swagger-codegen into cbornet-jersey_dates 2016-10-11 00:47:02 +08:00
Christophe Bornet
6f2c139ff8 [Spring] Format datetime in rfc3339 (#3777)
* [spring-boot] format datetime in rfc3339

See #3727

* [spring-mvc] format datetime in rfc3339
2016-10-11 00:43:28 +08:00
Christophe Bornet
2680995825 [Java/Jackson] use a jdk6 compatible DateFormat for java.util.Date (#3768)
* [feign] use a jdk6 compatible serializer for java.util.Date

See #3727

Fix #3753

* [jersey] use a jdk6 compatible DateFormat for java.util.Date
2016-10-11 00:42:52 +08:00
wing328
21dec4dbbc Merge branch 'gson_date' of https://github.com/cbornet/swagger-codegen into cbornet-gson_date 2016-10-11 00:32:20 +08:00
Stas Shakirov
26faf6cf4e remove newline char in *.mustache; added generated code 2016-10-10 14:42:08 +03:00
Nick Maynard
dc2b8c29e2 Add a new JAX-RS server generator - jaxrs-cxf-cdi (#3940)
* Generate a JAX-RS server that assumes an Apache CXF framework on a Java EE server supporting CDI

* Samples for jaxrs-cxf-cdi

* Don't refer to missing class NotFoundException

* Update samples without missing NotFoundException reference
2016-10-10 17:18:27 +08:00
Stas Shakirov
1006b0ca0a added package paths for retrofit class names 2016-10-10 09:57:28 +03:00
wing328
0712ebc33d Merge pull request #3954 from jimschubert/aspnet/3680
[aspnet] Fix .sln/.xproj guids
2016-10-10 09:17:49 +08:00
Jim Schubert
a94a27307d [aspnet] Fix .sln/.xproj guids
The AspNet5 generator was originally written to support project.json.
The Project.xproj was implemented without a valid project guid or root
namespace. During the transition period from project.json to
Project.xproj, VS2015 would fallback to project.json. Newer versions of
VS2015 don't seem to do this any longer.

This commit defines the project's guid correctly, and sets the project's
root namespace.

See: #3680
2016-10-09 08:31:35 -04:00
wing328
c1a6bbb86a [Python][Flask] fix python2 support in Flask (#3952)
* flask python2 petstore sample

* fix python2 support in flask
2016-10-09 14:06:55 +08:00
wing328
666c885f72 Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2016-10-09 12:26:46 +08:00
wing328
59ec339679 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-09 12:26:29 +08:00
Andreas Franzén
d21613c6ab Bugfix/3929 do not set multipart (#3932)
* Do not set Content-Type to multipart/form-data
It causes superagent to not add the boundary in the Content-Type

* Run shell-scripts
2016-10-08 12:36:56 +08:00
wing328
b09f4b66ff remove dateOfBirth from petstore.json 2016-10-07 16:48:01 +08:00
Jason Gavris
f639a312e8 [Swift] Use ISOFullDate for date format 2016-10-07 16:46:16 +08:00
wing328
65f925f45c fix python required property check and validation for optional properties 2016-10-07 15:50:57 +08:00
vishal khawarey
0ca60352e2 required tag is used in model, allows null values (#3923)
* required tag is used in model, allows null values

* updated petstore api for CI

* dont raise exception for 0 or false
2016-10-07 15:26:05 +08:00
wing328
7aaa837d82 Merge pull request #3941 from wing328/swfit_fix_num_enum
[Swift] support number value for enum
2016-10-07 11:27:55 +08:00
wing328
574349570a fix number format for dart model 2016-10-07 00:47:05 +08:00
wing328
81a2b2c36f support number enum for swift 2016-10-07 00:20:50 +08:00
sylvain-abadie
94cd2cb6a0 [Objc] Added support for lower case discriminator (#3927)
* [Objc] Added support for lower case discriminator

* Updated Objc petstore samples

* Fixed code style
2016-10-06 23:29:55 +08:00
wing328
24b1dc87c1 Merge pull request #3903 from alexandern/issue-3829
Issue#3829. Objective-C client code, discriminator generated in both …
2016-10-06 23:28:46 +08:00
wing328
cd6b5fec20 [Android][Volley] add serializeModel support to Android (#3933)
* add serializeModel support to Android

* add test for new android option
2016-10-06 17:35:33 +08:00
Jonathan Leitschuh
40610373f6 Update JavaJaxRS/resteasy/api.mustache to have swagger annotations (#3924)
* Update JavaJaxRS/resteasy/api.mustache to have swagger annotations

The annotations should now appear on generated resteasy API classes.

* Re-generate resteasy petstore sample

* Add swagger-annotations to rest-easy samples as a dependency

* Regenerat pom.xml and build.gradle files for resteasy
2016-10-06 13:18:50 +08:00
wing328
6ef0209dea add back java okhttp petstore client 2016-10-05 22:55:01 +08:00
wing328
8ce8082f7f fix bug with parcelable 2016-10-05 22:54:17 +08:00
Griffin Schneider
0844496bad [Java] Fix bug in generated code if parcelableModel and serializableModel are both true. 2016-10-05 22:53:05 +08:00
Griffin Schneider
1aeceead99 [Java] Make generated models Parcelable for okhttp-gson if the -DparcelableModel=true option is provided. 2016-10-05 22:53:05 +08:00
wing328
71b2d5c942 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-05 16:07:18 +08:00
wing328
677f5f913f Merge pull request #3909 from apanzerj/apanzerj/fixupRails5Server
WIP: Fixup rails5 server
2016-10-05 01:16:47 +08:00
Adam Panzer
2aadbee8ed
validate(s)_presence_of
Migration should create pluralized table names
Change controller filenames
2016-10-03 14:47:01 -07:00
wing328
00cc060827 Merge pull request #3637 from cbornet/fix_multi_inheritance
[All] Fix some inheritance/composition issues and add allOf unit tests
2016-10-03 23:18:43 +08:00
Miguel García
e633073082 Add a new cli command to output version information (2nd attempt) #3892 (#3899)
* Properly git-ignore all nbactions.xml files.

* Add a command line action to print the program version (#3892).

I am using maven resource filtering capabilities so that an existing version.properties resource file
gets filtered upon build and populated with the project version tag. This resource is then read
at runtime as required.

* Using a different version tag when unreadable.
2016-10-03 17:14:54 +08:00
wing328
1840956320 Merge pull request #3913 from wing328/python_flask_no_tags
[Python][Flask] fix python flask controller issue without tag
2016-10-03 09:56:49 +08:00
wing328
4a74e788ec fix python flask controller without tag (default_controller) 2016-10-03 09:32:20 +08:00
Jim Schubert
b7708a44bf [aspnet5] Fix basePath application to operations (#3911)
* [aspnet5] Fix basePath application to operations

* [aspnet5] Regenerate sample
2016-10-02 21:56:19 +08:00
wing328
a6287bed1d Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2016-10-02 17:24:37 +08:00
wing328
62b6cf4609 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-02 17:24:17 +08:00
Bartek Kryza
40a1879797 Bugfix/issue 3723 (#3726)
* Extended request generation logic with support for serialized body content types other than Json

* Updated the Petstore Python client tests

* Fixed body content type identification for strings
2016-10-02 17:02:03 +08:00
Charles
d4f9a16cf6 Cgardens nested object regex (#3879)
* stop parsing key of object at first comma.

* update samples
2016-10-02 16:32:17 +08:00
Scott Richter
b2e2643fd2 [Cpprest] Fixing issue #3773 (#3876)
* Fixed errors with cpprest client generation when generating a client that uses arrays of primitive types (vector) and file responses (HttpContent).

* Updated the petstore sample using script.

* Removed debug code.

* Removed extra newline to match master.

* Fixed binary file handling in cpprest. Updated petstore samples.

* Update readme to add Cummins to list

* Cleaning up for pull. Removing unnecessary changes.

* Fixing petstore

* Fixing error in build.

* Fixed error in stream copy for binary data

* Replaced tab with 4 spaces in all modified files.

Replaced tab with 4 spaces in all modified files.
2016-09-30 10:31:24 +08:00
Alex Nolasco
07df71e959 Issue#3829. Objective-C client code, discriminator generated in both base and child. 2016-09-29 09:28:44 -04:00
wing328
f59c28d08a escape callback parameter for java(okhttp) and python 2016-09-29 17:41:47 +08:00
Dalibor Karlović
19f1c7e095 feature(PHP QA) add initial PHP client template tweaks to improve emitted code quality 2016-09-29 08:48:24 +02:00
wing328
a7ed1ad202 fix warning in html generator 2016-09-29 11:09:54 +08:00
Cédric Luthi
4325e5cca1 [objc] Remove the custom security policy
There are several issues with the security policy:

* The security policy is created with `AFSSLPinningModeNone` which means that even if pinned certificates are set (if config.sslCaCert is not nil), they will be ignored. Pinning will not work at all with this security policy.

* The configuration wrapper for the security policy is a bad idea.
  * `verifySSL` controls both invalid certificates and domain validation. A vanilla `AFSecurityPolicy` clearly exposes both `allowInvalidCertificates` and `validatesDomainName`.
  * `sslCaCert` only allows for a single pinned certificate. A vanilla `AFSecurityPolicy` clearly exposes a set of pinned certificates and makes it very convenient to load them with either `+[AFSecurityPolicy policyWithPinningMode:]` or `+[AFSecurityPolicy certificatesInBundle:]`

Since the security policy does not work at all and adds confusion, it is better to just remove it and let the user configure a security policy that fits their needs.
2016-09-29 00:23:22 +02:00
Dalibor Karlović
10d3dea89e [PHP] fix PHPUnit invocation, add basic phpunit.xml.dist (#3864)
* feature(phpunit) fix PHPUnit invocation, add basic phpunit.xml.dist

* fix(phpunit) add proper paths relative to phpunit.xml.dist
2016-09-28 19:44:07 +08:00