Commit Graph

288 Commits

Author SHA1 Message Date
Alvin
98396d04a7 update sample & test 2015-11-21 20:12:11 +08:00
Alvin
dc65b5647f update okhttp-gson samples 2015-11-21 19:42:01 +08:00
xhh
81cf57a00b Use okhttp's Credentials class to build basic auth string 2015-11-20 20:10:05 +08:00
xhh
b823e8bd35 Ignore auths when value not specified in Java clients 2015-11-20 17:34:46 +08:00
wing328
c150247dca Merge pull request #1579 from xhh/fix-java-date-format
[Java okhttp-gson] Fix datetime format for Android
2015-11-20 15:59:07 +08:00
Curt Hostetter
951e56071f Ran ./bin/java-petstore-jersey2.sh to update the Petstore sample 2015-11-17 11:18:55 -05:00
xhh
431cdc9c37 Java okhttp-gson: fix datetime format for Android
by detecting the current environment (Android SDK version and Java
version) and determine a default datetime format accordingly

Closes #1573
2015-11-17 17:54:13 +08:00
wing328
95d8585dce Merge pull request #1534 from xhh/java-datetime-format
[Java] Improvement date-time format in Java clients
2015-11-16 09:57:52 +08:00
wing328
08bb339398 Merge pull request #1559 from wing328/remove_setting_files
Remove eclipse file
2015-11-12 19:52:18 +08:00
xhh
93c6966501 Fix code of customizing date-time format in test 2015-11-12 17:34:12 +08:00
wing328
ee60b5f4f1 Merge pull request #1494 from cbornet/android_manifest
Add android manifest to java codegen
2015-11-12 17:17:01 +08:00
wing328
6d470d1896 remove eclipse files 2015-11-12 17:14:20 +08:00
xhh
6b3fc79dec Merge branch 'master' into java-datetime-format 2015-11-12 17:10:08 +08:00
xhh
55bcceac07 Fix tests on date format by using custom date format 2015-11-12 17:10:03 +08:00
wing328
8836644d37 Merge pull request #1546 from xhh/java-enum-array
Fix error with array of enum in Java client
2015-11-10 23:39:21 +08:00
wing328
e00d102c47 Merge pull request #1545 from emilianobonassi/support_retrofit2
Add support to Retrofit2
2015-11-10 20:43:19 +08:00
Emiliano Bonassi
47f4396fb7 - fix source/target java version to 1.6
- add test profile for CI
2015-11-10 12:30:13 +01:00
xhh
c07e30b8cf Update testCreateUser to avoid occasional failures 2015-11-10 13:22:06 +08:00
Emiliano Bonassi
3a7204d66c Add support to Retrofit2 2015-11-10 03:20:49 +01:00
xhh
e3c44b5af3 Improvement on comment 2015-11-09 16:47:33 +08:00
xhh
c48b93384b Merge branch 'master' into java-datetime-format 2015-11-09 15:59:32 +08:00
xhh
8cab7e785d Customizing date format in Java okhttp-gson client 2015-11-09 13:49:50 +08:00
xhh
cbc18c97ba Customizing date format in Java jersey2 client 2015-11-09 11:58:41 +08:00
xhh
a45af48e35 Fix test 2015-11-09 10:23:46 +08:00
wing328
4feca0d680 Merge pull request #1491 from cbornet/javax_android
Provide dependency to javax.annotation.Generated for android templates
2015-11-08 11:12:57 +08:00
xhh
c59be88a3e Support customizing date format in model (de)serialization in Java client
and update the default date format to conform to RFC3339
2015-11-07 15:16:13 +08:00
xhh
8d3e555f8a Add README.md to Java clients
containing documentation like how to build and use the client
2015-11-06 17:15:32 +08:00
xhh
1a67f452e2 Make parameters unique in generated code
through a config option "ensureUniqueParams" which is false by default

