Commit Graph

2841 Commits

Author SHA1 Message Date
wing328
e0b16151f4 better model name for perl 2016-03-04 14:39:28 +08:00
wing328
ae54301ed7 better model name for php 2016-03-04 14:26:28 +08:00
wing328
adc4547c8c Merge pull request #2299 from neoasket/issue-2094
issue-2904 mark 'findMethodResponse' method in DefaultCodegen.java as 'protected'
2016-03-04 12:57:01 +08:00
xhh
9b4b0111ad Merge branch 'master' into ruby-object-tests 2016-03-04 12:45:42 +08:00
wing328
f08dfa4cbc Merge pull request #2300 from xhh/js-model-name-prefix-suffix
[JavaScript] Add model name prefix/suffix to JavaScript client
2016-03-04 12:39:51 +08:00
wing328
c51f4c629e to fix #2306 2016-03-04 12:08:57 +08:00
wing328
a92a9f2a03 Merge pull request #1990 from expectedbehavior/php-raw-string
[PHP] Use String instead of Byte Array
2016-03-04 10:57:59 +08:00
wing328
1e4fb0ec96 Merge pull request #2301 from wing328/update_test_file
Update wording for test files
2016-03-04 10:23:13 +08:00
Elijah Miller
74536af3b9 Map binary to string in PHP since ByteArray is no longer in use. 2016-03-03 11:01:13 -05:00
Elijah Miller
6698c532e6 Keep PHP binary responses as strings for easier manipulation. 2016-03-03 11:01:13 -05:00
Alex Kalashnikov
0911b373de describing @param and @return for 'findMethodResponse' method 2016-03-03 16:57:40 +04:00
xhh
8e4f9fdc7c Add test cases for empty "object" type to Ruby Petstore
And fix the deserialization of empty "object" property
2016-03-03 20:36:15 +08:00
wing328
7e63226ed4 update wording for test file, minor tweats to petstore test 2016-03-03 20:19:37 +08:00
xhh
e420bfd49e Add model name prefix/suffix to JavaScript client 2016-03-03 18:04:37 +08:00
wing328
d2bb505147 Merge pull request #1752 from justusth/master
Csharp Enums
2016-03-03 18:00:36 +08:00
Tommy Alander
e649ab1101 indent code 2016-03-03 10:33:16 +01:00
Tommy Alander
033b9871b3 fix the useage of the cli option for emitdefaultvalues and verify that it works 2016-03-03 10:27:42 +01:00
wing328
1f2026576f Merge pull request #2297 from xhh/object-without-properties
Do not generate models for "object" type with no properties
2016-03-03 17:10:34 +08:00
Tommy Alander
e23626b05c Merge remote-tracking branch 'main/master' into jmaster 2016-03-03 09:23:50 +01:00
Tommy Alander
2d6dac16b7 add cli option to specify if to emit default values in datamember 2016-03-03 08:32:23 +01:00
wing328
d28f860343 Merge pull request #2202 from traviscollins/master
Added discriminator support to Objective-C
2016-03-03 14:25:07 +08:00
Alex Kalashnikov
20bf205451 adding @javadoc to 'findMethodResponse' method 2016-03-03 10:15:44 +04:00
Alex Kalashnikov
7817ff5f3d mark 'findMethodResponse' method in DefaultCodegen.java as 'protected' to make it possible to override for handling custom response codes 2016-03-03 09:23:55 +04:00
xhh
f9cc29fb74 Update petstore to use an inline model for testing
and add test cases to Java clients for "object" type with no properties.
2016-03-03 12:48:44 +08:00
Tommy Alander
cb6a71ae89 Merge remote-tracking branch 'main/master' 2016-03-02 19:48:58 +01:00
xhh
7bea6da587 Do not generate models for "object" type with no properties
Also updated the petstore sample to include operations to cover the case
in model property and response, and updated Java clients to sync with
it.

