12323 Commits

Author SHA1 Message Date
xhh
71a133dafe Merge remote-tracking branch 'origin/master' into ruby-nested-model-ref
Conflicts:
	samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
	samples/client/petstore/ruby/lib/petstore/api/store_api.rb
	samples/client/petstore/ruby/lib/petstore/configuration.rb
2016-02-18 21:13:37 +08:00
xhh
de463cf170 Merge branch 'master' into java-object-mapper-getter
Conflicts:
	samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
2016-02-18 20:57:22 +08:00
wing328
eec806b54e Merge pull request #2158 from xhh/java-improvements
[Java] Remove unused jackson imports from Java models
2016-02-18 20:49:21 +08:00
xhh
b9a6a9b6ce Java: add getter/setter for ApiClient#objectMapper
and ApiClient#httpClient as well.

Closes #2134
2016-02-18 20:17:42 +08:00
wing328
eecce8d2d0 Merge pull request #2170 from wing328/feature_all_models_postprocess
Add postProcessAllModels to default generator
2016-02-18 16:53:43 +08:00
wing328
0b125984da add postProcessAllModels 2016-02-18 16:15:15 +08:00
xhh
a21493f2db Ruby: fix class name reference of nested model
and model name in underscore format, e.g. "my_response".

Closes #2140
2016-02-18 15:29:31 +08:00
delenius
692c865c76 Handle empty response.body from superagent
Superagent does not always produce a `body`. See
http://visionmedia.github.io/superagent/ for details. When it
doesn't, we should deserialize the raw `response.text` rather
than returning `null`. Currently, the JS client always returns
`null` when the return type is String! This commit fixes
that.
2016-02-17 22:39:53 -08:00
wing328
61215f31fb Merge pull request #2167 from xhh/javascript-fixes
[JavaScript] Some bug fixes
2016-02-18 13:17:04 +08:00
wing328
c1b4f8df06 Merge pull request #2132 from jimschubert/csharp_35_client
[csharp] Initial settings for v3.5 client compatibility
2016-02-18 12:02:00 +08:00
Jim Schubert
702d019bf8 [maven plugin] Use configurator for maven plugin
see swagger-api/swagger-codegen#2104
2016-02-17 22:33:39 -05:00
xhh
bb70073ca3 JavaScript: fix call to buildCollectisnParam
Closes #2166
2016-02-18 10:31:21 +08:00
Jim Schubert
1d57e70e76 [csharp] Set RestSharp to 105.1.0 due to bug in newer versions 2016-02-17 13:31:50 -05:00
xhh
b2ed17e63e Remove unused jackson imports from Java models
by fixing the logic of enum Boolean checking.

Other changes:

* Remove the `true &&` prefix from the `equals` method in models.
* Apply some changes of Java-default to Java-okhttp-gson, i.e. adding
  `this` and parent model handling.