Closes #1422
2015-11-04 20:51:56 +08:00
wing328
c8ce84f650 replace tab with space, update samples 2015-11-03 21:34:44 +08:00
wing328
5bf4d022cf Merge pull request #1490 from xhh/java-oauth
Add oauth support for Java client
2015-11-03 20:34:12 +08:00
cbornet
8b0bf8ff72 add a listener on new token reception
Add a listener on new token reception that can then be stored or logged for debug
Add an helper method to add authorizations (otherwise if the swagger def is not complete or correct, it is hard to configure from the main app)
2015-11-02 19:20:24 +01:00
cbornet
5b1f287176 add android manifest to java codegen 2015-11-02 18:32:52 +01:00
cbornet
645b8a01e1 provide dependency to javax.annotation.Generated for android 2015-11-02 16:16:14 +01:00
xhh
a94f9b69af Add oauth support to other Java clients
with libraries jersey2 and okhttp-gson
2015-11-02 22:52:51 +08:00
xhh
b27931cd8c Add oauth support for Java client 2015-11-02 21:27:53 +08:00
xhh
953edc940f Java jersey2: use a shared Client instance 2015-10-29 09:40:07 +08:00
xhh
95113dbe22 Fix syntax error on authMethods in java retrofit client 2015-10-27 10:45:23 +08:00
xhh
214e0186e8 Ignore null fields in model serialization
in Java clients.

Closes #1413
2015-10-21 12:05:27 +08:00
Tony Tam
7f5cdba606 rebuilt 2015-10-20 11:42:40 -07:00
Tony Tam
295af57c9a fixed build error 2015-10-20 11:31:21 -07:00
Tony Tam
10a9c62e2b merged 2015-10-20 10:57:36 -07:00
Tony Tam
a6bd0773f7 added files 2015-10-20 10:56:18 -07:00
Tony Tam
2f3a2413c7 rebuilt 2015-10-20 08:49:26 -07:00
Tony Tam
e1ee7065d5 rebuilt client 2015-10-19 23:12:02 -07: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
xhh
a1fa0b0834 Rebuild Petstore samples 2015-10-16 10:47:00 +08:00
xhh
a94384ca7f Merge branch 'master' into java-util-model-package 2015-10-15 10:38:19 +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
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
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
ab34dc5697 Rebuild Java cilents of the Petstore sample 2015-10-09 22:10:21 +08:00
wing328
d451d4efb8 fix NPE when model's allof with no property 2015-10-08 23:38:09 +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
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
17bdd73891 fix springmvc by removing import of Object 2015-09-30 16:28:17 +08:00
xhh
597282742b Fix ApiClient.setDateFormat in Java jersey2 client 2015-09-24 21:56:50 +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
wing328
5ee86b9816 Merge pull request #1264 from xhh/java-enum-improvements
[Java] Improvements on enum var name in Java client
2015-09-24 11:42:11 +08:00
xhh
a284bb7a51 Rebuild Java clients of the Petstore sample 2015-09-23 13:31:28 +08:00
wing328
85f99934c8 Merge pull request #1256 from cbornet/java_retrofit_lib
Set retrofit as a java library
2015-09-23 09:12:07 +08:00
xhh
6dcaa890cf Improvements on enum var name in Java client
* Place each enum var in a separate line
* Truncate common prefix when present
2015-09-21 17:29:26 +08:00
cbornet
f29f5d6f13 fix error with formParams in async ops 2015-09-18 14:45:37 +02:00
cbornet
1863aca0fa set retrofit as a java library
Fix #1247
Fix #1248
2015-09-18 14:21:48 +02:00
xhh
477d5c40d9 Rebuild Java okhttp-gson client of Petstore sample 2015-09-17 10:22:53 +08:00
xhh
1ecb8a74c1 Allow customizing temp folder for file downloading 2015-09-13 21:02:22 +08:00
xhh
967c574f5b Support file downloading in Java okhttp-gson client 2015-09-13 18:41:53 +08:00
xhh
2e402bba97 Rebuild Java clients for the petstore sample 2015-09-11 13:22:37 +08:00
xhh
8b96cdb7d7 Set source/target compatibility in Android client 2015-09-07 16:35:34 +08:00
xhh
027e4c5a20 Set source and target compatibility to 1.7
in build.gradle to make it work with Android
2015-09-02 18:35:58 +08:00
xhh
3c79a692aa Use a separate library for base64-encoding in the okhttp-gson template 2015-09-01 19:56:06 +08:00
xhh
3112e4ad06 Add build files for Gradle and SBT 2015-09-01 11:20:44 +08:00
xhh
e35be1bd40 Generate Java petstore sample for okhttp-gson 2015-08-31 19:59:17 +08: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
wing328
164ed99812 fix serializableModel (boolean) 2015-08-24 11:50:21 +08:00
Tony Tam
66e6d4fb8a rebuilt client 2015-08-23 11:10:04 -07: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
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
xhh
4321339d4f Java petstore sample: move to "default" sub-folder, add jersey2 2015-08-05 17:28:45 +08:00
xhh
d88ec847ae Remave unused imports 2015-08-05 09:43:15 +08:00
xhh
7c16dfcf13 Rebuild Java petstore sample 2015-08-04 18:36:03 +08:00
wing328
d0baa48fcd fix empty operationId 2015-07-27 11:21:51 +08:00
xhh
fb0b7d622f Merge branch 'develop_2.0' into params-order
Conflicts:
	modules/swagger-codegen/src/main/resources/php/api.mustache
