Commit Graph

809 Commits

Author SHA1 Message Date
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
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 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 aaf1df1971 more flattening fixes 2015-10-19 23:10:48 -07:00
Tony Tam eeaf4071f9 updated to not flatten array, map properties in responses unless necessary 2015-10-19 21:35:45 -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 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
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
cbornet 71c5160739 add colllectionFormat support to retrofit
Fix #1364
2015-10-16 12:21:45 +02: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
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
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 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
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 0b4b5e8839 Revert "Add support for top-level consumes and produces" 2015-10-13 23:47:42 +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
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 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 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
Tony Tam 733e19c113 fixed NPE for objc client 2015-10-07 17:11:52 -07: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
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
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
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