russellb337
60fddcf378
adding back imports that somewhere got deleted during reformatting
2015-08-26 17:55:02 -07:00
russellb337
1378976d37
merging upstream changes
2015-08-26 17:40:49 -07:00
russellb337
e5811ebdc7
expose more generate options in the cli
2015-08-26 17:38:51 -07:00
Hugo Wood
d434b7c440
fix invalid JSON being generated in swagger.json of Node.js server
2015-08-26 17:34:53 +02:00
wing328
1996aa9244
Merge pull request #1126 from xhh/java-enum-refactor
...
[Java] Support special characters in enum values
2015-08-26 16:41:56 +08:00
wing328
f79f8895c5
Merge pull request #1125 from wing328/php_param_name
...
[PHP] add camelCase support for variable naming
2015-08-26 09:49:08 +08:00
Tony Tam
15e336b90a
Merge pull request #1123 from wing328/python_typo
...
[Python] better wording for documentation
2015-08-24 07:18:42 -07:00
wing328
a43d2163a0
add camelCase support for php variable naming
2015-08-24 21:53:28 +08:00
b_sapir
564dffa7e8
Merge remote-tracking branch 'origin/binary' into binary
...
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
modules/swagger-codegen/src/main/resources/Java/api.mustache
2015-08-24 16:15:18 +03:00
wing328
68f61d9a37
use snake_case instead of under_score
2015-08-24 21:11:52 +08:00
wing328
2251a2f892
fix typo, update documentation for python lib
2015-08-24 21:08:21 +08:00
b_sapir
b0c776bbea
Support binary input and output - fix some merge problems
2015-08-24 15:59:58 +03:00
F481
3d89399b58
fixed syntax error
2015-08-24 14:28:13 +02:00
F481
0261121d78
added some useful log/output messages and exception handling
2015-08-24 14:04:50 +02:00
b_sapir
c177cf75d2
Support binary input and output (for body parameters or responses with type "string" and format "binary". Implemented for Java.
2015-08-24 15:04:10 +03:00
b_sapir
d4b4fe4b47
Support binary input and output (for body parameters or responses with type "string" and format "binary". Implemented for Java.
2015-08-24 14:33:15 +03:00
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
85aabbe810
Fix possible NullPointerException
...
getWrapped() returns a Boolean which can be null
2015-08-24 12:09:14 +02: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
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
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
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
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
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
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
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
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
e02a9f1797
Merge branch 'develop_2.0' into ruby-api-client
2015-08-20 11:10:25 +08:00
geekerzp
894d571ea5
Change reserved word handling in python client.
...
* First, remove the beginning underscores.
* Then, append underscore if the var is reserved word or number.
2015-08-19 18:05:47 +08:00
wing328
dc1992ad45
Merge pull request #1081 from wing328/php_var_name_number
...
[PHP, Perl, Silex] fixed variable names starting with number, made LOGGER protected
2015-08-19 14:56:13 +08:00
wing328
c62fca8c54
Merge pull request #1079 from wing328/add_flash_generator
...
[Flash] Add back Flash generator
2015-08-18 20:04:53 +08:00
geekerzp
a481db7486
Add configuration object in ruby client
2015-08-18 14:27:09 +08:00
