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

Commit 8ec061d

Browse files
committed
Autoconfigure GraphQL tools after Jackson
1 parent c6ad861 commit 8ec061d

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLJavaToolsAutoConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
import graphql.schema.GraphQLSchema;
99
import graphql.servlet.GraphQLSchemaProvider;
1010
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1112
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1213
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1314
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
1415
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
16+
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
1517
import org.springframework.context.annotation.Bean;
1618
import org.springframework.context.annotation.Configuration;
1719

@@ -25,6 +27,7 @@
2527
*/
2628
@Configuration
2729
@ConditionalOnClass(SchemaParser.class)
30+
@AutoConfigureAfter({JacksonAutoConfiguration.class})
2831
public class GraphQLJavaToolsAutoConfiguration {
2932

3033
@Autowired(required = false)

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package com.oembedler.moon.graphql.boot;
2121

22-
import com.coxautodev.graphql.tools.PerFieldObjectMapperProvider;
2322
import com.fasterxml.jackson.databind.InjectableValues;
2423
import com.fasterxml.jackson.databind.ObjectMapper;
2524
import graphql.execution.AsyncExecutionStrategy;
@@ -29,34 +28,15 @@
2928
import graphql.execution.instrumentation.Instrumentation;
3029
import graphql.execution.preparsed.PreparsedDocumentProvider;
3130
import graphql.schema.GraphQLSchema;
32-
import graphql.servlet.AbstractGraphQLHttpServlet;
33-
import graphql.servlet.DefaultExecutionStrategyProvider;
34-
import graphql.servlet.DefaultGraphQLSchemaProvider;
35-
import graphql.servlet.ExecutionStrategyProvider;
36-
import graphql.servlet.GraphQLContextBuilder;
37-
import graphql.servlet.GraphQLErrorHandler;
38-
import graphql.servlet.GraphQLInvocationInputFactory;
39-
import graphql.servlet.GraphQLObjectMapper;
40-
import graphql.servlet.GraphQLQueryInvoker;
41-
import graphql.servlet.GraphQLRootObjectBuilder;
42-
import graphql.servlet.GraphQLSchemaProvider;
43-
import graphql.servlet.GraphQLServletListener;
44-
import graphql.servlet.ObjectMapperConfigurer;
45-
import graphql.servlet.ObjectMapperProvider;
46-
import graphql.servlet.SimpleGraphQLHttpServlet;
31+
import graphql.servlet.*;
4732
import org.springframework.beans.factory.annotation.Autowired;
4833
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
49-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
50-
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
51-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
52-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
53-
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
34+
import org.springframework.boot.autoconfigure.condition.*;
5435
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
5536
import org.springframework.boot.context.properties.EnableConfigurationProperties;
5637
import org.springframework.boot.web.servlet.ServletRegistrationBean;
5738
import org.springframework.context.annotation.Bean;
5839
import org.springframework.context.annotation.Configuration;
59-
import org.springframework.context.annotation.DependsOn;
6040
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
6141
import org.springframework.web.filter.CorsFilter;
6242
import org.springframework.web.servlet.DispatcherServlet;

0 commit comments

Comments
 (0)