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

Commit c0c4593

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 52008b4 + d9635a8 commit c0c4593

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5252
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
5353
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
54+
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
5455
import org.springframework.boot.context.properties.EnableConfigurationProperties;
5556
import org.springframework.boot.web.servlet.ServletRegistrationBean;
5657
import org.springframework.context.annotation.Bean;
@@ -76,7 +77,7 @@
7677
@ConditionalOnClass(DispatcherServlet.class)
7778
@ConditionalOnBean({GraphQLSchema.class})
7879
@ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
79-
@AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class})
80+
@AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class, JacksonAutoConfiguration.class})
8081
@EnableConfigurationProperties({GraphQLServletProperties.class})
8182
public class GraphQLWebAutoConfiguration {
8283

0 commit comments

Comments
 (0)