Commit Graph

1603 Commits

Author SHA1 Message Date
Tony Tam
9f842a1295 added environment variable support 2015-10-22 14:34:52 -07:00
Tony Tam
723cf9b823 made selective generation of models 2015-10-22 14:03:44 -07:00
Cristian Trifan
2fcb705826 Update TypeScriptAngularClientCodegen.java
Fix minor typo
2015-10-22 23:19:46 +03:00
David Greenberg
390ddc9ef3 Changing Stream deserialization to use raw bytes from response, rather than UTF-8 decoded text. 2015-10-22 09:04:54 -04:00
wing328
4723f51c63 Merge pull request #1397 from lugaru1234/issue1251
Fixes #1251, #1212: Form parameters has been added to the html template
2015-10-22 16:48:13 +08:00
Richard Hunt
f44eb766b4 Replace File.separator with '/' to fix Windows path generation and avoid regular expression issues 2015-10-22 15:54:28 +13:00
Ampem Darko
1ac6842b5a Update mustache template to pass hashes in TO_JSON and from_hash 2015-10-21 16:15:42 +00:00
wing328
0f75b053c8 Merge pull request #1417 from akkie/master
ApiException doesn't use deserialized data
2015-10-21 19:13:18 +08:00
wing328
eee69f1e05 Merge pull request #1416 from xhh/java-do-not-serialize-nulls
[Java] Ignore null fields in model serialization in Java clients
2015-10-21 19:00:09 +08:00
akkie
9b8a633435 ApiException doesn't use deserialized data
This is a fix for #1394. I had not merged the data correctly after the rebase
2015-10-21 12:56:15 +02:00
Tony Tam
dcc47a92b5 added https support 2015-10-20 21:25:51 -07:00
Tony Tam
e9aaa6da36 enabled https 2015-10-20 21:25:35 -07:00
Tony Tam
568a7be994 enabled https 2015-10-20 21:25:21 -07:00
xhh
214e0186e8 Ignore null fields in model serialization
in Java clients.

Closes #1413
2015-10-21 12:05:27 +08:00
Tony Tam
bade71c6ba merged 2015-10-20 10:59:20 -07:00
Tony Tam
10a9c62e2b merged 2015-10-20 10:57:36 -07:00
Tony Tam
19ea3ecf66 update test for inline body param flattening 2015-10-20 08:48:44 -07:00
Tony Tam
5c29562926 ensure body params are flattened when type ModelImpl 2015-10-20 08:48:26 -07:00
Tony Tam
b827d06077 fix for npe on map models 2015-10-20 08:48:04 -07:00
Tony Tam
539496d735 rebuilt 2015-10-20 07:10:05 -07:00
wing328
6b7059d23f Merge pull request #1394 from akkie/api-exception-json
Deserialize the response body in case of an ApiException
2015-10-20 18:01:09 +08:00
wing328
bff8f96b99 Merge pull request #1404 from tomekc/swift-enhanced
Add default initializer to Swift model classes.
2015-10-20 17:54:41 +08:00
Tony Tam
aaf1df1971 more flattening fixes 2015-10-19 23:10:48 -07:00
Tony Tam
555fd54fbb updated swagger-core versions 2015-10-19 22:09:33 -07:00
Tony Tam
905a7746e7 updated test 2015-10-19 21:45:47 -07:00
Tony Tam
eeaf4071f9 updated to not flatten array, map properties in responses unless necessary 2015-10-19 21:35:45 -07:00
Robin Eggenkamp
1b0963ebe0 Minimal changes to upgrade to Alamofire 3.0.0 2015-10-19 17:06:41 +02:00
akkie
b054cd3cc6 Deserialize the response body in case of an ApiException
Currently it's not possible to use custom models in the ApiException because the body gets not deserialized to Json and therefore the object deserializer cannot deserialize it to a custom model. This pull request uses the same mechanism as used to deserialize the response body in case of a 2xx status code.
2015-10-19 15:17:29 +02:00
Tony Tam
002feb3e7c build error 2015-10-18 21:10:13 -07:00
Tony Tam
89dc4d29ab added map support 2015-10-18 21:05:57 -07:00
Tony Tam
3cf1f1a56a added support for array and model inline types 2015-10-18 20:51:55 -07:00
Nick Bruno
b83db8e535 Merge remote-tracking branch 'upstream/master' into add-auth-annotations-jaxrs 2015-10-18 17:19:44 -04:00
wing328
eb1e0b5034 Merge pull request #1408 from kkrauth/patch-1
Fix syntax issue when no auth methods defined
2015-10-18 16:34:11 +08:00
wing328
e8fbdaabe3 replace tabs with spaces 2015-10-17 16:44:55 +08:00
wing328
b82333aea4 Add support for top-level consumes and produces
This reverts commit 0b4b5e8839.
2015-10-17 16:30:19 +08:00
Nick Bruno
6477a27579 Update SpringMVC template to include Authorization annotations 2015-10-16 21:24:17 -04:00
Tony Tam
ad1626ad2d added yaml sample 2015-10-16 18:22:13 -07:00
Tony Tam
bfa4303e6e added inline model resolver 2015-10-16 18:21:34 -07:00
Tony Tam
9508579eed added inline resolver 2015-10-16 18:21:06 -07:00
Steffen Furholm
8bc4c1f05e Allow overriding of only some templates when using --template-dir option. Templates which aren't found in the template directory will fall back to the ones packaged/distributed with Swagger 2015-10-16 23:29:08 +02:00
Kosta Krauth
9ac980298f Fix syntax issue when no auth methods defined
When no authentication methods are defined, the generated code does not compile due to where the authMethods closing tag is located. Moved the closing tag further down and opening tag further up so that the generated code is correct both when authentication are and aren't present.
2015-10-16 16:45:34 -04:00
wing328
a2fda604f8 Merge pull request #1396 from akkie/disable-ssl-verification
Allow to disable SSL verification
2015-10-16 21:08:31 +08:00
Tomek Cejner
8339e4b092 Add default initializer to Swift model classes. 2015-10-16 14:09:55 +02:00
wing328
90eab19305 Merge pull request #1401 from xhh/ruby-base-url-slashes
Ruby client: remove trailing slashes from base_url
2015-10-16 19:32:13 +08:00
cbornet
3debd08a32 remove useless import 2015-10-16 12:47:25 +02:00
cbornet
92d1e8a1d9 use StringUtil to format csv 2015-10-16 12:21:45 +02:00
cbornet
71c5160739 add colllectionFormat support to retrofit
Fix #1364
2015-10-16 12:21:45 +02:00
Nadezhda Makarkina
3dd0b04fb9 Enums have been added to result file 2015-10-16 11:53:05 +03:00
Nadezhda Makarkina
04369ddfce Form parameters has been added to the html template 2015-10-16 10:33:56 +03:00
wing328
084e7f7199 Merge pull request #1380 from xhh/java-global-security
Apply global security to operations when necessary
2015-10-16 12:50:41 +08:00
wing328
ab026fdde3 Merge pull request #1393 from gwen15/genfix
REST client code generation bug fix proposal
2015-10-16 12:42:32 +08:00
xhh
e0dfc1b43d Ruby client: remove trailing slashes from base_url
Closes #1399
2015-10-16 12:02:30 +08:00
wing328
d5e2aea723 Merge pull request #1375 from xhh/issue-1308
Remove duplicate fields from sub-classes of the Java codegen
2015-10-16 12:02:25 +08:00
Nat Luengnaruemitchai
7db67aa192 add library in the additional option 2015-10-15 20:44:27 -07:00
xhh
02a9fe2618 Add more test cases for global security 2015-10-16 10:30:26 +08:00
akkie
97a5a8922f Allow to disable SSL verification
This pull request adds the possibility to disable SSL verification for hosts using a self-signed SSL certificate
2015-10-15 16:07:35 +02:00
gwen15
0802f94d94 Bug fix: some character replacement where done on the local directories
names.