Closes #2237
2016-03-02 21:12:27 +08:00
wing328
18262c1b61 Merge pull request #2256 from hiveship/fix-cxf-codegen
Fixes for JAXRS-CXF Codegen
2016-03-02 20:49:48 +08:00
wing328
78f1c7a601 Merge pull request #2294 from wing328/swift_reserved_word
[Swift] improvements to model
2016-03-02 18:08:33 +08:00
wing328
a57bc98f59 Merge pull request #2295 from neilotoole/issue-2292
Re #2292 : The generated API should now return an err for non-2xx status codes
2016-03-02 17:48:49 +08:00
Neil O'Toole
a108c6311a Re #2292 : The generated API should now return an err for non-2xx status codes, though the functionality to return an error object per the swagger is not yet implemented. 2016-03-02 01:49:59 -07:00
wing328
cff259f489 add prefix, suffix to swift model 2016-03-02 16:34:27 +08:00
wing328
057e1d4c4b proper indention for swift generator 2016-03-02 15:46:24 +08:00
Tommy Alander
cd0c99655c Merge remote-tracking branch 'main/master' 2016-03-02 08:41:01 +01:00
Thomas Gilbert
785136e991 Use baseName instead of paramName when generating APIs 2016-03-02 08:14:11 +01:00
wing328
336d80cbf3 Merge pull request #2289 from neilotoole/issue-2285
Several minor fixes in the Go client code generator for Camelization of elements
2016-03-02 13:58:17 +08:00
wing328
4bcd81a329 Merge pull request #2286 from xhh/clj-api-name
[Clojure] Improve api name for the Clojure client
2016-03-02 11:16:56 +08:00
Neil O'Toole
54b4da2872 Several minor fixes in the Go client code generator for Camelization of elements per #2285 2016-03-01 09:52:44 -07:00
delenius
067d0a9318 Remove toJson method from JS client
Also regenerates the petstore samples.
2016-03-01 07:41:31 -08:00
Viktor Zeman
42a3f184ff Add option to set request timeout for Javascript request 2016-03-01 13:33:13 +01:00
xhh
09a2bb8b0f Improve api name for the Clojure client
For example, when an operation's tag is "users-api", "users_api" or
"UsersApi", generate the api file named users_api.clj and "users-api"
as the namespace (it was "usersapi.clj" and "usersapi" before).

To implement this, I have to move the "sanitizeTag" method from
DefaultGenerator.java to DefaultCodegen.java so that its behaviour can
be overridden in ClojureClientCodegen.java, which is needed as the
default implementation would sanitize "users-api" to "usersapi" before
the tag is passed to "toApiName" and "toApiFilename".
2016-03-01 18:50:56 +08:00
Maelig Nantel
081c29c984 fix sample generation 2016-03-01 11:25:29 +01:00
wing328
ea3232cb08 Merge pull request #2284 from xhh/java-file-date-model-name-fix
[Java] Fix invalid imports when model name prefix/suffix is present
2016-03-01 18:09:32 +08:00
wing328
9aa59b92bc Merge pull request #2271 from timbogit/fixes/clojure_generator_api_filename
Fix for clojure API filenames
2016-03-01 17:24:36 +08:00
Tommy Alander
cbbc2cf5ae Merge remote-tracking branch 'main/master' 2016-03-01 09:05:13 +01:00
xhh
74fedfcf20 Java: fix invalid imports when model name prefix/suffix is present
When generating Java clients with mode name prefix/suffix given, there
are invalid imports on Date and File, e.g. for the Petstore sample
(with model name prefix set to "My" and suffix set to "Model"):

    import io.swagger.client.model.MyfileModel;
    import io.swagger.client.model.MyDateModel;

This commit fixes it to:

    import java.io.File;
    import java.util.Date;
