Skip to content

Feature/183 refactor abstract http servlet #217

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.

Sign up for GitHub

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 28 commits into from
Nov 28, 2019
Merged

Feature/183 refactor abstract http servlet #217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4380611
Extracted http request handler
oliemansm Nov 15, 2019
088e5e5
Fix unit tests
oliemansm Nov 15, 2019
26cdad4
Fix unit tests
oliemansm Nov 15, 2019
039176c
Fix unit tests
oliemansm Nov 15, 2019
5b1047f
refactor servlert fix #182
oliemansm Nov 15, 2019
44cef3f
Add content length when writing response
oliemansm Nov 15, 2019
c0b22ac
Rethrow caught exceptions to allow listeners to adjust response
oliemansm Nov 16, 2019
7dfbd15
Split based on servlet and websocket dependencies
oliemansm Nov 17, 2019
37c62fc
Extract core functionality into its own module
oliemansm Nov 17, 2019
f17ad46
Extract core functionality into its own module
oliemansm Nov 17, 2019
80236b4
Introduced GraphQLInvoker to allow invocation from webflux version
oliemansm Nov 18, 2019
2cf964b
Moved subject proxy out of the core logic
oliemansm Nov 19, 2019
3dbad11
Fix build error
oliemansm Nov 20, 2019
e0fa40b
Refactor subscriptions
oliemansm Nov 24, 2019
9a47e63
Refactor subscriptions
oliemansm Nov 24, 2019
8bac91a
Refactor subscriptions
oliemansm Nov 24, 2019
f589fa5
Refactor subscriptions
oliemansm Nov 24, 2019
eebc9af
Fix build deprecations
oliemansm Nov 24, 2019
2dee089
Upgrade gradle to 6.0.1
oliemansm Nov 25, 2019
16071f6
Upgrade gradle to 6.0.1
oliemansm Nov 25, 2019
6465fa8
Upgrade gradle to 6.0.1
oliemansm Nov 25, 2019
a0c0f49
Build GraphQL on the fly after all
oliemansm Nov 25, 2019
497adf0
Build GraphQL on the fly after all
oliemansm Nov 25, 2019
f2bb4e0
Limit use of GraphQLQueryInvoker
oliemansm Nov 26, 2019
d9e14f6
Merge branch 'master' into feature/183-refactor-abstract-http-servlet
oliemansm Nov 28, 2019
eae8120
Use gradle 5.6.4 instead of 6.0.1
oliemansm Nov 28, 2019
ddc29bd
Merge remote-tracking branch 'origin/feature/183-refactor-abstract-ht…
oliemansm Nov 28, 2019
1dd834e
Fix batching query
oliemansm Nov 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix batching query
  • Loading branch information
@oliemansm
oliemansm committed Nov 28, 2019
commit 1dd834e639219c3a46d9c2586b1ae7e08500bb6d
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ LIB_JACKSON_VER = 2.10.0
SOURCE_COMPATIBILITY = 1.8
TARGET_COMPATIBILITY = 1.8

GRADLE_WRAPPER_VER = 5.6.4
GRADLE_WRAPPER_VER = 6.0.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Nov 14 18:53:34 CET 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 2 additions & 0 deletions graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ private List<ExecutionResult> query(GraphQLBatchedInvocationInput batchedInvocat
GraphQL graphQL = batchedDataLoaderGraphQLBuilder.newGraphQL(batchedInvocationInput, graphQLBuilder);
return batchedInvocationInput.getExecutionInputs().stream()
.map(executionInput -> proxy.executeAsync(graphQL, executionInput))
.collect(toList())
.stream()
.map(CompletableFuture::join)
.collect(toList());
}
Expand Down