The dot character was replaced by the file separator on the whole paths,
not only on the package name based part.
2015-10-15 12:35:23 +02:00
gwen15
21eb406140 Fix default long value in java client code generation
The generated java code for a Long was "Long id=1;" which is not
compilable by javac because "1" is a primitive integer that cannot be
cast to a Long object. This fix generates now "Long id=1l;".
2015-10-15 12:35:16 +02:00
xhh
84928abd8d Merge branch 'master' into java-global-security 2015-10-15 17:57:27 +08:00
xhh
1c21730607 Log a warning on more than 1 security requirements 2015-10-15 17:56:38 +08:00
xhh
5a76a1b155 Fix tests regarding security 2015-10-15 16:51:43 +08:00
xhh
bc5a610567 Use the first security requirement from the array
According to swagger spec, "there is a logical OR between the security
requirements". The original behavior was to apply the security
requirements as the logic AND and skip security requirements that
include more that 1 security.
2015-10-15 15:17:30 +08:00
wing328
860b551e9b Merge pull request #1376 from xhh/java-util-model-package
[Java] Add a config option to use fully qualified name for java.util classes
2015-10-15 12:12:37 +08:00
wing328
22218cb132 Merge pull request #1378 from xhh/java-invalid-enum-name
[Java] Handle enum names starting with number in Java client
2015-10-15 10:51:03 +08:00
Nick Bruno
300a0dc82c Update retrofit library for changes to OAuth scope handling 2015-10-14 22:50:58 -04:00
xhh
a94384ca7f Merge branch 'master' into java-util-model-package 2015-10-15 10:38:19 +08:00
xhh
6d50ce6a77 Fix a typo 2015-10-15 10:34:45 +08:00
wing328
583493f5ca Merge pull request #1377 from cbornet/java_gradle_android
Add gradle files with android support to java templates
2015-10-15 10:28:28 +08:00
Nick Bruno
6cc17d8508 Add authorization scope data to CodegenSecurity, demo use in JAXRS 2015-10-14 22:07:43 -04:00
wing328
265b4b5945 Merge pull request #1385 from aersamkull/master
Updates to TypeScript Templates 2
2015-10-15 09:46:46 +08:00
xhh
65e63a8c52 Merge remote-tracking branch 'origin/master' into java-global-security 2015-10-14 20:42:20 +08:00
xhh
e4e77d03f5 Add test cases for global security 2015-10-14 20:40:10 +08:00
wing328
0b4b5e8839 Revert "Add support for top-level consumes and produces" 2015-10-13 23:47:42 +08:00
wing328
c7b08bc112 Merge pull request #1373 from estiller/master
Fix bug in handling 204 "No Content" responses from the server in Android & Java generated clients
2015-10-13 22:47:47 +08:00
wing328
f1b0cf839a Merge pull request #1370 from wing328/global_consume
Add support for top-level consumes and produces
2015-10-13 22:35:33 +08:00
aersamkull
988de07c17 Fixes noImplicitAny Error 2015-10-13 13:32:01 +02:00
aersamkull
4e7d893a8e Updates to TypeScript Templates 2015-10-13 12:01:34 +02:00
xhh
1ef51e5ad7 Apply global security to operations when necessary
Closes #1365
2015-10-13 16:22:02 +08:00
xhh
17545e959a Handle enum names starting with number in Java client 2015-10-13 10:32:07 +08:00
cbornet
5ed52b3e1d add gradle files with android support 2015-10-12 16:16:38 +02:00
xhh
7b1799f874 Merge branch 'master' into java-util-model-package
Conflicts:
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.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-10-12 17:11:43 +08:00
xhh
43b3acf550 Remove duplicate fields from sub-classes of the Java codegen
Closes #1308
2015-10-12 17:07:17 +08:00
wing328
d162d48fa3 Merge pull request #1359 from wing328/better_exception_handling2
Better exception handling
2015-10-12 16:58:01 +08:00
Eran Stiller
e562b0ae34 Fix indentation 2015-10-12 09:52:20 +03:00
Eran Stiller
6fd54d5285 Fix bug in handling 204 responses 2015-10-12 08:51:00 +03:00
wing328
00517a1ad3 remove unused operation in test json file 2015-10-10 23:27:21 +08:00
wing328
5cd01af350 fix typo in test cases 2015-10-10 23:22:42 +08:00
wing328
64fd94262f add globalConsumesAndProduces.json 2015-10-10 22:54:13 +08:00
wing328
5144c54895 add test case for global consumes and produces 2015-10-10 22:47:24 +08:00
wing328
9311dcaccb update codegen to support global consumes and produces 2015-10-10 18:39:54 +08:00
xhh
aa0fbada07 Add a "fullJavaUtil" option to Java clients
to toggle whether to use full qualified name (with full package prefix)
for classes under java.util
2015-10-09 22:10:22 +08:00
xhh
edf2642e73 Support model name like "List" in Java clients
Support generating model files with name like "List", "Map" and "Date"
by using full qualified names when using them from the java.util
package.
2015-10-09 22:10:21 +08:00
wing328
d95660aca1 Merge pull request #1340 from onnertech/ios-tweaks
[objc] Add casts that avoid method resolution errors for `count`
2015-10-09 16:44:54 +08:00
wing328
42b716207f Merge pull request #1360 from wing328/nodejs_server_port
[NodeJS] update index.js to use the var serverPort
2015-10-09 11:32:01 +08:00
wing328
7d69107696 Merge pull request #1356 from arnested/deserialize-httpHeader
Deserialize httpHeader.
2015-10-09 11:31:24 +08:00
wing328
8e9e3a6171 update nodejs to use the var serverport 2015-10-08 23:52:41 +08:00
wing328
6ee42bebe6 add exception handling for #1267 2015-10-08 23:38:09 +08:00
wing328
d451d4efb8 fix NPE when model's allof with no property 2015-10-08 23:38:09 +08:00
Arne Jørgensen
b7b8b527db Use HTTP headers from ApiException in PHP client.
The `$httpHeader` variable was not set when catching exceptions.

