xhh
8408a97aef
Java: Support special characters in enum values
...
and use upper case for enum names
Conflicts:
samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
2015-08-24 18:21:16 +08:00
Robin Eggenkamp
b3afbe73b9
[Swift] Add missing checks for usePromiseKit
2015-08-24 12:20:34 +02:00
Robin Eggenkamp
85aabbe810
Fix possible NullPointerException
...
getWrapped() returns a Boolean which can be null
2015-08-24 12:09:14 +02:00
Tony Tam
29a2eedc1e
java8 tag fixes
2015-08-24 01:04:33 -07:00
Tony Tam
617fa43a89
updated development version
2015-08-24 00:52:35 -07:00
Tony Tam
dd67287d63
updated development version
2015-08-24 00:51:18 -07:00
Tony Tam
9cc7615b71
rebuilt, updated versions
2015-08-24 00:32:58 -07:00
Tony Tam
715c0af41f
merged & rebuilt
2015-08-24 00:03:20 -07:00
Tony Tam
65829e5b6e
merged & rebuilt
2015-08-24 00:03:08 -07:00
Tony Tam
7c2310a13f
updated to jersey 1.18.1, fixes for #1115
2015-08-23 23:34:35 -07:00
Tony Tam
6dcb8da2d8
altered to return inner type only
2015-08-23 23:33:55 -07:00
Tony Tam
a83f01ad60
made string safe
2015-08-23 23:33:27 -07:00
wing328
164ed99812
fix serializableModel (boolean)
2015-08-24 11:50:21 +08:00
Tony Tam
35ed412d1e
moved file
2015-08-23 18:58:46 -07:00
Tony Tam
d51fe80138
Revert "fixed generated code to go to target/generated-sources, added maven-c…"
2015-08-23 18:28:42 -07:00
Tony Tam
ec9cdca7cb
Merge pull request #1109 from swagger-api/rebase-issue-838
...
update files as rebase from #838
2015-08-23 17:38:34 -07:00
Tony Tam
8a9f43b142
Merge pull request #910 from swagger-api/maven-plugin-configuration-improvements
...
Maven plugin configuration improvements
2015-08-23 17:33:55 -07:00
Tony Tam
0fc5702e4d
Merge pull request #1029 from swagger-api/jaxrs-server-codegen-improvements
...
fixed generated code to go to target/generated-sources, added maven-c…
2015-08-23 17:32:29 -07:00
Tony Tam
e19b883c89
Merge branch 'develop_2.0' of ssh://github.com/tiffanyperumpail/swagger-codegen into tiffanyperumpail-develop_2.0
2015-08-23 17:24:27 -07:00
Tony Tam
3d38c41b0e
resolved merge issue
2015-08-23 17:22:34 -07:00
Tony Tam
a6a9d743be
added template
2015-08-23 14:23:20 -07:00
Tony Tam
414de00894
fixed return type, rebuilt
2015-08-23 14:23:00 -07:00
Tony Tam
cc7366787f
Merge branch 'develop_2.0' of ssh://github.com/TobiasPfeifer/swagger-codegen into TobiasPfeifer-develop_2.0
2015-08-23 11:20:02 -07:00
Tony Tam
f7dc066dec
merged
2015-08-23 11:09:47 -07:00
Tony Tam
3160913433
update files as rebase from #838
2015-08-23 11:05:19 -07:00
Ole Lensmar
e253fdea33
Merge branches 'develop_2.0' and 'jaxrs-server-codegen-improvements' of https://github.com/swagger-api/swagger-codegen into jaxrs-server-codegen-improvements
...
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
2015-08-23 10:26:07 -04:00
Ole Lensmar
ac49d0dcdc
post-merge fixes
2015-08-23 09:37:28 -04:00
Ole Lensmar
b956d47a9d
Merge branches 'develop_2.0' and 'maven-plugin-configuration-improvements' of https://github.com/swagger-api/swagger-codegen into maven-plugin-configuration-improvements
...
Conflicts:
modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
2015-08-23 09:37:08 -04:00
wing328
f662699fd0
Merge pull request #1107 from wing328/php_fix_datetime
...
[PHP] Fixed deserialization for datetime object
2015-08-23 17:11:55 +08:00
wing328
1c1571cc3a
Merge pull request #1106 from geekerzp/python-query
...
[Python] Fix issue that missing query parameters in python client.
2015-08-23 17:11:19 +08:00
wing328
f2df26f6e6
fix deserializing datetime, add test case
2015-08-22 23:09:12 +08:00
xhh
569082743f
Remove the unused LibraryHelp command
2015-08-22 22:05:43 +08:00
xhh
595c01c537
Merge branch 'develop_2.0' into library-template-jersey2
...
Conflicts:
modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache
2015-08-22 21:53:04 +08:00
geekerzp
dc423cc11d
Fix issue that Mssing query parameters in python client.
2015-08-22 17:46:13 +08:00
Andrew B
4f25a0e6c5
adding an option so java models can implement Serializable
2015-08-21 18:36:03 -07:00
Tony Tam
44b4af0374
added check, fix for #1103
2015-08-21 15:02:56 -07:00
Tony Tam
07162811a7
fix for #1099 , added file check
2015-08-21 08:56:22 -07:00
wing328
4023460f2e
Merge pull request #1096 from geekerzp/objc-param-to-str
...
[Objc] Sanitize request parameters in objc client
2015-08-21 22:22:17 +08:00
wing328
83bea6a0c5
Merge pull request #1095 from who/fix_issue_1089
...
[Java] Sanitize configurable package names (fixes #1089 )
2015-08-21 22:15:53 +08:00
wing328
d03f680c64
Merge pull request #1090 from geekerzp/python-keyword
...
[Python] Change reserved word handling in python client.
2015-08-21 21:51:32 +08:00
geekerzp
4189d0765b
Update api body template of objc client
2015-08-21 11:40:59 +08:00
geekerzp
6218ad139f
Fix issue that it will throw error if not pass optional form param in objc client.
2015-08-21 11:20:29 +08:00
geekerzp
b7cd38d38b
Update objc client.
...
Sanitize request parameters (path, query, header, form, body).
2015-08-21 09:42:31 +08:00
Andrew B
2b61305582
Fixing issue #1089
2015-08-20 14:16:10 -07:00
wing328
2057d0e144
Merge pull request #1068 from Helmsdown/add-generated-annotation
...
Add @Generated annotation to all generated Java templates
2015-08-20 17:45:17 +08:00
xhh
af2ec4cf85
Merge branch 'develop_2.0' into library-template-jersey2
...
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
modules/swagger-codegen/src/main/resources/Java/api.mustache
2015-08-20 17:36:42 +08:00
wing328
9a239ad2a4
Merge pull request #1076 from DavidBiesack/static-html
...
improve static html; add template guards for collections.
2015-08-20 17:31:03 +08:00
wing328
a610fb5ac3
Merge pull request #1051 from who/develop_2.0
...
[Java] Fixing subClassed types so that they can use enums
2015-08-20 17:14:17 +08:00
geekerzp
6d58d44542
Merge branch 'ruby-api-client' into ruby-apiclient
2015-08-20 11:34:07 +08:00
xhh
0e2e7838ae
Merge branch 'bug-fix-ruby-file-upload' into ruby-api-client
...
Conflicts:
modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
samples/client/petstore/ruby/lib/petstore/swagger/request.rb
2015-08-20 11:24:33 +08:00
