Skip to content

Commit 05b95b0

Browse files
committed
Revert PreparsedDocumentProvider in GraphQlSource
1 parent 753fa6c commit 05b95b0

File tree

6 files changed

+0
-180
lines changed

6 files changed

+0
-180
lines changed

spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import graphql.GraphQL;
3030
import graphql.execution.instrumentation.ChainedInstrumentation;
3131
import graphql.execution.instrumentation.Instrumentation;
32-
import graphql.execution.preparsed.PreparsedDocumentProvider;
3332
import graphql.language.InterfaceTypeDefinition;
3433
import graphql.language.UnionTypeDefinition;
3534
import graphql.schema.GraphQLCodeRegistry;
@@ -46,7 +45,6 @@
4645
import graphql.schema.idl.WiringFactory;
4746

4847
import org.springframework.core.io.Resource;
49-
import org.springframework.graphql.execution.preparsed.SpringNoOpPreparsedDocumentProvider;
5048
import org.springframework.lang.Nullable;
5149
import org.springframework.util.Assert;
5250

@@ -72,9 +70,6 @@ class DefaultGraphQlSourceBuilder implements GraphQlSource.Builder {
7270

7371
private final List<Instrumentation> instrumentations = new ArrayList<>();
7472

75-
@Nullable
76-
private PreparsedDocumentProvider preparsedDocumentProvider;
77-
7873
@Nullable
7974
private BiFunction<TypeDefinitionRegistry, RuntimeWiring, GraphQLSchema> schemaFactory;
8075

@@ -99,12 +94,6 @@ public GraphQlSource.Builder defaultTypeResolver(TypeResolver typeResolver) {
9994
return this;
10095
}
10196

102-
@Override
103-
public GraphQlSource.Builder preparsedDocumentProvider(PreparsedDocumentProvider preparsedDocumentProvider) {
104-
this.preparsedDocumentProvider = preparsedDocumentProvider;
105-
return this;
106-
}
107-
10897
@Override
10998
public GraphQlSource.Builder exceptionResolvers(List<DataFetcherExceptionResolver> resolvers) {
11099
this.exceptionResolvers.addAll(resolvers);
@@ -159,12 +148,6 @@ public GraphQlSource build() {
159148
builder = builder.instrumentation(new ChainedInstrumentation(this.instrumentations));
160149
}
161150

162-
PreparsedDocumentProvider preparsedDocumentProvider = (this.preparsedDocumentProvider != null ?
163-
this.preparsedDocumentProvider :
164-
SpringNoOpPreparsedDocumentProvider.INSTANCE);
165-
166-
builder = builder.preparsedDocumentProvider(preparsedDocumentProvider);
167-
168151
this.graphQlConfigurers.accept(builder);
169152
GraphQL graphQl = builder.build();
170153

spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@
2323

2424
import graphql.GraphQL;
2525
import graphql.execution.instrumentation.Instrumentation;
26-
import graphql.execution.preparsed.PreparsedDocumentProvider;
27-
import graphql.language.Document;
2826
import graphql.schema.GraphQLSchema;
2927
import graphql.schema.GraphQLTypeVisitor;
3028
import graphql.schema.TypeResolver;
3129
import graphql.schema.idl.RuntimeWiring;
3230
import graphql.schema.idl.TypeDefinitionRegistry;
3331

3432
import org.springframework.core.io.Resource;
35-
import org.springframework.graphql.execution.preparsed.SpringNoOpPreparsedDocumentProvider;
3633

3734
/**
3835
* Strategy to resolve the {@link GraphQL} instance to use.
@@ -112,22 +109,6 @@ interface Builder {
112109
*/
113110
Builder defaultTypeResolver(TypeResolver typeResolver);
114111

115-
/**
116-
* Configure the {@link PreparsedDocumentProvider} to use for GraphQL requests.
117-
* <p>
118-
* A {@code PreparsedDocumentProvider} can be used to cache and/or whitelist
119-
* {@link Document} instances for queries. Configuring a
120-
* {@code PreparsedDocumentProvider} gives you the ability to skip query parsing
121-
* and validation.
122-
* <p>
123-
* By default, this is set to {@link SpringNoOpPreparsedDocumentProvider}, which
124-
* calls the {@code parseAndValidateFunction}, and does nothing else.
125-
* @param preparsedDocumentProvider the {@code PreparsedDocumentProvider} to use
126-
* @return the current builder
127-
* @see GraphQL#getPreparsedDocumentProvider()
128-
*/
129-
Builder preparsedDocumentProvider(PreparsedDocumentProvider preparsedDocumentProvider);
130-
131112
/**
132113
* Add {@link DataFetcherExceptionResolver}'s to use for resolving exceptions from
133114
* {@link graphql.schema.DataFetcher}'s.

spring-graphql/src/main/java/org/springframework/graphql/execution/preparsed/SpringNoOpPreparsedDocumentProvider.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

spring-graphql/src/test/java/org/springframework/graphql/execution/preparsed/PreparsedDocumentProviderTests.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

spring-graphql/src/test/java/org/springframework/graphql/execution/preparsed/SpringNoOpPreparsedDocumentProviderTests.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.List;
2222

2323
import graphql.GraphQL;
24-
import graphql.execution.preparsed.PreparsedDocumentProvider;
2524
import graphql.schema.DataFetcher;
2625
import graphql.schema.GraphQLTypeVisitor;
2726
import graphql.schema.TypeResolver;
@@ -102,11 +101,6 @@ public GraphQlSetup typeResolver(TypeResolver typeResolver) {
102101
return this;
103102
}
104103

105-
public GraphQlSetup preparsedDocumentProvider(PreparsedDocumentProvider preparsedDocumentProvider) {
106-
this.graphQlSourceBuilder.preparsedDocumentProvider(preparsedDocumentProvider);
107-
return this;
108-
}
109-
110104
public GraphQlSetup typeVisitor(GraphQLTypeVisitor... visitors) {
111105
this.graphQlSourceBuilder.typeVisitors(Arrays.asList(visitors));
112106
return this;

0 commit comments

Comments
 (0)