See also #1354.

Regenerated php-petstore sample.
2015-10-08 11:46:36 +02:00
Arne Jørgensen
3bd4502bbf Deserialize httpHeader.
See #1354.

Regenerated php-petstore sample.
2015-10-08 11:25:43 +02:00
Tony Tam
733e19c113 fixed NPE for objc client 2015-10-07 17:11:52 -07:00
wing328
735cae7b49 Merge pull request #1335 from wing328/html_remove_site_css
[HTML] remove site.css from html docs
2015-10-07 16:26:53 +08:00
wing328
3b36bbe97d Update README.mustache 2015-10-06 18:39:44 +08:00
wing328
228e039046 Merge pull request #1333 from wing328/csharp_fix_accept
[C#] better Accept header selection for C# API client
2015-10-06 18:26:02 +08:00
wing328
f8485f26d3 Merge pull request #1317 from cbornet/online_options
Add options to online generator
2015-10-06 12:00:51 +08:00
Ches Martin
d9117480f8 [objc] Add casts that avoid method resolution errors
Because the `data` that we're deserializing is of type `id` (essentially
untyped), it's possible to have method resolution clashes without
explicitly casting here once we've parsed a type. I had this issue with
a pagination container model, for instance, which has a field named
`count` that conflicts with the property of the same name on `NSArray`
or `NSDictionary`.
2015-10-06 10:58:48 +07:00
wing328
dbd89092f0 add accept header select to async method 2015-10-06 11:30:17 +08:00
wing328
6ed7663466 add remarks to csharp method 2015-10-06 11:28:18 +08:00
wing328
d882e9fe0a remove site.css from html docs 2015-10-05 22:33:25 +08:00
wing328
ea1c2809f7 Merge pull request #1329 from iushankin/issue-1304-part3
Fixed #1304: Migrate tests from the Scala to the plain Java. Part 3
2015-10-05 18:29:36 +08:00
wing328
3c78e29a12 better Accept header for C# 2015-10-05 13:19:58 +08:00
wing328
65a9c78544 Merge pull request #1319 from cbornet/online_version
Add version to swagger.json from pom's version
2015-10-04 23:57:16 +08:00
wing328
69911a1974 Merge pull request #1311 from xhh/java-okhttp-gson-ssl
Add some SSL options to Java okhttp-gson client
2015-10-04 23:02:25 +08:00
Quenby Mitchell
1018ca634d generic types need to be escaped for the xmldoc to work for return documentation. List<Foo> should be List{Foo} for the c# compiler to generate the documentation for the generic type. since there is not a spare parameter on the CodegenOperation model to put this correctly formatted documentation, for right now, don't include the return type in the documentation. 2015-10-02 13:11:54 -05:00
Quenby Mitchell
ff0b0c15a8 fix build warnings on CSharp xml comments 2015-10-02 12:14:41 -05:00
wing328
727c32f2a2 Merge pull request #1312 from iushankin/issue-1304
Issue #1304: Migrate tests from the Scala to the plain Java. Part 2
2015-10-02 23:50:37 +08:00
wing328
3c0eab65f3 Merge pull request #1323 from cbornet/fix_scopes_npe
Fix NPE in empty operation oauth scopes
2015-10-02 23:39:25 +08:00
wing328
a72ac99c91 Merge pull request #1316 from cbornet/dynamic_enum
Dynamically fill swagger enum from codegen client names
2015-10-02 23:37:15 +08:00
Ivan Ushankin
4b62a94350 Fixed #1304: Migrate tests from the Scala to the plain Java. Part 3 2015-10-02 16:20:16 +03:00
cbornet
c1c3439b86 fix some wrong indentations 2015-10-01 17:42:33 +02:00
cbornet
5744bb4053 fix npe in empty operation scopes
Fix #1322
2015-10-01 17:35:07 +02:00
wing328
2711e375cc Merge pull request #1310 from wing328/fix_dynamic_html_parameter_name
[HTML] Fix parameter name in dynamic-html
2015-10-01 20:07:29 +08:00
cbornet
25abc15233 add version to swagger.json from pom's version
Fix #1314
2015-10-01 14:00:19 +02:00
cbornet
984b645ea1 add options to online generator
Fix #1313
2015-10-01 11:09:25 +02:00
wing328
253c46a0d5 Merge pull request #1309 from wing328/fix_springmvc_object
[SpringMVC] fix compilation error by removing import of Object
2015-10-01 10:02:20 +08:00
cbornet
7c431a8e11 dynamically fill swagger enum from codegen client names 2015-10-01 01:12:09 +02:00
Ivan Ushankin
3c98e32765 Issue #1304: Migrate tests from the Scala to the plain Java. Part 2 2015-09-30 17:38:01 +03:00
xhh
f483f934d8 Add some SSL options Java okhttp-gson client
* Add the `verifyingSsl` option to allow skipping verifying SSL
  certificate and host name (default to verify)