2016-03-01 15:01:10 +08:00
xhh
b7280d0af8 Support model prefix/suffix in Android client 2016-03-01 12:30:24 +08:00
xhh
8e937bd0a8 Merge branch 'master' into java-local-var 2016-03-01 12:06:44 +08:00
xhh
665ffa355b Android: add localVar prefix for "response" and "builder" 2016-03-01 12:04:46 +08:00
wing328
6657434b08 Merge pull request #2168 from jimschubert/maven_plugin_configurator
[maven plugin] Use configurator for maven plugin
2016-03-01 11:31:01 +08:00
xhh
cc08be6eda Fix concurrent_unit_version in android-volley build.gradle
Closes #2228
2016-03-01 10:50:41 +08:00
Tommy Alander
e5f55da74e add hack to make enums nullable 2016-02-29 18:42:35 +01:00
Tommy Alander
8492802328 use nullable types for enums 2016-02-29 15:28:09 +01:00
Tommy Alander
61c1f72b0e use correct datatype with enums 2016-02-29 12:37:26 +01:00
xhh
75c2cc9029 Android client: better local variable naming
and fix the importing of Long and Byte
2016-02-29 18:27:23 +08:00
wing328
3106cadaf7 Merge pull request #2273 from xhh/java-local-var
[Java] better local variable naming for Java clients
2016-02-29 18:20:52 +08:00
wing328
d665903b3f Merge pull request #2149 from dhontecillas/master
support latest Retrofit 2 v2.0.0-beta4
2016-02-29 18:05:14 +08:00
wing328
9cdd5323ea Merge pull request #2270 from wing328/ruby_prefix_suffic
[Ruby] add prefix, suffix support to Ruby's model
2016-02-29 17:03:35 +08:00
wing328
b5b8b4de20 fix file mapping in ruby 2016-02-29 16:44:04 +08:00
Tommy Alander
84fb351c7c fixes after merge 2016-02-29 08:46:07 +01:00
Tommy Alander
a2be66d492 Merge remote-tracking branch 'main/master' 2016-02-29 08:24:31 +01:00
xhh
9b229de79f Java clients: better local variable naming 2016-02-29 13:23:56 +08:00
wing328
74d91f4ea1 add prefix, suffix to ts model 2016-02-29 12:11:54 +08:00
Tim Schmelmer
14ed683f9a Fix for clojure API filenames whenthe API is more than one word (as clojure filenames have to replace dashes with underscores) 2016-02-28 21:07:55 -07:00
wing328
6c16c10166 add prefix, suffix support to ruby 2016-02-29 11:14:32 +08:00
wing328
9f3c34dbfa Merge pull request #2267 from wing328/objc_model_prefix
[ObjC] add prefix and suffix support to ObjC models
2016-02-28 18:49:50 +08:00
wing328
f3a1f829d0 Merge pull request #2266 from wing328/php_better_local_var
[Ruby][Python][PHP] better local variable naming for ruby, python and php
2016-02-28 18:23:11 +08:00
wing328
742e3f5070 remove 'method' from python api 2016-02-28 16:51:50 +08:00
wing328
17a93dd5ce add prefix and suffix to objc model 2016-02-28 16:15:44 +08:00
wing328
dfa977627a better reserved word for objc 2016-02-28 15:52:51 +08:00
wing328
f68e93c662 better local variable naming for ruby, python and php 2016-02-28 11:48:14 +08:00
wing328
335a881091 Merge pull request #2264 from wing328/csharp_enhancement_variable
[C#] better local variable naming for C# API client
2016-02-28 11:44:40 +08:00
wing328
8a68a64609 Merge pull request #2261 from wing328/php_model_name_improve
[PHP][Python][Perl] add prefix/suffix support to model name
2016-02-28 11:28:26 +08:00
wing328
7adc7516cf Merge pull request #2262 from Glagnar/issue-2084
Issue 2084
2016-02-28 10:55:49 +08:00
wing328
b077ff18a2 better local variable naming for C# 2016-02-28 02:15:29 +08:00
wing328
72843adae2 Merge pull request #2244 from hideya/feature/2120
Fix #2120, #2157 - Update Swift API method generation for ease of use
2016-02-28 01:09:28 +08:00
Thomas Gilbert
a817772e25 Fix comment typo 2016-02-27 15:46:38 +01:00
Thomas Gilbert
805433a22e Better handling of variable and parameter names 2016-02-27 15:31:40 +01:00
wing328
5db16325d4 update perl model to support prefix and suffix 2016-02-27 21:47:07 +08:00
hideya kawahara
9ee154c13a Make {{projectName}}API namespace for API classes optional 2016-02-27 19:38:12 +09:00
wing328
28769ac671 add prefix and suffic support to php and python models 2016-02-27 18:30:56 +08:00
Vivin Paliath
c3c73b8dae issue #1347
This is a fix to support enums in query parameters. Enum-related information was not being stored on `CodegenParameter` previously; it is now. Test cases have been added to make sure that the enum information is being properly processed from the model.
2016-02-26 08:37:09 -07:00
wing328
029912b25d Merge pull request #2249 from Mindera/master
Fix for #2100 - List<String> being generated as List<Enum>
2016-02-26 22:34:29 +08:00
wing328
c74ea674e0 Merge pull request #2257 from xhh/js-reserved
[JavaScript] Handle reserved operationId/model name in JS client
2016-02-26 21:27:56 +08:00
David Hontecillas
0fe8f7e375 fix build.gradle template for retrofit2 2016-02-26 13:34:57 +01:00
xhh
432fb84a06 Handle reserved operationId/model name in JS client 2016-02-26 19:56:52 +08:00
Paul Ebermann
36f7ffd6eb [feature #1255] make JavaClientCodegen.toModelName independent from super implementation.
As pointed out in the review, using a super.toModelName call makes future changes harder
to review, therefore we are implementing the addition of suffix and prefix here again.

In addition, I fixed the FIXME about assigning the parameter.
2016-02-26 11:31:37 +01:00
Paul Ebermann
70bcf22c82 [feature #1255] fix import problem pointed out during review.
Instead of declaring `Map` and `List` as primitive (which caused them
to be not imported anymore), now we exclude them from the model name
transformation in `JavaClientCodegen.getSwaggerType`.
2016-02-26 11:20:20 +01:00
Paul Ebermann
0ee77636a3 [feature #1255] Java: Use super.toModelName to allow prefix/Suffix addition.
This allows using the model name prefix and suffix parameters also in Java generators.
We add List and Map to the "language specific primitives" so they don't get mangled
by the suffixes/prefixes in `getSwaggerType`
2016-02-26 11:20:20 +01:00
Jim Schubert
087b9118c1 [feature #1255] support model name prefix + suffix also for C#.
AbstractCSharpCodegen does override toModelName, which made the change
to DefaultCodegen have no effect.
2016-02-26 11:20:19 +01:00
Jim Schubert
a6f3914a92 [feature #1255] prefix and suffix for model names.
This implements the command line arguments `--model-name-prefix` and `--model-name-suffix`
for all languages which do not override `DefaultCodegen.toModelName()`.
This fixes most of swagger-api/swagger-codegen#1255.

Connection to the maven plugin works with additional-properties, a more explicit
parameter waits for swagger-api/swagger-codegen#2168.
2016-02-26 11:20:19 +01:00
Paul Ebermann
98c5e70f7c [feature #1255] Start of an implementation of model name prefix + suffix.
This is just the implementation in DefaultCodegen and some configurator stuff,
the connection to command line arguments is still missing.
2016-02-26 11:20:19 +01:00
Maelig Nantel
37e62b89bc Fixes for JAXRS-CXF Codegen 2016-02-26 10:56:26 +01:00
Mkhail Khlundev
f3a3a0211b clearing -Dapis correctly. Travis, it's the last time, I sweargit add src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java 2016-02-26 11:31:38 +03:00
Mkhail Khlundev
d84b565069 kicking ci 2016-02-26 10:36:46 +03:00
xhh
35079fedef Merge branch 'master' into java-reserved-operation-id
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
2016-02-26 11:34:47 +08:00
xhh
dd3a06560d Case-insensitive checking on reserved words 2016-02-26 11:21:54 +08:00
hideya kawahara
ac3ab477d3 Update Swift API method generation for ease of use 2016-02-26 09:21:30 +09:00
Mkhail Khlundev
cd0c0276dc kicking ci 2016-02-25 23:54:00 +03:00
Mkhail Khlundev
d2a0a7b59b kicking ci 2016-02-25 23:16:43 +03:00
Bruno Lopes
4e411a0e64 Fix for #2100 - List<String> being generated as List<Enum> 2016-02-25 19:43:10 +00:00
Mkhail Khlundev
49f56c9e23 issue #1875 fixing -Dapis= work for -l html, provding test. 2016-02-25 22:42:40 +03:00
David Hontecillas
6788c89816 fix templates for retrofit2rx and build.gradle 2016-02-25 17:00:56 +01:00
wing328
da0dc0f80a add test cases for csharp model 2016-02-25 23:37:13 +08:00
wing328
41c0034794 Merge pull request #2243 from wing328/python_better_reserved_word
[Pytthon] better reserved word handling for objc
2016-02-25 22:46:08 +08:00
wing328
2d4ccbfd79 add test case to python, better resered word handling for objc 2016-02-25 20:09:58 +08:00
David Hontecillas
006092f453 removed end of line spaces 2016-02-25 12:23:27 +01:00
wing328
005584cf2a Merge pull request #2240 from wing328/csharp_better_reserved_word
[C#] add better reserved keyword handling for c#
2016-02-25 17:04:44 +08:00
xhh
6b6f0df985 Handle reserved operationId/modelName in Java/Android clients 2016-02-25 16:28:11 +08:00
wing328
700a157b40 Merge pull request #2236 from hideya/fix/2156
Fix 2156 - Use fixed date/time in operation.examples to avoid unnecessary diffs
2016-02-25 16:02:14 +08:00
wing328
329223f364 add better reserved keyword handling for c# 2016-02-25 15:35:05 +08:00
wing328
a351724365 Merge pull request #2239 from wing328/php_reserved_words
[PHP] better reserved words handling for method and model names
2016-02-25 15:06:14 +08:00
wing328
b20c90a346 Merge pull request #2238 from xhh/ruby-empty-reserved-operation-id
[Ruby] Handle empty/reserved operation id
2016-02-25 14:51:58 +08:00
wing328
7b42624a86 log message for writeOptional, better handling of model name for php 2016-02-25 14:37:21 +08:00
xhh
748c032d41 Ruby client: handle reserved words for model names 2016-02-25 14:36:47 +08:00
wing328
6962947611 better handling of model (reserved keyword) 2016-02-25 14:16:40 +08:00
wing328
4e034d3dc5 better reserved word handling for php 2016-02-25 13:16:54 +08:00
xhh
52c9d67025 Update petstore spec and fix tests 2016-02-25 12:20:17 +08:00
wing328
b5ba52111d Merge pull request #2229 from xhh/js-optional-params
[JavaScript] Support optional parameters with object syntax
2016-02-25 11:53:56 +08:00
xhh
84c6b869f8 Ruby client: handle empty/reserved operation id
by using a normalized one instead of throwing errors
2016-02-25 11:48:30 +08:00
wing328
484ed848ac Merge pull request #2230 from wing328/perl_reserved_word
[Perl] better handling of reserved keyword in Perl
2016-02-25 10:26:53 +08:00
hideya kawahara
a13bba5dc5 Use fixed date/time in operation.examples to avoid unnecessary diffs 2016-02-25 11:20:30 +09:00
wing328
b561acb966 Merge pull request #2220 from xhh/java-exception-javadoc
[Java] Add ApiException to javadoc
2016-02-24 22:40:35 +08:00
wing328
a65e6dbd0a Merge pull request #2226 from wing328/model_more_boolean_flag
Add more boolean flags to CodegenProperty
2016-02-24 22:06:19 +08:00
wing328
2ed02ee187 better handling of reserved keyword in perl 2016-02-24 21:57:29 +08:00
xhh
baf5d2895e JS client: support optional parameters with object syntax
Closes #2027
2016-02-24 20:55:46 +08:00
wing328
3cfb110f6d fix javadoc erorr in CI 2016-02-24 17:44:19 +08:00
wing328
7fb41048dd add boolean flag to codegen parameter 2016-02-24 17:00:33 +08:00
xhh
c2fbe349ab JS client: handle reserved words for property name
Closes #2040
2016-02-24 13:12:49 +08:00
wing328
961ee39760 rename to bytearray, add check for boolean, bytearray and binary 2016-02-24 10:39:18 +08:00
wing328
6ae6fe10ec Merge pull request #2218 from wing328/csharp_test_readonly
[C#] add test case, update c# model constructor
2016-02-24 10:27:33 +08:00
wing328
23696c5eb3 Merge pull request #2210 from svenluzar/master
ApiClient Bugfix: containsString removed to support iOS 7
2016-02-24 00:31:55 +08:00
wing328
67d0916c50 add more boolean flag 2016-02-23 23:17:53 +08:00
wing328
a1e15adb8f add required property check to aspnet5 model constructor 2016-02-23 20:39:32 +08:00
xhh
37c77d63c2 Java client: add ApiException to javadoc
and some indentation fixes
2016-02-23 20:09:46 +08:00
wing328
eed91d335d remove exception comment on model constructor to avoid compile warning 2016-02-23 19:32:49 +08:00
wing328
82d7c2d780 add test case, update c# model constructor to remove readonly property 2016-02-23 19:16:26 +08:00
wing328
0520e68e29 Merge pull request #2206 from xhh/java-readonly
[Java] Do not generate setter method for readonly properties
2016-02-23 16:20:32 +08:00
Jim Schubert
6f32600e9e [maven plugin] Fix typo in comment on CodegenConfiguratorUtils 2016-02-22 22:00:33 -05:00
Sven Luzar
4baa7c01b0 ApiClient Bugfix: containsString removed to support iOS 7 2016-02-22 13:39:21 +01:00
xhh
909d1b537b Support readonly properties for Java retrofit clients 2016-02-22 19:00:57 +08:00
xhh
b8beca7f24 Java: do not generate setter for readonly properties 2016-02-22 15:50:43 +08:00
wing328
5160ce9ac1 use case insensitive sort 2016-02-22 14:39:09 +08:00
wing328
0ba123d60f Merge pull request #2196 from swagger-api/issue-2190
added sort
2016-02-22 14:28:15 +08:00
Travis Collins
6a1f3f45b1 Added discriminator implementation by overriding NSDictionary initWithDictionary and returning the appropriate class. 2016-02-21 22:08:49 -05:00
xhh
8c36ed8409 Merge branch 'master' into java-imports
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
2016-02-22 09:24:58 +08:00
wing328
b3b4670055 add exception comment, minor enhancement to param description 2016-02-21 23:31:19 +08:00
wing328
d42f23f829 update test case, minor fix to required property in c# 2016-02-21 23:09:56 +08:00
wing328
890b7d17e3 add readonly property support to C# 2016-02-21 22:36:04 +08:00
wing328
95ec991c52 add exception comment 2016-02-21 18:54:13 +08:00
wing328
10caf449fb Merge pull request #2195 from swagger-api/issue-2193
added folder to writeOptional
2016-02-21 18:13:29 +08:00
wing328
093448f724 Merge pull request #2192 from tonicospinelli/php-client
avoid inner class
2016-02-21 17:50:21 +08:00
Tony Tam
671c5880b9 added sort 2016-02-20 21:09:27 -08:00
Tony Tam
fc56546d34 added folder to writeOptional 2016-02-20 20:55:20 -08:00
Antonio Spinelli
43f917493d add new tests for naming model class
fix #2191
PR #2192
2016-02-21 01:47:04 -03:00
Antonio Spinelli
1446f4a13e remove support to inner class
fix #2191
PR #2192
2016-02-21 01:33:01 -03:00
Antonio Spinelli
bab40566bc remove $ from class name
it is cased because the property start with underscore and
object is created on th fly

fix #2191
2016-02-19 22:56:19 -02:00
wing328
f27d2534a6 update php readme 2016-02-19 23:37:35 +08:00
wing328
bb59ad95cf add readme and travis 2016-02-19 22:08:58 +08:00
wing328
56c4de2180 map $ to value for parameter/property name 2016-02-19 19:39:53 +08:00
wing328
a14015c1c7 Merge pull request #2174 from xhh/java-object-mapper-getter
[Java] Add getter/setter methods for objectMapper and httpClient in ApiClient
2016-02-19 18:31:01 +08:00
xhh
7296da7bc3 Fix tests by upgrading libraries 2016-02-19 17:48:59 +08:00
xhh
a892511b1f Add missing libs to Java jersey2 client 2016-02-19 13:24:16 +08:00
delenius
5e7dc29b1a Add single quotes around default string values 2016-02-18 19:42:40 -08:00
wing328
84b4af7bfb Merge pull request #2169 from xhh/ruby-nested-model-ref
[Ruby] Fix class name reference of nested model
2016-02-19 11:29:58 +08:00
xhh
d810434d17 Merge branch 'master' into java-object-mapper-getter 2016-02-19 11:06:36 +08:00
wing328
531d6e5249 Merge pull request #2143 from delenius/empty-objects
Do not create empty objects in model constructors
2016-02-19 11:06:33 +08:00
wing328
5b8d75b8f6 Merge pull request #2119 from vorburger/patch-1
build.gradle missing 2 libs (pom.xml has)
2016-02-19 10:14:35 +08:00
delenius
079addb6db More fine-grained fix
Instead of just ignoring default values in the generated
model constructors, we modify the generator code in Java.
The template checks for null before outputting a default value.
2016-02-18 11:12:01 -08:00
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
delenius
c7766457bd Don't set missing optional params in models
Fixes #2103.

In the constructFromObject methods, we were always setting all the
parameters, including optional ones that were missing in the `data`
object. Because of the `convertToType` calls, this had the effect
of producing the *strings* `"undefined"` or `"null"` as property
values on the constructed object! This obviously leads to difficult
bugs.

This commit makes sure that we first check that the data field
exists in the data object. Note that both `null` and `undefined`
values will be skipped.
2016-02-10 17:18:31 -08:00
wing328
fdaf1e6236 Merge pull request #2078 from delenius/omit-model-methods
Add option to omit getters/setters on models
2016-02-11 09:10:40 +08:00
wing328
f50174e950 Merge pull request #2077 from spotby/swift-java-date
adding support for java dates
2016-02-11 09:03:19 +08:00
wing328
3d9a331666 automaticallay generate test cases for Perl 2016-02-11 08:24:51 +08:00
Tony Tam
54e78bd533 added builders 2016-02-10 15:40:47 -08:00
Tony Tam
ab5ca625c1 added example property 2016-02-10 15:28:00 -08:00
Tony Tam
cb196eb351 set example when defined 2016-02-10 15:25:51 -08:00
Tony Tam
3282c1f325 formatting 2016-02-10 14:42:28 -08:00
Tony Tam
06fcb95f64 removed println 2016-02-10 13:17:33 -08:00
Tony Tam
1a9cb4488a added writeOptional method to avoid clobbering files 2016-02-10 12:10:02 -08:00
delenius
722fbe606c Add option to omit getters/setters on models 2016-02-10 08:35:51 -08:00
wing328
f53abf7d8e Merge pull request #2083 from wing328/csharp_minor_fix
[C#] minor fix to documentation comment in Configuration class
2016-02-10 22:33:43 +08:00
wing328
e7b18a04d9 Merge pull request #2062 from jimschubert/csharp_common
[csharp][aspnet5] AbstractCSharpCodegen base
2016-02-10 21:33:30 +08:00
Tatsuki Sugiura
a442e1a60d ruby: Fix boolean convertion on json to model attribute.
Current code will converts boolean true of json to false
because ruby's boolean is not matched with any regex.
2016-02-10 15:06:31 +09:00
wing328
3ba4cd1409 Merge pull request #2090 from jaz-ah/issue-1994
[Swift] fix issue 1994: make sure we don't crash if rawValue returns …
2016-02-10 13:54:57 +08:00
wing328
62e3bf2543 Merge pull request #1993 from jaz-ah/issue-1992
[Swift] fix issue 1992 - ensure that our variable names don't match the names…
2016-02-10 13:45:53 +08:00
Joseph Zuromski
694d735edc [Swift] fix issue 1994: make sure we don't crash if rawValue returns nil when trying to create an enumeration - instead return nil which allows the instance variable to be nil in this case (it will still try to unwrap the optional though if you declare the enumeration as a required property)
note: there aren't really any tests I can add to validate this since the service is always returning valid enumerations. but I did update the sample code.
2016-02-09 12:59:14 -08:00
Jim Schubert
37d07e1012 [csharp][aspnet5] AbstractCSharpCodegen base
This moves a bit of logic into a base type to prevent lots of
duplicates.

I've only converted csharp and aspnet5 generators, not csharp 2.0.

This base class should provide enough flexibility to support other C#
based client and server generators.
2016-02-09 12:37:59 -05:00
David Keene
cdc9fb5f5e fixing var name 2016-02-09 09:33:10 -08:00
wing328
a36966d961 Merge pull request #1991 from jaz-ah/issue-1989
[Swift] fix issue 1989: generate AnyObject type from json object type instead…
2016-02-10 00:42:39 +08:00
delenius
d56d626450 Remove wildcards from imports 2016-02-09 07:50:12 -08:00
delenius
dd29cf9d53 Use defaultValue for the usePromise CliOption 2016-02-09 07:35:45 -08:00
wing328
fed231c46d fix documentation comment in Configuration class (C#), make
compile-mono permission executable
2016-02-09 22:13:47 +08:00
unknown
2e1e0be2d5 Add VendorExtensions to root swagger 2016-02-09 13:45:12 +01:00
delenius
aab96ec772 Remove unused callback param when using promises 2016-02-08 23:39:05 -08:00
delenius
e825b953f7 Add usePromise parameter to JS client 2016-02-08 19:15:00 -08:00
David Keene
16f1f74019 adding support for java dates 2016-02-08 16:47:58 -08:00
Dave Holladay
9673b878a8 Fix #1487, TypeScript-Angular output path wrong if apiPackage not the default 2016-02-08 22:54:45 +00:00
Tony Tam
e99e322198 adde Date mapping, escape operationId 2016-02-08 13:48:46 -08:00
Tony Tam
802f9e4424 revert to Object when model missing 2016-02-08 13:48:20 -08:00
Matan Goldman
341f862569 change the order of the elif inside to_dict for better performance (dictionary/additionalProperties is less probable) 2016-02-07 21:46:33 +02:00
Matan Goldman
2ddbfa8218 Now it should be fully compatible with python 2.7 and 3.4 2016-02-07 21:46:33 +02:00