2015-07-13 15:30:06 +08:00
Tony Tam
461f556289 Merge pull request #893 from sudohippie/develop_2.0-fork
Android & Java template modifications to check collectionFormat when creating query parameters
2015-07-09 10:11:54 -07:00
Raghav Sidhanti
1af23fb751 Unit tests for Android and Java parameterToPairs method 2015-06-24 11:55:03 -07:00
Raghav sidhanti
b4d6fd3ba3 Returning when query param value is null. 2015-06-22 20:16:35 -07:00
Raghav Sidhanti
6958db3d3d Refactored Pairs to use List instead of Set. 2015-06-22 17:14:18 -07:00
Raghav Sidhanti
32b50e7c8e Refactored parameterToPairs 2015-06-22 17:02:00 -07:00
Raghav Sidhanti
79a5614be9 Invalid strings will be passed as blank query param. 2015-06-22 15:55:29 -07:00
Raghav Sidhanti
ecddfb7ccf Renamed QueryParam to Pair class in Java templates. 2015-06-22 15:16:45 -07:00
Raghav Sidhanti
7a9a41fe01 Java and Android template changes to accommodate query params defined by the collection-format. 2015-06-19 14:06:25 -07:00
Andrew B
1aeb50feef Replacing getClientResponseStatus() with getStatusInfo() 2015-06-18 14:41:17 -07:00
xhh
9c4e5ed596 Rebuild Petstare sample for Java, Android, PHP, etc. 2015-06-17 16:15:37 +08:00
fehguy
3d2f09a693 updated versions 2015-06-09 00:25:09 -07:00
Tony Tam
450edae160 fixed imports 2015-06-07 20:35:56 -07:00
Ron
1c2d0656b0 Code reformatting 2015-06-07 11:56:08 -04:00
Tony Tam
6c57810128 rebuilt 2015-06-07 00:08:01 -07:00
Tony Tam
8c340d52a4 updated packages 2015-06-06 23:58:36 -07:00
xhh
d345283ab5 Merge branch 'develop_2.0' into java-accept-contenttype
Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
	samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java
2015-06-06 08:46:19 +08:00
xhh
fffc5d7c35 Move authentications into ApiClient 2015-06-05 20:00:32 +08:00
xhh
947935f3d9 Merge remote-tracking branch 'origin/develop_2.0' into java-auth
Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
	samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java
	samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
2015-06-05 18:43:49 +08:00
xhh
d70742119b Update unit tests 2015-06-05 16:45:19 +08:00
xhh
622b5c179a Merge remote-tracking branch 'origin/develop_2.0' into java-accept-contenttype
Conflicts:
	modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
2015-06-05 16:31:21 +08:00
xhh
cf4b4de970 Skip null header/form parameters
and fix the bug of getting file name for file parameter
2015-06-03 20:26:14 +08:00
xhh
eb4973237b Add comments to code 2015-06-03 10:09:36 +08:00
xhh
19540ed7f0 Store response headers and body in ApiException 2015-06-02 15:33:44 +08:00
xhh
a8c526efd5 Add unit tests for Configuration and ApiClient 2015-05-29 12:08:42 +08:00
xhh
62c8f9e1e2 Rebuild Java Petstore sample 2015-05-29 12:08:42 +08:00
xhh
6a6473ede3 Allow omitting username/password for HTTP basic auth 2015-05-29 11:55:48 +08:00
xhh
e10e1f5249 Refactor auth method naming, add comments 2015-05-29 11:29:06 +08:00
xhh
6eb1a89205 Add authentication helper methods and test cases 2015-05-29 11:28:03 +08:00
xhh
4d25d264c4 Merge remote-tracking branch 'origin/develop_2.0' into java-auth
Conflicts:
	modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
	samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