* Add `sslCaCert` to allow customizing the CA certificates
2015-09-30 19:48:18 +08:00
wing328
053af7a749 Merge pull request #1305 from iushankin/issue-1304
Fixed #1304: Migrate tests from the Scala to the plain Java. Part 1
2015-09-30 17:57:05 +08:00
wing328
d2d6ff661a fix parameter name in dynamic html 2015-09-30 17:24:11 +08:00
wing328
17bdd73891 fix springmvc by removing import of Object 2015-09-30 16:28:17 +08:00
Balázs Varga
19d8766363 Fix model inheritance. 2015-09-29 10:07:51 +02:00
wing328
e270fdcfd9 Merge pull request #1300 from geekerzp/python_client_cert
[Python] Support client certificate file and client key file in TLS/SSL
2015-09-29 14:50:11 +08:00
wing328
90dc0a7bd8 Merge pull request #1302 from geekerzp/ruby_client_cert
[Ruby] Support client ceritficate in ruby client
2015-09-29 14:44:17 +08:00
Fredric Dorothy
2a679f798a Merge https://github.com/fdorothy/swagger-codegen 2015-09-28 11:52:30 -05:00
Fredric Dorothy
dbecb9e562 Added ability to set a configuration file for custom code generators. This should work the same as when you're using one of the built-in generators. 2015-09-28 11:50:08 -05:00
Ivan Ushankin
4db86003f5 Fixed #1304: Migrate tests from the Scala to the plain Java. Part 1 2015-09-28 19:03:02 +03:00
Tony Tam
d5cf2b6cfe made host dynamic for link generation 2015-09-28 08:51:39 -07:00
geekerzp
6a3108a6bf Support client ceritficate in ruby client 2015-09-28 16:31:47 +08:00
wing328
2ea3816e65 Merge pull request #1290 from geekerzp/model_name
[Python, Ruby] Fix issues in python and ruby clients
2015-09-28 08:35:28 +08:00
wing328
0e9e2046e7 Merge pull request #1293 from xhh/fix-set-date-format
[Java jersey2]: Fix ApiClient.setDateFormat in Java jersey2 client
2015-09-27 21:48:53 +08:00
wing328
e301020acc Merge pull request #1295 from geekerzp/python_upload_file
[Python] Fix issue in python client
2015-09-27 21:48:29 +08:00
geekerzp
cf1f113852 Support client certificate file and client key file in TLS/SSL in python client 2015-09-26 16:16:59 +08:00
wing328
c26a387d9a Merge pull request #1271 from laurentvdl/master
implement form parameter support using Angular $httpParamSerializer
2015-09-26 09:37:40 +08:00
xhh
e5a4ef3ba0 Fix hard-coded constructor name of enum class
in Java okhttp-gson client
2015-09-25 15:52:52 +08:00
geekerzp
9b148be57e Fix issue in python client.
If upload only file it will not send file content.
2015-09-25 15:10:32 +08:00
wing328
0380fc5a35 Merge pull request #1274 from geekerzp/objc_log
[Objc] Update objc debug logging
2015-09-25 11:57:28 +08:00
xhh
597282742b Fix ApiClient.setDateFormat in Java jersey2 client 2015-09-24 21:56:50 +08:00
wing328
5e805c2be6 Merge pull request #1284 from acourtneybrown/master
Fixed method name in Java ApiClient mustache template
2015-09-24 16:39:46 +08:00
wing328
b080abeb01 Merge pull request #1280 from xhh/primitive-string-response
[Java] Support primitive string response in Java clients
2015-09-24 16:37:17 +08:00