Skip to content

Minor improvement to Java API client accept and content-type header #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 6, 2015
Merged

Minor improvement to Java API client accept and content-type header #790

merged 10 commits into from
Jun 6, 2015

Conversation

xhh
Copy link
Contributor

@xhh xhh commented May 25, 2015

This PR makes the behavior of handling Accept and Content-Type headers be consistent with PHP, Python and objc clients:
#759, #774, #780

@olensmar
Copy link
Contributor

olensmar commented Jun 2, 2015

please rebase so we can merge!

@xhh
Copy link
Contributor Author

xhh commented Jun 2, 2015

@olensmar this PR would raise conflicts again once PR #791 is merged, so I'll wait for that PR to get merged first and then resolve the conflicts of this one

@fehguy
Copy link
Contributor

fehguy commented Jun 5, 2015

@xhh #791 is merged--thank you again.

xhh added 2 commits June 5, 2015 16:31
…ntenttype

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
@xhh
Copy link
Contributor Author

xhh commented Jun 5, 2015

@fehguy resolved the merge conflicts, and tests passed successfully

@fehguy
Copy link
Contributor

fehguy commented Jun 5, 2015

@xhh i'm still getting merge conflicts.

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
@xhh
Copy link
Contributor Author

xhh commented Jun 6, 2015

@fehguy fixed the merge conflicts again

fehguy added a commit that referenced this pull request Jun 6, 2015
Minor improvement to Java API client accept and content-type header
@fehguy fehguy merged commit c3d2a58 into swagger-api:develop_2.0 Jun 6, 2015
@fehguy
Copy link
Contributor

fehguy commented Jun 6, 2015

thanks, merged it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants