-
Notifications
You must be signed in to change notification settings - Fork 354
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
add support for application/graphql-response+json content type #1699
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||||
/* | ||||||
* Copyright 2021 Expedia, Inc | ||||||
* Copyright 2023 Expedia, Inc | ||||||
* | ||||||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
* you may not use this file except in compliance with the License. | ||||||
|
@@ -20,11 +20,11 @@ import com.expediagroup.graphql.server.spring.execution.SpringGraphQLServer | |||||
import org.springframework.context.annotation.Bean | ||||||
import org.springframework.context.annotation.Configuration | ||||||
import org.springframework.context.annotation.Import | ||||||
import org.springframework.http.MediaType | ||||||
import org.springframework.web.reactive.function.server.ServerRequest | ||||||
import org.springframework.web.reactive.function.server.bodyValueAndAwait | ||||||
import org.springframework.web.reactive.function.server.buildAndAwait | ||||||
import org.springframework.web.reactive.function.server.coRouter | ||||||
import org.springframework.web.reactive.function.server.json | ||||||
|
||||||
/** | ||||||
* Default route configuration for GraphQL endpoints. | ||||||
|
@@ -45,8 +45,9 @@ class GraphQLRoutesConfiguration( | |||||
|
||||||
(isEndpointRequest and isNotWebSocketRequest).invoke { serverRequest -> | ||||||
val graphQLResponse = graphQLServer.execute(serverRequest) | ||||||
val accept = serverRequest.headers().accept().find { it == MediaType.APPLICATION_JSON } ?: MediaType.APPLICATION_GRAPHQL_RESPONSE | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you your review! |
||||||
if (graphQLResponse != null) { | ||||||
ok().json().bodyValueAndAwait(graphQLResponse) | ||||||
ok().contentType(accept).bodyValueAndAwait(graphQLResponse) | ||||||
} else { | ||||||
badRequest().buildAndAwait() | ||||||
} | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we probably should wait for ktor 2.3.0 which includes ktorio/ktor@45b4ccd
how do we also provide a fallback to just use
application/json
if there is no match?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. I removed support in ktor server from this PR.
I'll make another PR when ktor 2.3.0 is released. 👍