Paul Ebermann
930c5191e0
Issue #1146 : trim string before escaping
...
This removes leading and trailing whitespace before escaping strings. This gets rid of annoying `\n` in some string literals (e.g. in annotations).
2015-08-28 19:56:37 +02:00
russellb337
5f811f3ba7
merge from upstream/master
2015-08-28 10:47:08 -07:00
Paul Ebermann
cdd104d3fb
Issue #1146 : escape the response description.
...
This prevents line breaks in string literals, which are not allowed in Java.
2015-08-28 19:39:01 +02:00
Paul Ebermann
be84f03d14
Issue #1146 : do not escape newlines in generated javadocs.
...
For this, we add a property `unescapedDescription` to CodegenModel + CodegenProperty, and use them for the Javadoc generation, while the annotation uses the escaped `description`.
2015-08-28 18:40:14 +02:00
wing328
28579cee03
Merge pull request #1135 from restlet/fix/nodejs_server_swagger_invalid_json
...
[Node.js] fix invalid JSON being generated in swagger.json
2015-08-28 18:31:39 +08:00
Paul Ebermann
32ffab4519
fix issue #1143 : add another null check.
...
The problem was trying to iterate over a null list.
2015-08-28 11:39:45 +02:00
wing328
e3c6cc3220
Merge pull request #1121 from Edubits/prevent-NPE
...
Fix possible NullPointerException
2015-08-28 16:05:20 +08:00
wing328
84346c0ba6
Merge pull request #1122 from F481/master
...
added some useful log/output messages and exception handling
2015-08-28 15:53:35 +08:00
russellb337
acbf3d3cc5
comment twak
2015-08-27 15:59:10 -07:00
russellb337
5c74146879
a few tweaks
2015-08-27 15:56:58 -07:00
russellb337
a59c128f90
curse you github desktop client for not refreshing when i want you to
2015-08-27 15:40:56 -07:00
russellb337
810bf58c3a
first draft of CodegenConfigurator
2015-08-27 15:40:33 -07:00
russellb337
074ba1ea54
undo some of the debugging changes I made
2015-08-27 09:11:49 -07:00
wing328
50f6067831
add a case to handle space in name
2015-08-27 16:47:41 +08:00
wing328
9453967815
add function to sanitize name
2015-08-27 16:14:07 +08:00
F481
fc4fce3731
write processOperation debug output only if the debugOperations property is set
2015-08-27 08:06:24 +02:00
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