2015-05-29 10:08:50 +08:00
xhh
951b7a9075 Do not use JSON as default Accept header when no produces present 2015-05-26 10:35:49 +08:00
xhh
aa03be7f76 Clean up old code 2015-05-25 17:25:32 +08:00
xhh
ed14c515bf Add comments to string utility methods 2015-05-25 16:01:57 +08:00
xhh
19a8ac4841 Add unit tests 2015-05-25 12:32:24 +08:00
xhh
85d0e08a80 Rebuild Java Petstore client 2015-05-25 12:31:54 +08:00
xhh
141b580c8c Minor improvement to Java API client accept and content-type header 2015-05-24 08:52:14 +08:00
Tony Tam
d447c423b5 updated test to get expected value 2015-05-23 08:33:48 -07:00
Tony Tam
f9ed8a9a08 updated test to get expected value 2015-05-23 08:33:40 -07:00
xhh
43cfc7d401 Setup authentications in test cases 2015-05-22 12:07:08 +08:00
xhh
16ba2a54ea Add test cases for API key and HTTP basic auth 2015-05-22 11:17:44 +08:00
xhh
f616605e7e Regenerate Java Petstore sample 2015-05-21 22:09:08 +08:00
Tony Tam
11dd7784f8 rebuilt 2015-05-20 22:20:51 -07:00
wing328
2e85871a4b remove hello.txt (created by mvn test) 2015-04-30 17:12:25 +08:00
wing328
303378c5eb fix android required parameter check 2015-04-30 16:29:21 +08:00
wing328
fb3088b765 fixed required parameter in java api 2015-04-29 17:31:38 +08:00
Tony Tam
fad7246e05 removed file 2015-04-04 20:59:57 -07:00
Tony Tam
ba2ccf788c name rebuilds, tests 2015-04-04 17:00:22 -07:00
xhh
d5ad4c4ae7 Fix date time format for Android client
According to Android's docs (https://developer.android.com/reference/java/text/SimpleDateFormat.html)
the `SimpleDateFormat` class in Android does not accept `XXX` as the timezone, it uses `Z` instead.

Also updated the date time format of Android and Java clients to include milliseconds.
2015-04-01 10:22:04 +08:00
Tony Tam
6ac497d774 rebuilt 2015-03-31 16:12:42 -07:00
Tony Tam
cab50ccb59 Merge pull request #548 from xhh/java-android-user-agent
Set default User-Agent for Java and Android clients
2015-03-29 08:52:56 -07:00
xhh
90db8e2147 Add setUserAgent method to Java and Android clients 2015-03-29 09:55:20 +08:00
xhh
65883a5d85 Set default User-Agent for Java and Android clients 2015-03-29 09:55:19 +08:00
William Cheng
c2b3e68f8c rebase on develop_2.0 2015-03-28 16:48:07 +08:00
William Cheng
27e1b1c4b2 update java doc 2015-03-28 16:43:15 +08:00
Tony Tam
5d6d563a8e updated versions 2015-03-26 23:17:17 -07:00
Tony Tam
442be8624c rebuilt client, added tests 2015-03-26 23:10:10 -07:00
Tony Tam
8b98a92805 adds tests, fixes for java templates 2015-03-26 20:32:59 -07:00
William Cheng
62d28ebca5 better variable and model property naming for java 2015-03-22 23:24:43 +08:00
xhh
f8a5e900f8 Add parameterToString to normalize parameters for Java client
* Convert values to string for query/header/form parameters.
* For parameter of type Date, convert to ISO 8601 format.
* Also add utility methods to parse date in ISO 8601 format.
2015-03-18 18:58:13 +08:00
Tony Tam
9ae106affd rebuilt clients 2015-02-17 21:37:51 -08:00
Tony Tam
31eb392d40 rebuild client 2015-02-16 17:55:15 -08:00
Tony Tam
9707f0a1ab updated client 2015-02-15 21:18:54 -08:00
Tony Tam
20deb15c8c updated client 2015-02-12 21:54:34 -08:00
Tony Tam
69dceb7f69 updated samples 2015-02-05 20:58:32 -08:00
Tony Tam
f7c6810757 updated samples 2015-02-05 11:35:13 -08:00
Tony Tam
2f16ee3b29 renamed package 2015-02-05 11:34:23 -08:00