Skip to content

Commit 43d00d2

Browse files
committed
Fix build errors
1 parent d8392bd commit 43d00d2

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

src/main/java/graphql/servlet/GraphQLConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static GraphQLConfiguration.Builder with(GraphQLInvocationInputFactory in
3030
return new Builder(invocationInputFactory);
3131
}
3232

33-
private GraphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper objectMapper, List<GraphQLServletListener> listeners, boolean asyncServletModeEnabled, Executor asyncExecutor, , long subscriptionTimeout) {
33+
private GraphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper objectMapper, List<GraphQLServletListener> listeners, boolean asyncServletModeEnabled, Executor asyncExecutor, long subscriptionTimeout) {
3434
this.invocationInputFactory = invocationInputFactory;
3535
this.queryInvoker = queryInvoker;
3636
this.objectMapper = objectMapper;

src/test/groovy/graphql/servlet/TestUtils.groovy

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import graphql.Scalars
55
import graphql.execution.instrumentation.Instrumentation
66
import graphql.execution.reactive.SingleSubscriberPublisher
77
import graphql.schema.*
8-
import org.reactivestreams.Publisher
98

109
import java.util.concurrent.atomic.AtomicReference
1110

1211
class TestUtils {
1312

1413
static def createServlet(DataFetcher queryDataFetcher = { env -> env.arguments.arg },
1514
DataFetcher mutationDataFetcher = { env -> env.arguments.arg },
16-
boolean asyncServletModeEnabled = false) {
17-
DataFetcher subscriptionDataFetcher = { env ->
18-
AtomicReference<SingleSubscriberPublisher<String>> publisherRef = new AtomicReference<>();
19-
publisherRef.set(new SingleSubscriberPublisher<>({ subscription ->
20-
publisherRef.get().offer(env.arguments.arg)
21-
publisherRef.get().noMoreData()
22-
}))
23-
return publisherRef.get()
24-
}) {
15+
boolean asyncServletModeEnabled = false,
16+
DataFetcher subscriptionDataFetcher = { env ->
17+
AtomicReference<SingleSubscriberPublisher<String>> publisherRef = new AtomicReference<>();
18+
publisherRef.set(new SingleSubscriberPublisher<>({ subscription ->
19+
publisherRef.get().offer(env.arguments.arg)
20+
publisherRef.get().noMoreData()
21+
}))
22+
return publisherRef.get()
23+
}) {
2524
GraphQLHttpServlet servlet = GraphQLHttpServlet.with(GraphQLConfiguration
2625
.with(createGraphQlSchema(queryDataFetcher, mutationDataFetcher, subscriptionDataFetcher))
2726
.with(createInstrumentedQueryInvoker())
@@ -75,23 +74,27 @@ class TestUtils {
7574
}
7675
field.dataFetcher(mutationDataFetcher)
7776
}
78-
.field { field ->
77+
.field { field ->
7978
field.name("echoFile")
8079
field.type(Scalars.GraphQLString)
8180
field.argument { argument ->
8281
argument.name("file")
8382
argument.type(ApolloScalars.Upload)
8483
}
85-
field.dataFetcher( { env -> new String(ByteStreams.toByteArray(env.arguments.file.getInputStream())) } )
84+
field.dataFetcher({ env -> new String(ByteStreams.toByteArray(env.arguments.file.getInputStream())) })
8685
}
87-
.field { field ->
86+
.field { field ->
8887
field.name("echoFiles")
8988
field.type(GraphQLList.list(Scalars.GraphQLString))
9089
field.argument { argument ->
9190
argument.name("files")
9291
argument.type(GraphQLList.list(GraphQLNonNull.nonNull(ApolloScalars.Upload)))
9392
}
94-
field.dataFetcher( { env -> env.arguments.files.collect { new String(ByteStreams.toByteArray(it.getInputStream())) } } )
93+
field.dataFetcher({ env ->
94+
env.arguments.files.collect {
95+
new String(ByteStreams.toByteArray(it.getInputStream()))
96+
}
97+
})
9598
}
9699
.build()
97100

@@ -110,11 +113,11 @@ class TestUtils {
110113

111114

112115
return GraphQLSchema.newSchema()
113-
.query(query)
114-
.mutation(mutation)
115-
.subscription(subscription)
116-
.additionalType(ApolloScalars.Upload)
117-
.build()
116+
.query(query)
117+
.mutation(mutation)
118+
.subscription(subscription)
119+
.additionalType(ApolloScalars.Upload)
120+
.build()
118121
}
119122

120123
}

0 commit comments

Comments
 (0)