| 
							
							
								 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 |  |