Fixes for OSGi, remove automatic creation of executor for async requests #538
Conversation
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
federicorispo
requested changes
Dec 18, 2023
| @@ -1,6 +1,7 @@ | |||
| package graphql.kickstart.servlet; | |||
|
|
|||
| import graphql.schema.GraphQLSchema; | |||
| import java.util.concurrent.ThreadPoolExecutor; | |||
| @@ -3,11 +3,7 @@ | |||
| import graphql.schema.GraphQLFieldDefinition; | |||
| import java.util.Collection; | |||
|
|
|||
| public interface GraphQLMutationProvider extends GraphQLFieldProvider { | |||
| public interface GraphQLMutationProvider extends GraphQLProvider { | |||
There was a problem hiding this comment.
I would not touch so easily these interfaces since they are the contract to the outside and I think there are projects that could rely on them.
Same thing for the deletion of the GraphQLFieldProvider and the update of the GraphQlSubscriptionProvider
| import lombok.Setter; | ||
|
|
||
| @Setter | ||
| class OsgiSchemaBuilder { | ||
| public class OsgiSchemaBuilder { |
There was a problem hiding this comment.
Could you please create some unit tests for this builder since it has some login in it?
|
@tdraier The |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi,
Here's a PR with different fixes for OSGi, and a fix for #537 . This has been done on the javax branch but should be portable on master.
On OSGi side, I've changed version ranges so that it can be deployed on all compatible versions of servlet (3+) /websocket (1.1+) and graphql (the current code works well with graphql 20 and 21). Also updated the gradle dependencies accordingly.
I've changed GraphQLMutationProvider and GraphQLSubscriptionProvider that were both implementing the same
getFieldsmethods from GraphQLFieldsProvider (removed), preventing any provider to implement both interfaces. I'm not sure what was the reason to have a common getFields() method but the code seems more simple with the 2 different methods. Also exposed thegetSubscriptionProtocolFactory()from websocket endpoint, as I need to be able to call it externally in my code ..I've slightly changed the
GraphQLConfiguration.Builderso that we can provide some base configuration from OSGi with aGraphQLConfigurationProvider. Also added some safeguard to prevent providinginvocationInputFactoryandinvocationInputFactoryBuilderat the same time.However, a big change in GraphqlConfiguration is the removal of the thread pool executor creation for async support, as explained in #537 . In my opinion it cannot be created by the GraphQLConfiguration object or its builder, but should be created and managed by the servlet itself. The code creating a default thread pool (and destroying it) could be moved to
AbstractGraphQLHttpServlet- but it should be possible to skip the creation of that default pool if we want to use our own executor. Tell me what do you think, I will update the PR if needed.