Fix default path in ReactiveGraphiQLController. Add tests for accessing /graphiql based on the servlet and based on the reactive stack. Fix imports.

Author: Ronny Bräunlich

graphiql-spring-boot-autoconfigure/build.gradle

@@ -27,6 +27,8 @@ dependencies{
 
     testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+
+    testRuntime "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
 }
 
 compileJava.dependsOn(processResources)

graphiql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphiql/boot/ReactiveGraphiQLController.java

@@ -35,7 +35,7 @@ public void onceConstructed() throws IOException {
     super.onceConstructed();
   }
 
-  @RequestMapping(value = "${graphiql.mapping:/api}")
+  @RequestMapping(value = "${graphiql.mapping:/graphiql}")
   public Mono<Void> graphiql(ServerHttpRequest request, ServerHttpResponse response,
                              @PathVariable Map<String, String> params) {
     response.getHeaders().setContentType(MediaType.TEXT_HTML);

graphiql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphiql/boot/ServletGraphiQLController.java

@@ -1,30 +1,15 @@
 package com.oembedler.moon.graphiql.boot;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.StrSubstitutor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.MediaType;
-import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * @author Andrew Potter

graphiql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphiql/boot/ReactiveGraphiQLControllerTest.java

@@ -0,0 +1,35 @@
+package com.oembedler.moon.graphiql.boot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@RunWith(SpringRunner.class)
+@WebFluxTest
+public class ReactiveGraphiQLControllerTest {
+
+    @Autowired
+    private WebTestClient webTestClient;
+
+    @Test
+    public void shouldBeAbleToAccessGraphiQL() {
+      webTestClient.get()
+          .uri("/graphiql")
+          .exchange()
+          .expectStatus().is2xxSuccessful()
+          .expectHeader().contentType(MediaType.TEXT_HTML);
+    }
+
+    @SpringBootConfiguration
+    @TestPropertySource(properties = "graphiql.enabled=true")
+    @Import(GraphiQLAutoConfiguration.class)
+    public static class ReactiveTestApplication {
+    }
+}

graphiql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphiql/boot/ServletGraphiQLControllerTest.java

@@ -0,0 +1,36 @@
+package com.oembedler.moon.graphiql.boot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringRunner.class)
+@WebMvcTest
+public class ServletGraphiQLControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void shouldBeAbleToAccessGraphiQL() throws Exception {
+      mockMvc.perform(get("/graphiql"))
+          .andExpect(status().is2xxSuccessful())
+          .andExpect(content().contentType("text/html; charset=UTF-8"));
+    }
+
+    @SpringBootConfiguration
+    @TestPropertySource(properties = "graphiql.enabled=true")
+    @Import(GraphiQLAutoConfiguration.class)
+    public static class ServletTestApplication {
+    }
+}