Commit Graph

349 Commits

Author SHA1 Message Date
cbornet
f54b505704 use okttp builder instead of instance in retrofit2
Fix #3188
2016-06-29 17:07:39 +02:00
wing328
77c4164b3c better code injection handling for java 2016-06-29 02:00:43 +08:00
cbornet
8d8858cc51 mutualize jackson and gson models in java clients
See #2182
2016-06-28 18:00:34 +02:00
wing328
f3bb4ea872 Merge pull request #3180 from cbornet/feign_java8
|Feign] Support jsr310 dates in feign client
2016-06-27 10:47:13 +08:00
wing328
5008de5f83 Merge pull request #3181 from cbornet/retrofit2_java8
[Retrofit] Add support for jsr310 dates to retrofit2 client
2016-06-27 10:01:36 +08:00
cbornet
d29a5537bc add support for jsr310 dates to okhttp-gson client 2016-06-20 16:50:08 +02:00
cbornet
48564079be add support for jsr310 dates to retrofit2 client
See #2874
2016-06-20 14:32:18 +02:00
cbornet
3e9064b81e support jsr310 dates in feign client
See #2874
2016-06-20 13:04:44 +02:00
ant3
7e867dc8ff Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-06-19 22:40:27 +01:00
ant3
5e3a877033 Reformatted templating tags
Turns out I didn't need to compact newlines so I have reverted to a more
readable format for the templates.
2016-06-19 22:39:00 +01:00
ant3
cf42b4166f Fixed name of JSR310 module
Silly error, which resulted in code that didn't compile :-(.
2016-06-19 21:10:59 +01:00
wing328
77d0e121bf Merge pull request #3065 from ant3/JSR310-Clients
[Java] Add support for JSR310 in Jersey2 Clients
2016-06-18 17:36:58 +08:00
wing328
cc5668c825 Merge pull request #3108 from JasonQuinn/master
Adding the ability to get and set the httpClient for jersey2
2016-06-18 16:56:01 +08:00
ant3
c1a5839d44 Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-06-17 21:25:35 +01:00
Jason Quinn
ed83ad3afd Removing gradle dependency for jersey2 pom 2016-06-14 15:01:23 +01:00
Jason Quinn
24b7f5c902 Adding the ability to get/set the httpClient for jersey2 2016-06-14 15:00:40 +01:00
wing328
3295b24cc2 add travis.yml for java client 2016-06-13 17:06:49 +08:00
ant3
fecaf0673a Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-06-12 19:18:07 +01:00
ant3
56c6e081d5 Fixed Java 8 time in Jersey 1 Client
Made the Jersey 1 client work with java 8 time classes.  Also tightened
up newlines in templates.
2016-06-12 19:15:38 +01:00
wing328
ff28988a67 Merge branch 'joda_retrofit_1' of https://github.com/cbornet/swagger-codegen into cbornet-joda_retrofit_1 2016-06-10 16:32:23 +08:00
wing328
216d4b8b23 Merge pull request #3083 from cbornet/joda_retrofit
Add joda support to retrofit2 clients and use it in samples
2016-06-10 15:18:00 +08:00
cbornet
2fe9cd2ba0 add joda support to retrofit 1 clients 2016-06-09 18:41:44 +02:00
cbornet
61884211bb add joda support to okhttp-gson and use it in the samples 2016-06-09 18:20:52 +02:00
wing328
bd705a49d6 Merge pull request #3094 from karussell/patch-3
[Java] client: make all okhttp classes explicit to avoid conflict
2016-06-09 21:21:51 +08:00
wing328
4ee483dcc0 fix okhttp pom to remove dependency on gradle, sbt test 2016-06-09 18:23:19 +08:00
Peter
1ff18c4ac6 make all okhttp classes explicit to avoid conflict 2016-06-09 11:31:15 +02:00
wing328
bc42d941ec Merge branch 'patch-1' of https://github.com/karussell/swagger-codegen into karussell-patch-1
Conflicts:
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
2016-06-09 17:06:50 +08:00
wing328
0a3a47dbd4 add license to java okhttp client 2016-06-09 16:20:57 +08:00
wing328
2d170fd7a6 add license to 2016-06-09 16:07:36 +08:00
Peter
6df4ffab13 use explicit Response class from okhttp fixing #3071 2016-06-08 22:37:41 +02:00
wing328
c11908824e Merge pull request #3075 from cbornet/feign_joda
[Feign] Support joda dates in feign client and use it in petstore sample
2016-06-09 01:28:10 +08:00
cbornet
acf17c85ad add joda support to retrofit clients and use it in samples
also adds back the petstore tests
2016-06-08 18:50:49 +02:00
wing328
691aa53d5a [Java][okhttp-gson] fix java doc for okhttp-gson (#3077)
* fix java doc for okhttp-gson

* add ci test for javadoc

* fix return type for java doc

* fix warning/error with javadoc

* fix error/warning in javadoc

* fix 2 warnings related to docstring

* remove trailing space for okhttp tmeplate
2016-06-09 00:47:49 +08:00
cbornet
3ae39c9562 support joda in feign and use it in sample 2016-06-07 22:39:34 +02:00
ant3
b8ebee1ec3 Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-06-05 23:13:52 +01:00
ant3
9a9d5ebd9f Allow generation of Jersey2 clients with JSR310 classes
If the -DdateLibrary=java8 option is set on the command line then
jersey2 client code will be generated using JSR310 classes rather than
Joda time.  Because JSR310 requires java8 the java target version is
also changed in the build files.
2016-06-05 23:11:29 +01:00
clasnake
a84ed9cb57 Fix build.sbt.mustache for feign. 2016-06-04 22:18:23 +08:00
clasnake
4da829315f Add sbt support for feign. 2016-06-04 21:51:49 +08:00
clasnake
503fb138f5 Add sbt support for retrofit2 and retrofit2rx. 2016-06-04 21:13:10 +08:00
clasnake
9ed290efea Add sbt support for retrofit. 2016-06-04 20:53:21 +08:00
clasnake
f4ba31964a Merge branch 'master' into 3006/sbt_for_java_scala
Conflicts:
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
2016-06-03 00:43:43 +08:00
clasnake
f0d3bd8f21 Add sbt support for jersey2, fix dependency issue for okhttp-gson. 2016-06-03 00:37:53 +08:00
wing328
a3610f1c12 [Java] fix warning in pom.xml (java okhttp-gson) (#3023)
* fix warning in pom.xml

* minor fix to pom (okhttp-gson)
2016-06-02 17:37:11 +08:00
wing328
43fe3fa6d0 Merge pull request #3003 from Cosium/feign-disable-fail_on_unknwon_properties
Feign: disable FAIL_ON_UNKNOWN_PROPERTIES by default
2016-06-01 22:33:36 +08:00
Réda Housni Alaoui
5740de9cc7 Feign: disable FAIL_ON_UNKNOWN_PROPERTIES by default 2016-05-31 18:51:11 +02:00
wing328
73ab94dfbf fix sbt build for okhttp-gson 2016-05-31 22:22:54 +08:00
Darrell King
8a403a06e3 2983: Java Feign client generator: HTTP header name should be named Accept not Accepts 2016-05-29 21:14:59 +01:00
wing328
d82bbfdaf4 Merge branch 'java_api_client' of https://github.com/zhenjun115/swagger-codegen into zhenjun115-java_api_client 2016-05-24 16:36:33 +08:00
zhenjun115
359c4b0e53 gradle wrapper mustache for java api client; 2016-05-20 21:44:32 +08:00
wing328
c6f03806df Replaced {{mediaType}} with {{{mediaType}} to keep the original media 2016-05-20 17:48:47 +08:00