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

added application/merge-patch+json #2190

Merged
merged 2 commits into from Sep 7, 2018

Conversation

Projects
None yet
6 participants
@Executioner1939
Copy link
Contributor

Executioner1939 commented Sep 4, 2018

added application/merge-patch+json media type to akka-http-core
Refs #2189

@akka-ci

This comment has been minimized.

Copy link
Collaborator

akka-ci commented Sep 4, 2018

Thank you for your pull request! After a quick sanity check one of the team will reply with 'OK TO TEST' to kick off our automated validation on Jenkins. This compiles the project, runs the tests, and checks for things like binary compatibility and source code formatting. When two team members have also manually reviewed and (perhaps after asking for some amendments) accepted your contribution, it should be good to be merged.

For more details about our contributing process, check out CONTRIBUTING.md - and feel free to ask!

@@ -336,6 +336,7 @@ object MediaTypes extends ObjectRegistry[(String, String), MediaType] {
val `application/javascript` = awoc("javascript", "js")
val `application/json` = awfc("json", HttpCharsets.`UTF-8`, "json")
val `application/json-patch+json` = awfc("json-patch+json", HttpCharsets.`UTF-8`)
val `application/merge-patch+json` = awfc("merge-patch+json", HttpCharsets.`UTF-8`)

This comment has been minimized.

@ktoso

ktoso Sep 4, 2018

Member

please mirror this in javadsl

This comment has been minimized.

@Executioner1939

Executioner1939 Sep 4, 2018

Contributor

Hi @ktoso I have added it to the JavaDSL, apologies for missing that :-).

@ktoso

This comment has been minimized.

Copy link
Member

ktoso commented Sep 4, 2018

Please refer to ticket this addresses in comment, not title (in title it does not link properly)

Refs #2189

@Executioner1939 Executioner1939 changed the title added application/merge-patch+json #2189 added application/merge-patch+json Sep 4, 2018

@johanandren
Copy link
Member

johanandren left a comment

LGTM

@jrudolph

This comment has been minimized.

Copy link
Member

jrudolph commented Sep 4, 2018

OK TO TEST

@akka-ci akka-ci added validating tested and removed validating labels Sep 4, 2018

@akka-ci

This comment has been minimized.

Copy link
Collaborator

akka-ci commented Sep 4, 2018

Test PASSed.

@jlprat

jlprat approved these changes Sep 5, 2018

Copy link
Member

jlprat left a comment

LGTM.
Thanks @Executioner1939 !

@jlprat jlprat merged commit 9686ef1 into akka:master Sep 7, 2018

3 checks passed

Jenkins PR Validation Test PASSed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
typesafe-cla-validator All users have signed the CLA
Details

Synesso added a commit to Synesso/akka-http that referenced this pull request Sep 17, 2018

add application/merge-patch+json (akka#2190)
* add application/merge-patch+json akka#2189

* Mirror new MergePatch Media Type in JavaDSL
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment