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

Commit 3ae2c10

Browse files
committed
Add newlines when reading schema files to prevent errors
1 parent 08cf6ae commit 3ae2c10

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
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.servlet.config.ObjectMapperConfigurer;
4+
import graphql.kickstart.execution.config.ObjectMapperConfigurer;
55
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
77
import org.springframework.context.annotation.Bean;

graphql-kickstart-spring-boot-autoconfigure-tools/src/main/java/graphql/kickstart/tools/boot/ClasspathResourceSchemaStringProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private String readSchema(Resource resource) {
4545
InputStreamReader bufferedInputStream = new InputStreamReader(inputStream, StandardCharsets.UTF_8.name());
4646
BufferedReader reader = new BufferedReader(bufferedInputStream)
4747
) {
48-
return reader.lines().collect(joining());
48+
return reader.lines().collect(joining("\n"));
4949
} catch (IOException e) {
5050
throw new IllegalStateException("Cannot read graphql schema from resource " + resource, e);
5151
}

graphql-kickstart-spring-boot-autoconfigure-tools/src/main/java/graphql/kickstart/tools/boot/GraphQLJavaToolsAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import graphql.schema.idl.SchemaDirectiveWiring;
1717
import java.io.IOException;
1818
import java.util.List;
19+
import lombok.extern.slf4j.Slf4j;
1920
import org.springframework.beans.factory.annotation.Autowired;
2021
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -31,6 +32,7 @@
3132
/**
3233
* @author Andrew Potter
3334
*/
35+
@Slf4j
3436
@Configuration
3537
@ConditionalOnClass(SchemaParser.class)
3638
@AutoConfigureAfter({JacksonAutoConfiguration.class})

graphql-spring-boot-autoconfigure/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ dependencies {
2323
compile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
2424
compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
2525

26-
compileOnly "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
27-
compileOnly "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
28-
compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
26+
compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
27+
compile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
28+
compile "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
2929

3030
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
3131
compileOnly "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"

0 commit comments

Comments
 (0)