* Some improvements on spaces and blank lines.
2016-02-17 18:03:27 +08:00
wing328
c4d799a4a7 Merge pull request #2155 from wing328/multi_auth_setting
Add support for multi-authentication setting
2016-02-17 15:24:05 +08:00
wing328
56789393fa Merge pull request #2154 from wing328/csharp_dollar_sign
[C#] fix dollar sign in parameter name
2016-02-17 11:09:41 +08:00
wing328
97640e622a fix dollar sign in parameter name (C#) 2016-02-17 10:44:23 +08:00
Vivin Paliath
04c1940343 Fix for issue #2117
This change adds `this` to field names in `equals` within `pojo.mustache` so that an incorrect `equals` method is not generated in cases where a class has an internal field that is the same as the `classVarName` of the class.
2016-02-16 09:07:47 -07:00
wing328
a47cdddbeb Merge pull request #2056 from xhh/javascript-auth
[JavaScript] Add authentications support to JavaScript client
2016-02-16 22:08:50 +08:00
David Hontecillas
81ca40f661 Merge branch 'master' of https://github.com/dhontecillas/swagger-codegen 2016-02-16 14:06:30 +01:00
dhontecillas
71af74adf3 support changes in retrofit v2.0.0-beta4 2016-02-16 14:04:42 +01:00
wing328
4aa0dc5999 remove comment related to security warning (only 1st is used) 2016-02-16 20:58:18 +08:00
wing328
a87ce3181b Merge pull request #2125 from hideya/fix/objc-method-naming
[ObjC] Fix #2121, generated method names don't follow coding convention
2016-02-16 17:55:50 +08:00
wing328
a4825d8142 add multi auth setting (based on #1961) 2016-02-16 17:17:42 +08:00
xhh
7beb7373c2 Merge branch 'master' into javascript-auth
Conflicts:
	modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Javascript/api.mustache
2016-02-16 17:08:58 +08:00
Ron
812ff2f2c5 Merge pull request #2144 from foragerr/fix-typos
Fixed typo
2016-02-15 20:51:45 -08:00
Tony Tam
e5c5dced6c Merge pull request #1970 from evigeant/master
Allow maven-codegen-plugin to set additionalProperties even if cliOptions does not define them
2016-02-15 20:47:04 -08:00
RaGe
8d9b08bee1 fixed typo 2016-02-15 22:52:11 -05:00
hideya kawahara
753499e204 generated ObjC method names to follow Apple's coding convention 2016-02-16 10:55:36 +09:00
delenius
59931ef0f7 Correct exporting of enum classes
Fixes #2102.
2016-02-15 07:46:14 -08:00
wing328
516a9413a2 update pom.mustache and sample 2016-02-15 18:24:57 +08:00
xhh
908ab83d9b Java okhttp-gson: fix dependencies 2016-02-15 16:48:58 +08:00
wing328
af594ea652 Merge pull request #2076 from daveholladay/issue-1487
Fix #1487, TypeScript-Angular output path wrong if apiPackage not the…
2016-02-15 10:43:29 +08:00
wing328
f79ec39d8d Merge pull request #2082 from jhitchcock/feature/vendorExtensionsRoot
Add VendorExtensions to root swagger
2016-02-15 10:41:17 +08:00
wing328
a159998293 Merge pull request #2115 from delenius/enums
Use objects for enums, not constructor functions
2016-02-15 10:29:34 +08:00
wing328
5b0d8b1f13 Merge pull request #2114 from delenius/static-factories
Use static model factory methods
2016-02-15 10:13:09 +08:00
wing328
326ff340dc Merge pull request #2128 from who/master
Adding PATCH header override the default Java client
2016-02-15 10:03:57 +08:00
evigeant
bff0e2ad19 Fixed indentation to use spaces instead of tabs 2016-02-13 11:15:04 -05:00
Jim Schubert
0f6038f3b1 [csharp] Initial settings for v3.5 client compatibility
Pass -DtargetFramework=v3.5 to generate .NET 3.5 client
2016-02-13 10:55:54 -05:00
wing328
2fcbc38b67 fix objc binary mapping, add objc,swift to CI tests 2016-02-13 16:29:35 +08:00
Andrew B
a303a09749 Adding PATCH header override the default Java client 2016-02-12 18:52:49 -08:00
delenius
fa2333717a Use static model factory methods
The `constructFromObject` factory methods should be class methods
(or "static" methods), not instance methods.

With this commit, ApiClient no longer calls the model constructors
directly. Instead, it calls the new static factory method to get the
new instance. If there is no data on the top level, null is returned.

It is still possible for users to call the model constructors
directly, of course.
2016-02-12 07:54:04 -08:00
delenius
86154f87c3 Use objects for enums, not constructor functions
Fixes #2101.
2016-02-12 07:53:51 -08:00
wing328
874d9dc54a add uuid mapping to c# abstract base class 2016-02-12 17:15:53 +08:00
RaGe
21b1d19589 Closes #2118
Add basePath without url to jmeter sampler path
2016-02-12 00:07:58 -05:00
Michael Vorburger
698649f6fd build.gradle missing 2 libs (pom.xml has)
jackson-jaxrs-json-provider & com.brsanthu:migbase64 are missing from the build.gradle mustache template (but the pom.xml one has them)

PS: Why are there no automated tests that detect this?
2016-02-12 02:06:22 +01:00
wing328
b54947db86 Merge pull request #2112 from hideya/fix/swift-sanitize
[Swift] Fix #2095, missing sanitization for operationId
2016-02-11 21:17:01 +08:00
wing328
6dfc86f1d2 Merge pull request #2087 from delenius/optional-params
Fix handling of missing optional params
2016-02-11 19:16:39 +08:00
hideya kawahara
aa09678b51 add missing sanitization for operationId 2016-02-11 19:50:14 +09:00
wing328
d05596dad4 Merge pull request #2109 from wing328/perl_test_cases
[Perl] generate files for unit testing models and API files
2016-02-11 09:41:51 +08:00