Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit c979135

Browse files
committed
Upgrade graphql-java-servlet and graphql-java-tools
1 parent 33316ff commit c979135

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

example-graphql-tools/src/main/java/com/graphql/sample/boot/GraphQLToolsSampleApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.graphql.sample.boot;
22

33
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
4-
import graphql.kickstart.execution.config.ObjectMapperConfigurer;
4+
import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
55
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
77
import org.springframework.context.annotation.Bean;
@@ -14,7 +14,7 @@ public static void main(String[] args) {
1414
}
1515

1616
@Bean
17-
public ObjectMapperConfigurer objectMapperConfigurer() {
17+
public GraphQLServletObjectMapperConfigurer objectMapperConfigurer() {
1818
return (mapper -> mapper.registerModule(new JavaTimeModule()));
1919
}
2020
}

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1818
#
1919

20-
version = 7.0.1-SNAPSHOT
20+
version = 7.0.1
2121

2222
### Project Metadata
2323

@@ -41,8 +41,8 @@ TARGET_COMPATIBILITY = 1.8
4141

4242
LIB_GRAPHQL_JAVA_VER = 14.0
4343
LIB_SPRING_BOOT_VER = 2.2.6.RELEASE
44-
LIB_GRAPHQL_SERVLET_VER = 9.0.1
45-
LIB_GRAPHQL_JAVA_TOOLS_VER = 6.0.2-SNAPSHOT
44+
LIB_GRAPHQL_SERVLET_VER = 9.1.0
45+
LIB_GRAPHQL_JAVA_TOOLS_VER = 6.0.2
4646
LIB_APACHE_COMMONS_TEXT=1.8
4747
LIB_JSOUP_VER=1.12.2
4848
kotlin.version=1.3.70

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import com.fasterxml.jackson.databind.InjectableValues;
2525
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import graphql.kickstart.spring.web.boot.metrics.MetricsInstrumentation;
2726
import graphql.execution.AsyncExecutionStrategy;
2827
import graphql.execution.ExecutionStrategy;
2928
import graphql.execution.SubscriptionExecutionStrategy;
@@ -33,23 +32,24 @@
3332
import graphql.kickstart.execution.GraphQLQueryInvoker;
3433
import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
3534
import graphql.kickstart.execution.config.ExecutionStrategyProvider;
36-
import graphql.kickstart.execution.config.ObjectMapperConfigurer;
35+
import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
3736
import graphql.kickstart.execution.config.ObjectMapperProvider;
3837
import graphql.kickstart.execution.error.GraphQLErrorHandler;
38+
import graphql.kickstart.servlet.AbstractGraphQLHttpServlet;
39+
import graphql.kickstart.servlet.GraphQLConfiguration;
40+
import graphql.kickstart.servlet.GraphQLHttpServlet;
41+
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
42+
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
43+
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
44+
import graphql.kickstart.servlet.core.GraphQLServletListener;
45+
import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder;
46+
import graphql.kickstart.servlet.input.BatchInputPreProcessor;
47+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
3948
import graphql.kickstart.spring.error.ErrorHandlerSupplier;
4049
import graphql.kickstart.spring.error.GraphQLErrorStartupListener;
50+
import graphql.kickstart.spring.web.boot.metrics.MetricsInstrumentation;
4151
import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
4252
import graphql.schema.GraphQLSchema;
43-
import graphql.servlet.AbstractGraphQLHttpServlet;
44-
import graphql.servlet.GraphQLConfiguration;
45-
import graphql.servlet.GraphQLHttpServlet;
46-
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
47-
import graphql.servlet.config.GraphQLSchemaServletProvider;
48-
import graphql.servlet.context.GraphQLServletContextBuilder;
49-
import graphql.servlet.core.GraphQLServletListener;
50-
import graphql.servlet.core.GraphQLServletRootObjectBuilder;
51-
import graphql.servlet.input.BatchInputPreProcessor;
52-
import graphql.servlet.input.GraphQLInvocationInputFactory;
5353
import java.util.LinkedHashMap;
5454
import java.util.List;
5555
import java.util.Map;
@@ -118,7 +118,7 @@ public class GraphQLWebAutoConfiguration {
118118
private GraphQLServletRootObjectBuilder graphQLRootObjectBuilder;
119119

120120
@Autowired(required = false)
121-
private ObjectMapperConfigurer objectMapperConfigurer;
121+
private GraphQLServletObjectMapperConfigurer objectMapperConfigurer;
122122

123123
@Autowired(required = false)
124124
private PreparsedDocumentProvider preparsedDocumentProvider;

0 commit comments

Comments
 (0)