diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java index a553ae3b..6bc173d3 100644 --- a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java +++ b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java @@ -10,19 +10,18 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; +@Slf4j +@AllArgsConstructor public class ClasspathResourceSchemaStringProvider implements SchemaStringProvider { - @Autowired private ApplicationContext applicationContext; + private ApplicationContext applicationContext; private String schemaLocationPattern; - public ClasspathResourceSchemaStringProvider(String schemaLocationPattern) { - this.schemaLocationPattern = schemaLocationPattern; - } - @Override public List schemaStrings() throws IOException { Resource[] resources = applicationContext.getResources("classpath*:" + schemaLocationPattern); diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java index c548438d..3fec9a09 100644 --- a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java +++ b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java @@ -36,6 +36,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; /** @author Andrew Potter */ @@ -52,8 +53,14 @@ public class GraphQLJavaToolsAutoConfiguration { @Bean @ConditionalOnMissingBean - public SchemaStringProvider schemaStringProvider(GraphQLToolsProperties props) { - return new ClasspathResourceSchemaStringProvider(props.getSchemaLocationPattern()); + public SchemaStringProvider schemaStringProvider( + ApplicationContext applicationContext, + GraphQLToolsProperties props + ) { + return new ClasspathResourceSchemaStringProvider( + applicationContext, + props.getSchemaLocationPattern() + ); } @Bean